Browse Source
Previously, when an embedded test database was being auto-configured any schema username and password specified by the user would result in a separate embedded test database being created to load the schema. This then left the actual test database without the schema causing test failures. This commit updates the test database auto-configuration to set the schema username to an empty string in a property source that's added first to the environment's property sources. This causes any schema username configured by the user to be ignored, preventing the creation of a separate database for schema.sql processing. Fixes gh-19321pull/24789/head
2 changed files with 56 additions and 0 deletions
@ -0,0 +1,48 @@ |
|||||||
|
/* |
||||||
|
* Copyright 2012-2020 the original author or authors. |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package org.springframework.boot.test.autoconfigure.orm.jpa; |
||||||
|
|
||||||
|
import javax.sql.DataSource; |
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test; |
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||||
|
import org.springframework.test.context.TestPropertySource; |
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat; |
||||||
|
|
||||||
|
/** |
||||||
|
* Integration tests for {@link DataJpaTest @DataJpaTest} with schema credentials that |
||||||
|
* should be ignored to allow the auto-configured test database to be used. |
||||||
|
* |
||||||
|
* @author Andy Wilkinson |
||||||
|
*/ |
||||||
|
@DataJpaTest |
||||||
|
@TestPropertySource( |
||||||
|
properties = { "spring.datasource.schema-username=alice", "spring.datasource.schema-password=secret" }) |
||||||
|
class DataJpaTestSchemaCredentialsIntegrationTests { |
||||||
|
|
||||||
|
@Autowired |
||||||
|
private DataSource dataSource; |
||||||
|
|
||||||
|
@Test |
||||||
|
void replacesDefinedDataSourceWithEmbeddedDefault() throws Exception { |
||||||
|
String product = this.dataSource.getConnection().getMetaData().getDatabaseProductName(); |
||||||
|
assertThat(product).isEqualTo("H2"); |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
Loading…
Reference in new issue