From 3fdc1415090cdad4d4b7072a0051434fb023298c Mon Sep 17 00:00:00 2001
From: Martijn Dirkse <martijn@integrationpartners.nl>
Date: Mon, 23 Sep 2024 16:14:20 +0200
Subject: [PATCH] Merge new test of encoding into existing one

---
 .../nl/nn/testtool/MessageEncoderTest.java    | 43 -------------------
 .../test/junit/TestMessageEncoder.java        | 38 ++++++++++++++++
 2 files changed, 38 insertions(+), 43 deletions(-)
 delete mode 100644 src/test/java/nl/nn/testtool/MessageEncoderTest.java

diff --git a/src/test/java/nl/nn/testtool/MessageEncoderTest.java b/src/test/java/nl/nn/testtool/MessageEncoderTest.java
deleted file mode 100644
index 5680012e..00000000
--- a/src/test/java/nl/nn/testtool/MessageEncoderTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package nl.nn.testtool;
-
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-public class MessageEncoderTest {
-    @Test
-    public void encode_and_decode_boolean_true() {
-        MessageEncoder instance = new MessageEncoderImpl();
-        MessageEncoder.ToStringResult encoded = instance.toString(true, null);
-        assertEquals("true", encoded.getString());
-        assertEquals("java.lang.Boolean", encoded.getMessageClassName());
-        Checkpoint checkpoint = new Checkpoint();
-        checkpoint.setMessage(encoded.getString());
-        checkpoint.setEncoding(encoded.getEncoding());
-        checkpoint.setMessageClassName(encoded.getMessageClassName());
-        Object back = instance.toObject(checkpoint);
-        if(! (back instanceof Boolean)) {
-            fail("Expected to get back Boolean");
-        }
-        assertTrue((Boolean) back);
-    }
-
-    @Test
-    public void encode_decode_boolean_false() {
-        MessageEncoder instance = new MessageEncoderImpl();
-        MessageEncoder.ToStringResult encoded = instance.toString(false, null);
-        assertEquals("false", encoded.getString());
-        assertEquals("java.lang.Boolean", encoded.getMessageClassName());
-        Checkpoint checkpoint = new Checkpoint();
-        checkpoint.setMessage(encoded.getString());
-        checkpoint.setEncoding(encoded.getEncoding());
-        checkpoint.setMessageClassName(encoded.getMessageClassName());
-        Object back = instance.toObject(checkpoint);
-        if(! (back instanceof Boolean)) {
-            fail("Expected to get back Boolean");
-        }
-        assertFalse((Boolean) back);
-    }
-}
diff --git a/src/test/java/nl/nn/testtool/test/junit/TestMessageEncoder.java b/src/test/java/nl/nn/testtool/test/junit/TestMessageEncoder.java
index 3c965182..68896c51 100644
--- a/src/test/java/nl/nn/testtool/test/junit/TestMessageEncoder.java
+++ b/src/test/java/nl/nn/testtool/test/junit/TestMessageEncoder.java
@@ -17,6 +17,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -24,8 +26,10 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import nl.nn.testtool.MessageEncoder;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.junit.rules.TestName;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
@@ -46,6 +50,40 @@ public class TestMessageEncoder {
 	@Rule
 	public TestName name = new TestName();
 
+	@Test
+	public void encode_and_decode_boolean_true() {
+		MessageEncoder instance = new MessageEncoderImpl();
+		MessageEncoder.ToStringResult encoded = instance.toString(true, null);
+		Assertions.assertEquals("true", encoded.getString());
+		Assertions.assertEquals("java.lang.Boolean", encoded.getMessageClassName());
+		Checkpoint checkpoint = new Checkpoint();
+		checkpoint.setMessage(encoded.getString());
+		checkpoint.setEncoding(encoded.getEncoding());
+		checkpoint.setMessageClassName(encoded.getMessageClassName());
+		Object back = instance.toObject(checkpoint);
+		if(! (back instanceof Boolean)) {
+			fail("Expected to get back Boolean");
+		}
+		Assertions.assertTrue((Boolean) back);
+	}
+
+	@Test
+	public void encode_decode_boolean_false() {
+		MessageEncoder instance = new MessageEncoderImpl();
+		MessageEncoder.ToStringResult encoded = instance.toString(false, null);
+		Assertions.assertEquals("false", encoded.getString());
+		Assertions.assertEquals("java.lang.Boolean", encoded.getMessageClassName());
+		Checkpoint checkpoint = new Checkpoint();
+		checkpoint.setMessage(encoded.getString());
+		checkpoint.setEncoding(encoded.getEncoding());
+		checkpoint.setMessageClassName(encoded.getMessageClassName());
+		Object back = instance.toObject(checkpoint);
+		if(! (back instanceof Boolean)) {
+			fail("Expected to get back Boolean");
+		}
+		assertFalse((Boolean) back);
+	}
+
 	@Test
 	public void testToString() throws SAXException, IOException, ParserConfigurationException, StorageException {
 		TestTool testTool = new TestTool();