mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-05-31 12:06:32 +00:00
Code Issues Releases Wiki Activity

Improve error information in coverage test. (#537)

Browse Source 
* Improve error information in coverage test.

If the golden schema isn't up-to-date with the persistence model, the coverage
tests fail with an exception chain that ends in a PSQLException 'relation
"TableName" does not exist' which is kind of misleading when the problem is
that your golden schema isn't up-to-date.

Check for this error in the coverage tests and generate a more informative
error message indicating a likely root cause.
This commit is contained in:
Michael Muller
2020-03-27 14:58:01 -04:00
committed by GitHub
parent 5b452bf074
commit fa9134328a
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/src/test/java/google/registry/persistence/transaction/JpaEntityCoverage.java
View File

@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import google.registry.persistence.PersistenceXmlUtility;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -96,18 +97,34 @@ public class JpaEntityCoverage extends ExternalResource {
* @return true if an instance of {@code entityType} is found in the database and can be read
*/
private static boolean isPersisted(Class entityType) {
List result =
jpaTm()
.transact(
() ->
jpaTm()
.getEntityManager()
.createQuery(
String.format("SELECT e FROM %s e", getJpaEntityName(entityType)),
entityType)
.setMaxResults(1)
.getResultList());
return !result.isEmpty() && entityType.isInstance(result.get(0));
try {
List result =
jpaTm()
.transact(
() ->
jpaTm()
.getEntityManager()
.createQuery(
String.format("SELECT e FROM %s e", getJpaEntityName(entityType)),
entityType)
.setMaxResults(1)
.getResultList());
return !result.isEmpty() && entityType.isInstance(result.get(0));
} catch (RuntimeException e) {
// See if this was caused by a "relation does not exist" error.
Throwable cause = e;
while ((cause = cause.getCause()) != null) {
if (cause instanceof SQLException
&& cause.getMessage().matches("(?s).*relation .* does not exist.*")) {
throw new RuntimeException(
"SQLException occurred. If you've updated the set of entities, make sure you've "
+ "also updated the golden schema. See db/README.md for details.",
e);
}
}
throw e;
}
}
private static String getJpaEntityName(Class entityType) {