Updated more tests

src/test/java/com/mattrixwv/cipherstream/monosubstitution/TestBaconian.java

@@ -96,7 +96,7 @@ public class TestBaconian{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputStringEncode("");
-		}, "Input must contain at least 1 letter");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Setting input string for encoding '{}'", "");
@@ -112,7 +112,7 @@ public class TestBaconian{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputStringEncode(null);
-		}, "Input cannot be null");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, never()).debug(anyString());
@@ -159,7 +159,7 @@ public class TestBaconian{
 
 		assertThrows(InvalidCharacterException.class, () -> {
 			cipher.setInputStringDecode("a");
-		}, "All Baconian letters contain exactly 5 characters: a");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Setting input string for decoding '{}'", "a");
@@ -178,7 +178,7 @@ public class TestBaconian{
 
 		assertThrows(InvalidCharacterException.class, () -> {
 			cipher.setInputStringDecode("ccccc");
-		}, "Baconian letters contain only a's and b's: ccccc");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Setting input string for decoding '{}'", "ccccc");
@@ -197,7 +197,7 @@ public class TestBaconian{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputStringDecode("");
-		}, "Input cannot be empty");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, never()).debug("Setting input string for decoding '{}'", "");
@@ -216,7 +216,7 @@ public class TestBaconian{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputStringDecode(null);
-		}, "Input cannot be null");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, never()).debug(anyString());

src/test/java/com/mattrixwv/cipherstream/monosubstitution/TestBaseX.java

@@ -76,7 +76,7 @@ public class TestBaseX{
 	public void testSetInputStringEncode_blank(){
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputStringEncode("");
-		}, "Input must contain at least 1 letter");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Setting input string for encoding '{}'", "");
@@ -88,7 +88,7 @@ public class TestBaseX{
 	public void testSetInputStringEncode_null(){
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputStringEncode(null);
-		}, "Input cannot be null");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, never()).debug("Setting input string for encoding '{}'", decodedString);
@@ -116,7 +116,7 @@ public class TestBaseX{
 
 		assertThrows(InvalidCharacterException.class, () -> {
 			cipher.setInputStringDecode("G");
-		}, "inputString cannot contain anything except numbers 0-15, and whitespace");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Setting input string for decoding '{}'", "G");
@@ -132,7 +132,7 @@ public class TestBaseX{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputStringDecode("");
-		}, "Input must contain at least 1 letter");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Setting input string for decoding '{}'", "");
@@ -148,7 +148,7 @@ public class TestBaseX{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputStringDecode(null);
-		}, "Input cannot be null");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, never()).debug(eq("Setting input string for decoding '{}'"), anyString());
@@ -172,7 +172,7 @@ public class TestBaseX{
 	public void testSetBase_min(){
 		assertThrows(InvalidBaseException.class, () -> {
 			cipher.setBase(Character.MIN_RADIX - 1);
-		}, "Base cannot be less than " + Character.MIN_RADIX);
+		});
 
 		assertEquals(2, cipher.base);
 		verify(logger, never()).debug(eq("Setting base {}"), anyInt());
@@ -184,7 +184,7 @@ public class TestBaseX{
 	public void testSetBase_max(){
 		assertThrows(InvalidBaseException.class, () -> {
 			cipher.setBase(Character.MAX_RADIX + 1);
-		}, "Base cannot be larger than " + Character.MAX_RADIX);
+		});
 
 		assertEquals(2, cipher.base);
 		verify(logger, never()).debug(eq("Setting base {}"), anyInt());
@@ -227,7 +227,7 @@ public class TestBaseX{
 
 		assertThrows(InvalidCharacterException.class, () -> {
 			cipher.decode();
-		}, "The base 16 string FFF is not a valid ASCII character");
+		});
 
 		verify(logger, times(1)).debug("Decoding");
 		verify(logger, times(1)).debug("Current number {}", "FFF");

src/test/java/com/mattrixwv/cipherstream/monosubstitution/TestBeaufort.java

@@ -208,7 +208,7 @@ public class TestBeaufort{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputString("");
-		}, "Input must contain at least 1 letter");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Original input string '{}'", "");
@@ -224,7 +224,7 @@ public class TestBeaufort{
 	public void testSetInputString_null(){
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputString(null);
-		}, "Input must conatin at least 1 letter");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, never()).debug(eq("Original input string '{}'"), anyString());
@@ -266,7 +266,7 @@ public class TestBeaufort{
 	public void testSetKeyword_blank(){
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.setKeyword("");
-		}, "Keyword must contain at least 2 letters");
+		});
 
 		assertEquals("", cipher.keyword);
 		verify(logger, times(1)).debug("Original keyword '{}'", "");
@@ -281,7 +281,7 @@ public class TestBeaufort{
 	public void testSetKeyword_short(){
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.setKeyword("A");
-		}, "Keyword must contain at least 2 letters");
+		});
 
 		assertEquals("A", cipher.keyword);
 		verify(logger, times(1)).debug("Original keyword '{}'", "A");
@@ -296,7 +296,7 @@ public class TestBeaufort{
 	public void testSetKeyword_null(){
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.setKeyword(null);
-		}, "Keyword cannot be null");
+		});
 
 		assertEquals("", cipher.keyword);
 		verify(logger, never()).debug(eq("Original keyword '{}'"), anyString());

src/test/java/com/mattrixwv/cipherstream/monosubstitution/TestCaesar.java

@@ -190,7 +190,7 @@ public class TestCaesar{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputString("");
-		}, "Input must contain at least 1 letter");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Original input string '{}'", "");
@@ -208,7 +208,7 @@ public class TestCaesar{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputString(null);
-		}, "Input must contain at least 1 letter");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, never()).debug("Original input string '{}'", "");

src/test/java/com/mattrixwv/cipherstream/monosubstitution/TestOneTimePad.java

@@ -137,7 +137,7 @@ public class TestOneTimePad{
 
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.encode("keyword", decodedString);
-		}, "Key must be at least as long as the input");
+		});
 
 		assertEquals("", cipher.inputString);
 		assertEquals("", cipher.keyword);

src/test/java/com/mattrixwv/cipherstream/monosubstitution/TestPorta.java

@@ -107,7 +107,7 @@ public class TestPorta{
 	public void testSetKeyword_blank(){
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.setKeyword("");
-		}, "Keyword must contain at least 2 letters");
+		});
 
 		assertEquals("", cipher.keyword);
 		verify(logger, times(1)).debug("Original keyword '{}'", "");
@@ -120,7 +120,7 @@ public class TestPorta{
 	public void testSetKeyword_short(){
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.setKeyword("a");
-		}, "Keyword must contain at least 2 letters");
+		});
 
 		assertEquals("A", cipher.keyword);
 		verify(logger, times(1)).debug("Original keyword '{}'", "a");
@@ -133,7 +133,7 @@ public class TestPorta{
 	public void testSetKeyword_null(){
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.setKeyword(null);
-		}, "Keyword cannot be null");
+		});
 
 		assertEquals("", cipher.keyword);
 		verify(logger, never()).debug(anyString());
@@ -223,7 +223,7 @@ public class TestPorta{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputString("");
-		}, "Input must contain at least 1 letter");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Original input string {}", "");
@@ -241,7 +241,7 @@ public class TestPorta{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputString(null);
-		}, "Input cannot be null");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, never()).debug(anyString(), anyString());

src/test/java/com/mattrixwv/cipherstream/monosubstitution/TestSubstitution.java

@@ -172,7 +172,7 @@ public class TestSubstitution{
 	public void testSetKey_invalidLength(){
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.setKeyword("AB");
-		}, "The key must contain all letters and can contain all numbers");
+		});
 
 		assertEquals("", cipher.keyword);
 		verify(logger, times(1)).debug("Original key '{}'", "AB");
@@ -187,7 +187,7 @@ public class TestSubstitution{
 	public void testSetKey_null(){
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.setKeyword(null);
-		}, "Key cannot be null");
+		});
 
 		assertEquals("", cipher.keyword);
 		verify(logger, never()).debug(eq("Original key '{}'"), anyString());
@@ -270,7 +270,7 @@ public class TestSubstitution{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputString("");
-		}, "Input must contain at least 1 letter");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Original input string '{}'", "");
@@ -288,7 +288,7 @@ public class TestSubstitution{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputString(null);
-		}, "Input cannot be null");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, never()).debug(eq("Original input string '{}'"), anyString());

src/test/java/com/mattrixwv/cipherstream/monosubstitution/TestVigenere.java

@@ -194,7 +194,7 @@ public class TestVigenere{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputString("");
-		}, "Input cannot be null");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, times(1)).debug("Original input string '{}'", "");
@@ -214,7 +214,7 @@ public class TestVigenere{
 
 		assertThrows(InvalidInputException.class, () -> {
 			cipher.setInputString(null);
-		}, "Input must contain at least 1 letter");
+		});
 
 		assertEquals("", cipher.inputString);
 		verify(logger, never()).debug(eq("Original input string '{}'"), anyString());
@@ -240,7 +240,7 @@ public class TestVigenere{
 	public void testSetKeyword_blank(){
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.setKeyword("");
-		}, "Keyword must contain at least 2 letters");
+		});
 
 		assertEquals("", cipher.keyword);
 		assertEquals(new ArrayList<>(), cipher.offset);
@@ -254,7 +254,7 @@ public class TestVigenere{
 	public void testSetKeyword_null(){
 		assertThrows(InvalidKeywordException.class, () -> {
 			cipher.setKeyword(null);
-		}, "Keyword must contain at least 2 letters");
+		});
 
 		assertEquals("", cipher.keyword);
 		assertEquals(new ArrayList<>(), cipher.offset);