From a3d28b1fbb8b26cd6e6bf4066a3152b3aaa595ab Mon Sep 17 00:00:00 2001 From: Mattrixwv Date: Mon, 22 Apr 2024 15:10:11 -0400 Subject: [PATCH] Fix broken tests --- .../combination/AdfgvxCipherControllerIntegrationTest.java | 4 ---- .../combination/AdfgxCipherControllerIntegrationTest.java | 4 ---- .../AffineCipherControllerIntegrationTest.java | 4 ---- .../AtbashCipherControllerIntegrationTest.java | 4 ---- .../AutokeyCipherControllerIntegrationTest.java | 4 ---- .../BaconianCipherControllerIntegrationTest.java | 4 ---- .../BaseXCipherControllerIntegrationTest.java | 4 ---- .../BeaufortCipherControllerIntegrationTest.java | 4 ---- .../CaesarCipherControllerIntegrationTest.java | 4 ---- .../OneTimePadCipherControllerIntegrationTest.java | 4 ---- .../PortaCipherControllerIntegrationTest.java | 4 ---- .../SubstitutionCipherControllerIntegrationTest.java | 4 ---- .../VigenereCipherControllerIntegrationTest.java | 4 ---- .../BifidCipherControllerIntegrationTest.java | 4 ---- .../ColumnarCipherControllerIntegrationTest.java | 4 ---- .../polysubstitution/HillCipherControllerIntegrationTest.java | 4 ---- .../polysubstitution/MorseCodeControllerIntegrationTest.java | 4 ---- .../PlayfairCipherControllerIntegrationTest.java | 4 ---- .../PolybiusSquareControllerIntegrationTest.java | 4 ---- .../polysubstitution/RailFenceControllerIntegrationTest.java | 4 ---- .../TrifidCipherControllerIntegrationTest.java | 4 ---- 21 files changed, 84 deletions(-) diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherControllerIntegrationTest.java index 2ffcb83..4257de9 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherControllerIntegrationTest.java @@ -71,8 +71,6 @@ public class AdfgvxCipherControllerIntegrationTest extends CipherStreamControlle @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(adfgvxName, adfgvxDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -86,8 +84,6 @@ public class AdfgvxCipherControllerIntegrationTest extends CipherStreamControlle //Controller verify(adfgvxLogger, times(1)).info("Getting info for {}", adfgvxName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, adfgvxName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherControllerIntegrationTest.java index 3e0ae41..4010179 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherControllerIntegrationTest.java @@ -71,8 +71,6 @@ public class AdfgxCipherControllerIntegrationTest extends CipherStreamController @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(adfgxName, adfgxDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -86,8 +84,6 @@ public class AdfgxCipherControllerIntegrationTest extends CipherStreamController //Controller verify(adfgxLogger, times(1)).info("Getting info for {}", adfgxName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, adfgxName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherControllerIntegrationTest.java index 3d8a3e7..232935a 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherControllerIntegrationTest.java @@ -71,8 +71,6 @@ public class AffineCipherControllerIntegrationTest extends CipherStreamControlle @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(affineName, affineDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -86,8 +84,6 @@ public class AffineCipherControllerIntegrationTest extends CipherStreamControlle //Controller verify(affineLogger, times(1)).info("Getting info for {}", affineName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, affineName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherControllerIntegrationTest.java index 85eb81b..d8767bd 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherControllerIntegrationTest.java @@ -65,8 +65,6 @@ public class AtbashCipherControllerIntegrationTest extends CipherStreamControlle @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(atbashName, atbashDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -80,8 +78,6 @@ public class AtbashCipherControllerIntegrationTest extends CipherStreamControlle //Controller verify(atbashLogger, times(1)).info("Getting info for {}", atbashName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, atbashName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherControllerIntegrationTest.java index fbc4156..22b9626 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class AutokeyCipherControllerIntegrationTest extends CipherStreamControll @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(autokeyName, autokeyDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class AutokeyCipherControllerIntegrationTest extends CipherStreamControll //Controller verify(autokeyLogger, times(1)).info("Getting info for {}", autokeyName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, autokeyName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherControllerIntegrationTest.java index 54c17e9..ce19702 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherControllerIntegrationTest.java @@ -65,8 +65,6 @@ public class BaconianCipherControllerIntegrationTest extends CipherStreamControl @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(baconianName, baconianDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -80,8 +78,6 @@ public class BaconianCipherControllerIntegrationTest extends CipherStreamControl //Controller verify(baconianLogger, times(1)).info("Getting info for {}", baconianName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, baconianName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherControllerIntegrationTest.java index f768956..965f68a 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class BaseXCipherControllerIntegrationTest extends CipherStreamController @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(baseXName, baseXDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class BaseXCipherControllerIntegrationTest extends CipherStreamController //Controller verify(baseXLogger, times(1)).info("Getting info for {}", baseXName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, baseXName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherControllerIntegrationTest.java index 073e78f..5802859 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class BeaufortCipherControllerIntegrationTest extends CipherStreamControl @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(beaufortName, beaufortDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class BeaufortCipherControllerIntegrationTest extends CipherStreamControl //Controller verify(beaufortLogger, times(1)).info("Getting info for {}", beaufortName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, beaufortName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherControllerIntegrationTest.java index edc94b0..6455238 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class CaesarCipherControllerIntegrationTest extends CipherStreamControlle @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(caesarName, caesarDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class CaesarCipherControllerIntegrationTest extends CipherStreamControlle //Controller verify(caesarLogger, times(1)).info("Getting info for {}", caesarName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, caesarName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherControllerIntegrationTest.java index 03aa892..fffc21b 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class OneTimePadCipherControllerIntegrationTest extends CipherStreamContr @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(oneTimePadName, oneTimePadDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class OneTimePadCipherControllerIntegrationTest extends CipherStreamContr //Controller verify(oneTimePadLogger, times(1)).info("Getting info for {}", oneTimePadName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, oneTimePadName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherControllerIntegrationTest.java index 099e308..3240450 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherControllerIntegrationTest.java @@ -69,8 +69,6 @@ public class PortaCipherControllerIntegrationTest extends CipherStreamController @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(portaName, portaDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -84,8 +82,6 @@ public class PortaCipherControllerIntegrationTest extends CipherStreamController //Controller verify(portaLogger, times(1)).info("Getting info for {}", portaName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, portaName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherControllerIntegrationTest.java index 35c127e..c1e1dd4 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class SubstitutionCipherControllerIntegrationTest extends CipherStreamCon @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(substitutionName, substitutionDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class SubstitutionCipherControllerIntegrationTest extends CipherStreamCon //Controller verify(substitutionLogger, times(1)).info("Getting info for {}", substitutionName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, substitutionName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherControllerIntegrationTest.java index 67806af..8dd9d75 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class VigenereCipherControllerIntegrationTest extends CipherStreamControl @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(vigenereName, vigenereDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class VigenereCipherControllerIntegrationTest extends CipherStreamControl //Controller verify(vigenereLogger, times(1)).info("Getting info for {}", vigenereName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, vigenereName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherControllerIntegrationTest.java index 6e1a0dc..6f88c77 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class BifidCipherControllerIntegrationTest extends CipherStreamController @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(bifidName, bifidDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class BifidCipherControllerIntegrationTest extends CipherStreamController //Controller verify(bifidLogger, times(1)).info("Getting info for {}", bifidName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, bifidName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherControllerIntegrationTest.java index f35711c..74c300a 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class ColumnarCipherControllerIntegrationTest extends CipherStreamControl @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(columnarName, columnarDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class ColumnarCipherControllerIntegrationTest extends CipherStreamControl //Controller verify(columnarLogger, times(1)).info("Getting info for {}", columnarName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, columnarName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherControllerIntegrationTest.java index cd87442..abc07b0 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class HillCipherControllerIntegrationTest extends CipherStreamControllerI @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(hillName, hillDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class HillCipherControllerIntegrationTest extends CipherStreamControllerI //Controller verify(hillLogger, times(1)).info("Getting info for {}", hillName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, hillName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeControllerIntegrationTest.java index 22740da..f53fa35 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeControllerIntegrationTest.java @@ -58,8 +58,6 @@ public class MorseCodeControllerIntegrationTest extends CipherStreamControllerIn @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(morseName, morseDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -73,8 +71,6 @@ public class MorseCodeControllerIntegrationTest extends CipherStreamControllerIn //Controller verify(morseLogger, times(1)).info("Getting info for {}", morseName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, morseName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherControllerIntegrationTest.java index 387aeb6..5f30d20 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherControllerIntegrationTest.java @@ -69,8 +69,6 @@ public class PlayfairCipherControllerIntegrationTest extends CipherStreamControl @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(playfairName, playfairDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -84,8 +82,6 @@ public class PlayfairCipherControllerIntegrationTest extends CipherStreamControl //Controller verify(playfairLogger, times(1)).info("Getting info for {}", playfairName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, playfairName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareControllerIntegrationTest.java index a74130f..b9f741a 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class PolybiusSquareControllerIntegrationTest extends CipherStreamControl @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(polybiusName, polybiusDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class PolybiusSquareControllerIntegrationTest extends CipherStreamControl //Controller verify(polybiusLogger, times(1)).info("Getting info for {}", polybiusName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, polybiusName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceControllerIntegrationTest.java index e06385f..00a319c 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceControllerIntegrationTest.java @@ -68,8 +68,6 @@ public class RailFenceControllerIntegrationTest extends CipherStreamControllerIn @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(railFenceName, railFenceDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -83,8 +81,6 @@ public class RailFenceControllerIntegrationTest extends CipherStreamControllerIn //Controller verify(railFenceLogger, times(1)).info("Getting info for {}", railFenceName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, railFenceName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherControllerIntegrationTest.java index 7fba5d8..b63fb2f 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherControllerIntegrationTest.java @@ -74,8 +74,6 @@ public class TrifidCipherControllerIntegrationTest extends CipherStreamControlle @Test public void testGetCipherInfo() throws Exception{ - ObjectNode infoNode = CipherInfoUtil.buildInfoNode(trifidName, trifidDescription); - mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddress)) @@ -89,8 +87,6 @@ public class TrifidCipherControllerIntegrationTest extends CipherStreamControlle //Controller verify(trifidLogger, times(1)).info("Getting info for {}", trifidName); verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, trifidName); - //Cipher Aspect - verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode); } @Test