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

Fix TldTest (#2107)

Browse source 
Test data should be loaded from resources, not source tree.
This commit is contained in:
Weimin Yu 2023-08-16 11:31:21 -04:00 • committed by GitHub
parent 2fd29ebc90
commit 12c3ee718a
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/test/java/google/registry/model/tld/TldTest.java
View file

@ -31,10 +31,10 @@ import static google.registry.testing.DatabaseHelper.newTld;
import static google.registry.testing.DatabaseHelper.persistPremiumList; import static google.registry.testing.DatabaseHelper.persistPremiumList;
import static google.registry.testing.DatabaseHelper.persistReservedList; import static google.registry.testing.DatabaseHelper.persistReservedList;
import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.testing.DatabaseHelper.persistResource;
import static google.registry.testing.TestDataHelper.filePath;
import static google.registry.testing.TestDataHelper.loadFile; import static google.registry.testing.TestDataHelper.loadFile;
import static google.registry.util.DateTimeUtils.END_OF_TIME; import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static google.registry.util.DateTimeUtils.START_OF_TIME; import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static google.registry.util.ResourceUtils.readResourceBytes;
import static java.math.RoundingMode.UNNECESSARY; import static java.math.RoundingMode.UNNECESSARY;
import static org.joda.money.CurrencyUnit.EUR; import static org.joda.money.CurrencyUnit.EUR;
import static org.joda.money.CurrencyUnit.USD; import static org.joda.money.CurrencyUnit.USD;
@ -55,14 +55,12 @@ import google.registry.model.tld.label.ReservedList;
import google.registry.persistence.VKey; import google.registry.persistence.VKey;
import google.registry.tldconfig.idn.IdnTableEnum; import google.registry.tldconfig.idn.IdnTableEnum;
import google.registry.util.SerializeUtils; import google.registry.util.SerializeUtils;
import java.io.File;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Optional; import java.util.Optional;
import org.joda.money.Money; import org.joda.money.Money;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.Duration; import org.joda.time.Duration;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
/** Unit tests for {@link Tld}. */ /** Unit tests for {@link Tld}. */
@ -137,7 +135,6 @@ public final class TldTest extends EntityTestCase {
} }
// TODO (sarahbot): re-enable this test after we figure out why it fails in presubmits. // TODO (sarahbot): re-enable this test after we figure out why it fails in presubmits.
@Disabled
@Test @Test
void testYamlToTld() throws Exception { void testYamlToTld() throws Exception {
fakeClock.setTo(START_OF_TIME); fakeClock.setTo(START_OF_TIME);
@ -167,7 +164,8 @@ public final class TldTest extends EntityTestCase {
.build(); .build();
ObjectMapper mapper = getObjectMapper(); ObjectMapper mapper = getObjectMapper();
Tld constructedTld = mapper.readValue(new File(filePath(getClass(), "tld.yaml")), Tld.class); Tld constructedTld =
mapper.readValue(readResourceBytes(getClass(), "tld.yaml").openBufferedStream(), Tld.class);
compareTlds(existingTld, constructedTld); compareTlds(existingTld, constructedTld);
} }

4
integration/build.gradle
View file

@ -77,6 +77,10 @@ task extractSqlIntegrationTestSuite (type: Copy) {
} }
into unpackedTestDir into unpackedTestDir
includeEmptyDirs = false includeEmptyDirs = false
if (nomulus_version == USE_LOCAL) {
dependsOn ':core:testUberJar'
}
} }
// TODO(weiminyu): inherit from FilteringTest (defined in :core). // TODO(weiminyu): inherit from FilteringTest (defined in :core).