zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 16:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of custom ExceptionRule methods

Browse source 
The only remaining methods on ExceptionRule after this are methods that
also exist on ExpectedException, which will allow us to, in the next CL,
swap out the one for the other and then run the automated refactoring to
turn it all into assertThrows/expectThrows.

Note that there were some assertions about root causes that couldn't
easily be turned into ExpectedException invocations, so I simply
converted them directly to usages of assertThrows/expectThrows.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=178623431
This commit is contained in:
mcilwain 2017-12-11 08:47:27 -08:00 • committed by jianglai
parent 68a26f5b6e
commit b825a2b5a8
144 changed files with 1176 additions and 894 deletions
Download patch file Download diff file Expand all files Collapse all files

33
javatests/google/registry/util/SqlTemplateTest.java
View file

@ -52,7 +52,8 @@ public class SqlTemplateTest {
@Test
public void testFillSqlTemplate_substitutionButNoVariables() throws Exception {
thrown.expect(IllegalArgumentException.class, "Not found in template: ONE");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Not found in template: ONE");
SqlTemplate.create("")
.put("ONE", "1")
.build();
@ -60,7 +61,8 @@ public class SqlTemplateTest {
@Test
public void testFillSqlTemplate_substitutionButMissingVariables() throws Exception {
thrown.expect(IllegalArgumentException.class, "Not found in template: TWO");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Not found in template: TWO");
SqlTemplate.create("%ONE%")
.put("ONE", "1")
.put("TWO", "2")
@ -69,7 +71,8 @@ public class SqlTemplateTest {
@Test
public void testFillSqlTemplate_sameKeyTwice_failsEarly() throws Exception {
thrown.expect(IllegalArgumentException.class, "");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("");
SqlTemplate.create("%ONE%")
.put("ONE", "1")
.put("ONE", "2");
@ -77,7 +80,8 @@ public class SqlTemplateTest {
@Test
public void testFillSqlTemplate_variablesButNotEnoughSubstitutions() throws Exception {
thrown.expect(IllegalArgumentException.class, "%TWO% found in template but no substitution");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("%TWO% found in template but no substitution");
SqlTemplate.create("%ONE% %TWO%")
.put("ONE", "1")
.build();
@ -85,7 +89,8 @@ public class SqlTemplateTest {
@Test
public void testFillSqlTemplate_mismatchedVariableAndSubstitution() throws Exception {
thrown.expect(IllegalArgumentException.class, "%TWO% found in template but no substitution");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("%TWO% found in template but no substitution");
SqlTemplate.create("%TWO%")
.put("TOO", "2")
.build();
@ -93,14 +98,16 @@ public class SqlTemplateTest {
@Test
public void testFillSqlTemplate_missingKeyVals_whatsThePoint() throws Exception {
thrown.expect(IllegalArgumentException.class, "%TWO% found in template but no substitution");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("%TWO% found in template but no substitution");
SqlTemplate.create("%TWO%")
.build();
}
@Test
public void testFillSqlTemplate_lowercaseKey_notAllowed() throws Exception {
thrown.expect(IllegalArgumentException.class, "Bad substitution key: test");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Bad substitution key: test");
SqlTemplate.create("%test%")
.put("test", "hello world")
.build();
@ -108,21 +115,24 @@ public class SqlTemplateTest {
@Test
public void testFillSqlTemplate_substitution_disallowsSingleQuotes() throws Exception {
thrown.expect(IllegalArgumentException.class, "Illegal characters in foo'bar");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Illegal characters in foo'bar");
SqlTemplate.create("The words are '%LOS%' and baz")
.put("LOS", "foo'bar");
}
@Test
public void testFillSqlTemplate_substitution_disallowsDoubleQuotes() throws Exception {
thrown.expect(IllegalArgumentException.class, "Illegal characters in foo\"bar");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Illegal characters in foo\"bar");
SqlTemplate.create("The words are '%LOS%' and baz")
.put("LOS", "foo\"bar");
}
@Test
public void testFillSqlTemplate_quoteMismatch_throwsError() throws Exception {
thrown.expect(IllegalArgumentException.class, "Quote mismatch: \"%LOS%'");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Quote mismatch: \"%LOS%'");
SqlTemplate.create("The words are \"%LOS%' and baz")
.put("LOS", "foobar")
.build();
@ -130,7 +140,8 @@ public class SqlTemplateTest {
@Test
public void testFillSqlTemplate_extendedQuote_throwsError() throws Exception {
thrown.expect(IllegalArgumentException.class, "Quote mismatch: '%LOS%");
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Quote mismatch: '%LOS%");
SqlTemplate.create("The words are '%LOS%-lol' and baz")
.put("LOS", "roid")
.build();