mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-06 08:07:03 +00:00
Code Issues Releases 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=179072309
This commit is contained in:
mcilwain
2017-12-27 10:50:20 -05:00
committed by Ben McIlwain
parent d5d29959b4
commit 9157930983
100 changed files with 3900 additions and 3192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
javatests/google/registry/tools/MutatingCommandTest.java
+35 -31
View File
@@ -22,6 +22,8 @@ import static google.registry.testing.DatastoreHelper.deleteResource;
import static google.registry.testing.DatastoreHelper.persistActiveHost;
import static google.registry.testing.DatastoreHelper.persistNewRegistrar;
import static google.registry.testing.DatastoreHelper.persistResource;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.testing.JUnitBackports.expectThrows;
import static org.joda.time.DateTimeZone.UTC;
import google.registry.model.host.HostResource;
@@ -32,7 +34,6 @@ import org.joda.time.DateTime;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -44,10 +45,6 @@ public class MutatingCommandTest {
public final AppEngineRule appEngine = AppEngineRule.builder()
.withDatastore()
.build();
@Rule
public final ExpectedException thrown = ExpectedException.none();
Registrar registrar1;
Registrar registrar2;
Registrar newRegistrar1;
@@ -298,8 +295,7 @@ public class MutatingCommandTest {
stageEntityChange(null, null);
}
};
thrown.expect(IllegalArgumentException.class);
command.init();
assertThrows(IllegalArgumentException.class, () -> command.init());
}
@Test
@@ -313,9 +309,11 @@ public class MutatingCommandTest {
.build());
}
};
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Cannot apply multiple changes for the same entity");
command.init();
IllegalArgumentException thrown =
expectThrows(IllegalArgumentException.class, () -> command.init());
assertThat(thrown)
.hasMessageThat()
.contains("Cannot apply multiple changes for the same entity");
}
@Test
@@ -326,9 +324,11 @@ public class MutatingCommandTest {
stageEntityChange(host1, host2);
}
};
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Both entity versions in an update must have the same Key.");
command.init();
IllegalArgumentException thrown =
expectThrows(IllegalArgumentException.class, () -> command.init());
assertThat(thrown)
.hasMessageThat()
.contains("Both entity versions in an update must have the same Key.");
}
@Test
@@ -339,9 +339,11 @@ public class MutatingCommandTest {
stageEntityChange(registrar1, registrar2);
}
};
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Both entity versions in an update must have the same Key.");
command.init();
IllegalArgumentException thrown =
expectThrows(IllegalArgumentException.class, () -> command.init());
assertThat(thrown)
.hasMessageThat()
.contains("Both entity versions in an update must have the same Key.");
}
@Test
@@ -352,9 +354,11 @@ public class MutatingCommandTest {
stageEntityChange(host1, registrar1);
}
};
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Both entity versions in an update must have the same Key.");
command.init();
IllegalArgumentException thrown =
expectThrows(IllegalArgumentException.class, () -> command.init());
assertThat(thrown)
.hasMessageThat()
.contains("Both entity versions in an update must have the same Key.");
}
@Test
@@ -367,9 +371,9 @@ public class MutatingCommandTest {
};
command.init();
persistResource(newHost1);
thrown.expect(IllegalStateException.class);
thrown.expectMessage("Entity changed since init() was called.");
command.execute();
IllegalStateException thrown =
expectThrows(IllegalStateException.class, () -> command.execute());
assertThat(thrown).hasMessageThat().contains("Entity changed since init() was called.");
}
@Test
@@ -382,9 +386,9 @@ public class MutatingCommandTest {
};
command.init();
persistResource(newHost1);
thrown.expect(IllegalStateException.class);
thrown.expectMessage("Entity changed since init() was called.");
command.execute();
IllegalStateException thrown =
expectThrows(IllegalStateException.class, () -> command.execute());
assertThat(thrown).hasMessageThat().contains("Entity changed since init() was called.");
}
@Test
@@ -397,9 +401,9 @@ public class MutatingCommandTest {
};
command.init();
persistResource(newHost1);
thrown.expect(IllegalStateException.class);
thrown.expectMessage("Entity changed since init() was called.");
command.execute();
IllegalStateException thrown =
expectThrows(IllegalStateException.class, () -> command.execute());
assertThat(thrown).hasMessageThat().contains("Entity changed since init() was called.");
}
@Test
@@ -412,8 +416,8 @@ public class MutatingCommandTest {
};
command.init();
deleteResource(host1);
thrown.expect(IllegalStateException.class);
thrown.expectMessage("Entity changed since init() was called.");
command.execute();
IllegalStateException thrown =
expectThrows(IllegalStateException.class, () -> command.execute());
assertThat(thrown).hasMessageThat().contains("Entity changed since init() was called.");
}
}