zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-08 20:23:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make JpaUnitTestRule not depend on the nomulus schema (#613)

Browse source
This commit is contained in:
Shicong Huang 2020-06-09 14:51:13 -04:00 • committed by GitHub
parent 2995bb03fd
commit f0765dc893
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/test/java/google/registry/persistence/transaction/JpaTestRules.java
View file

@ -71,7 +71,7 @@ public class JpaTestRules {
Optional<String> initScriptPath,
ImmutableList<Class> extraEntityClasses,
ImmutableMap<String, String> userProperties) {
super(clock, initScriptPath, extraEntityClasses, userProperties);
super(clock, initScriptPath, false, extraEntityClasses, userProperties);
}
@Override

43
core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerRule.java
View file

@ -15,6 +15,7 @@
package google.registry.persistence.transaction;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.testcontainers.containers.PostgreSQLContainer.POSTGRESQL_PORT;
@ -41,12 +42,14 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.persistence.Entity;
import javax.persistence.EntityManagerFactory;
import org.hibernate.cfg.Environment;
import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
@ -94,7 +97,25 @@ abstract class JpaTransactionManagerRule extends ExternalResource {
// Hash of the ORM entity names requested by this rule instance.
private int entityHash;
protected JpaTransactionManagerRule(
// Whether to create nomulus tables in the test db. Right now, only the JpaTestRules set this to
// false.
private boolean includeNomulusSchema = true;
JpaTransactionManagerRule(
Clock clock,
Optional<String> initScriptPath,
boolean includeNomulusSchema,
ImmutableList<Class> extraEntityClasses,
ImmutableMap<String, String> userProperties) {
this.clock = clock;
this.initScriptPath = initScriptPath;
this.includeNomulusSchema = includeNomulusSchema;
this.extraEntityClasses = extraEntityClasses;
this.userProperties = userProperties;
this.entityHash = getOrmEntityHash(initScriptPath, extraEntityClasses);
}
JpaTransactionManagerRule(
Clock clock,
Optional<String> initScriptPath,
ImmutableList<Class> extraEntityClasses,
@ -277,7 +298,7 @@ abstract class JpaTransactionManagerRule extends ExternalResource {
}
/** Constructs the {@link EntityManagerFactory} instance. */
private static EntityManagerFactory createEntityManagerFactory(
private EntityManagerFactory createEntityManagerFactory(
String jdbcUrl,
String username,
String password,
@ -293,6 +314,24 @@ abstract class JpaTransactionManagerRule extends ExternalResource {
ParsedPersistenceXmlDescriptor descriptor =
PersistenceXmlUtility.getParsedPersistenceXmlDescriptor();
// If we don't include the nomulus schema, remove all entity classes in the descriptor but keep
// other settings like the converter classes.
if (!includeNomulusSchema) {
List<String> nonEntityClasses =
descriptor.getManagedClassNames().stream()
.filter(
classString -> {
try {
return !Class.forName(classString).isAnnotationPresent(Entity.class);
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException(e);
}
})
.collect(toImmutableList());
descriptor.getManagedClassNames().clear();
descriptor.getManagedClassNames().addAll(nonEntityClasses);
}
extraEntityClasses.stream().map(Class::getName).forEach(descriptor::addClasses);
return Bootstrap.getEntityManagerFactoryBuilder(descriptor, properties).build();
}