zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-04 17:01:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Automatically refactor more exception testing to use new JUnit rules

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=178911894
This commit is contained in:
mcilwain 2017-08-14 09:20:03 -04:00 • committed by Ben McIlwain
parent 36ad38e5df
commit 7dc224627f
125 changed files with 1970 additions and 1982 deletions
Download patch file Download diff file Expand all files Collapse all files

12
javatests/google/registry/xml/DateAdapterTest.java
View file

@ -15,21 +15,16 @@
package google.registry.xml;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import org.joda.time.LocalDate;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
/** Unit tests for {@link DateAdapter}. */
@RunWith(JUnit4.class)
public class DateAdapterTest {
@Rule
public final ExpectedException thrown = ExpectedException.none();
@Test
public void testMarshal() {
assertThat(new DateAdapter().marshal(
@ -61,7 +56,8 @@ public class DateAdapterTest {
@Test
public void testUnmarshalInvalid() {
thrown.expect(IllegalArgumentException.class);
assertThat((new DateAdapter()).unmarshal("oh my goth")).isNull();
assertThrows(
IllegalArgumentException.class,
() -> assertThat((new DateAdapter()).unmarshal("oh my goth")).isNull());
}
}

12
javatests/google/registry/xml/UtcDateTimeAdapterTest.java
View file

@ -15,23 +15,18 @@
package google.registry.xml;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import static org.joda.time.DateTimeZone.UTC;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
/** Unit tests for {@link UtcDateTimeAdapter}. */
@RunWith(JUnit4.class)
public class UtcDateTimeAdapterTest {
@Rule
public final ExpectedException thrown = ExpectedException.none();
@Test
public void testMarshal() {
assertThat(new UtcDateTimeAdapter().marshal(new DateTime(2010, 10, 17, 4, 20, 0, UTC)))
@ -70,7 +65,8 @@ public class UtcDateTimeAdapterTest {
@Test
public void testUnmarshalInvalid() {
thrown.expect(IllegalArgumentException.class);
assertThat((new UtcDateTimeAdapter()).unmarshal("oh my goth")).isNull();
assertThrows(
IllegalArgumentException.class,
() -> assertThat((new UtcDateTimeAdapter()).unmarshal("oh my goth")).isNull());
}
}

15
javatests/google/registry/xml/XmlTestUtilsTest.java
View file

@ -14,12 +14,11 @@
package google.registry.xml;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.testing.TestDataHelper.loadFile;
import static google.registry.xml.XmlTestUtils.assertXmlEquals;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@ -27,9 +26,6 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class XmlTestUtilsTest {
@Rule
public final ExpectedException thrown = ExpectedException.none();
void runTest(String file1, String file2) throws Exception {
assertXmlEquals(loadFile(getClass(), file1), loadFile(getClass(), file2));
}
@ -41,8 +37,8 @@ public class XmlTestUtilsTest {
@Test
public void testInequality() throws Exception {
thrown.expect(AssertionError.class);
runTest("simple.xml", "twoextensions_feeThenLaunch.xml");
assertThrows(
AssertionError.class, () -> runTest("simple.xml", "twoextensions_feeThenLaunch.xml"));
}
@Test
@ -52,7 +48,8 @@ public class XmlTestUtilsTest {
@Test
public void testMultipleElementsInDifferentNamespaces_differentValues() throws Exception {
thrown.expect(AssertionError.class);
runTest("twoextensions_feeThenLaunch.xml", "twoextensions_feeThenLaunch2.xml");
assertThrows(
AssertionError.class,
() -> runTest("twoextensions_feeThenLaunch.xml", "twoextensions_feeThenLaunch2.xml"));
}
}