Test framework is now called PityTest (YAY)

test/java/foundation/pEp/jniadapter/test/Makefile.conf

@@ -16,18 +16,18 @@ PEP_HOME_DIR=$(PEP_HOME_DIR_ALICE)
 
 CLASSPATH=.:$(REPOROOT)/src
 
-JAVA=java -Xcheck:jni -cp $(CLASSPATH) -Djava.library.path=$(CLASSPATH)
-
-JAVA_CLASSES_FRAMEWORK= \
- 	../framework/TestSuite.class \
-	../framework/TestUnit.class \
-	../framework/TestContextInterface.class \
-	../framework/AbstractTestContext.class \
-	../framework/TestLogger.class \
-	../framework/utils/TestUtils.class \
-	../framework/utils/Pair.class \
-	../framework/TestState.class \
-	../framework/TestResult.class
+JAVA=java -enableassertions -Xcheck:jni -cp $(CLASSPATH) -Djava.library.path=$(CLASSPATH)
+
+JAVA_CLASSES_PITYTEST= \
+ 	../pitytest/TestSuite.class \
+	../pitytest/TestUnit.class \
+	../pitytest/TestContextInterface.class \
+	../pitytest/AbstractTestContext.class \
+	../pitytest/TestLogger.class \
+	../pitytest/utils/TestUtils.class \
+	../pitytest/utils/Pair.class \
+	../pitytest/TestState.class \
+	../pitytest/TestResult.class
 
 
 

test/java/foundation/pEp/jniadapter/test/basic/Makefile

@@ -9,7 +9,7 @@ JAVA_CLASSES = \
 	../utils/AdapterTestUtils.class \
 	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/basic/TestMain.java

@@ -4,14 +4,14 @@ import foundation.pEp.jniadapter.Blob;
 import foundation.pEp.jniadapter.Engine;
 import foundation.pEp.jniadapter.Identity;
 import foundation.pEp.jniadapter.Message;
-import foundation.pEp.jniadapter.test.framework.TestSuite;
-import foundation.pEp.jniadapter.test.framework.TestUnit;
+import foundation.pEp.jniadapter.test.pitytest.TestSuite;
+import foundation.pEp.jniadapter.test.pitytest.TestUnit;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
 import foundation.pEp.jniadapter.test.utils.AdapterTestUtils;
 
 import java.util.Vector;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
 
 class BasicTestContext extends AdapterBaseTestContext {
     Message enc;

test/java/foundation/pEp/jniadapter/test/jni100/Makefile

@@ -8,7 +8,7 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java

@@ -1,5 +1,5 @@
 package foundation.pEp.jniadapter.test.jni100;
-import  foundation.pEp.jniadapter.test.framework.*;
+import  foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.*;
 import foundation.pEp.jniadapter.test.utils.*;
 

test/java/foundation/pEp/jniadapter/test/jni88/Makefile

@@ -6,6 +6,8 @@ TEST_UNIT_NAME=jni88
 JAVA_CLASSES = \
  	TestMain.class
 
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+
 .PHONY: compile run test clean
 
 all: compile

test/java/foundation/pEp/jniadapter/test/jni91/Makefile

@@ -6,6 +6,8 @@ TEST_UNIT_NAME=jni91
 JAVA_CLASSES = \
  	TestMain.class
 
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+
 .PHONY: compile run test clean
 
 all: compile

test/java/foundation/pEp/jniadapter/test/jni92/Makefile

@@ -7,6 +7,8 @@ JAVA_CLASSES = \
  	TestMain.class \
  	../utils/AdapterTestUtils.class
 
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+
 .PHONY: compile run test clean
 
 all: compile

test/java/foundation/pEp/jniadapter/test/jni92/TestMain.java

@@ -1,6 +1,6 @@
 package foundation.pEp.jniadapter.test.jni92;
 import foundation.pEp.jniadapter.test.utils.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.*;
 
 import java.lang.Thread;

test/java/foundation/pEp/jniadapter/test/jni94/Makefile

@@ -6,7 +6,7 @@ TEST_UNIT_NAME=jni94
 JAVA_CLASSES = \
  	TestMain.class \
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/jni94/TestMain.java

@@ -1,5 +1,5 @@
 package foundation.pEp.jniadapter.test.jni94;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.*;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
 

test/java/foundation/pEp/jniadapter/test/jni98/Makefile

@@ -7,7 +7,7 @@ JAVA_CLASSES = \
  	TestMain.class \
 	../utils/AdapterTestUtils.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java

@@ -2,11 +2,11 @@ package foundation.pEp.jniadapter.test.jni98;
 
 import foundation.pEp.jniadapter.Engine;
 import foundation.pEp.jniadapter.Message;
-import foundation.pEp.jniadapter.test.framework.TestUnit;
+import foundation.pEp.jniadapter.test.pitytest.TestUnit;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.logH2;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.logH2;
 import static foundation.pEp.jniadapter.test.utils.AdapterTestUtils.msgToString;
 
 /*

test/java/foundation/pEp/jniadapter/test/framework/AbstractTestContext.java → test/java/foundation/pEp/jniadapter/test/pitytest/AbstractTestContext.java

@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
 public abstract class AbstractTestContext implements TestContextInterface{
     private boolean isInitialized = false;

test/java/foundation/pEp/jniadapter/test/framework/TestContextInterface.java → test/java/foundation/pEp/jniadapter/test/pitytest/TestContextInterface.java

@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
 public interface TestContextInterface {
     void init() throws Throwable;

test/java/foundation/pEp/jniadapter/test/framework/TestLogger.java → test/java/foundation/pEp/jniadapter/test/pitytest/TestLogger.java

@@ -1,11 +1,11 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
 
 public class TestLogger {
     static {

test/java/foundation/pEp/jniadapter/test/framework/TestResult.java → test/java/foundation/pEp/jniadapter/test/pitytest/TestResult.java

@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
 public enum TestResult {
     UNEVALUATED,

test/java/foundation/pEp/jniadapter/test/framework/TestState.java → test/java/foundation/pEp/jniadapter/test/pitytest/TestState.java

@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
 public enum TestState {
     UNEVALUATED,

test/java/foundation/pEp/jniadapter/test/framework/TestSuite.java → test/java/foundation/pEp/jniadapter/test/pitytest/TestSuite.java

@@ -1,14 +1,14 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.TermColor;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.TermColor;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
 
 import java.util.ArrayList;
 
 // There is a static defaultTestSuite
 // The last created instance is the defaultTestSuite by default
-// Env var: TFVERBOSE
+// Env var: PITYVERBOSE
 
 public class TestSuite {
     private static TestSuite defaultTestSuite = null;
@@ -16,7 +16,7 @@ public class TestSuite {
     private boolean verboseMode = false;
     private boolean verboseModeSetByEnv = false;
     private TermColor testColor = TermColor.CYAN;
-    private String EVNVARNAME_VERBOSE = "TFVERBOSE";
+    private String EVNVARNAME_VERBOSE = "PITYVERBOSE";
 
     public TestSuite() {
         setDefault();

test/java/foundation/pEp/jniadapter/test/framework/TestUnit.java → test/java/foundation/pEp/jniadapter/test/pitytest/TestUnit.java

@@ -1,10 +1,10 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.TermColor;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.colorString;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.TermColor;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.colorString;
 
 import java.util.function.Consumer;
 

test/java/foundation/pEp/jniadapter/test/framework/examples/Makefile.conf → test/java/foundation/pEp/jniadapter/test/pitytest/examples/Makefile.conf

@@ -1,9 +1,9 @@
-JAVA_PKG_BASENAME=foundation.pEp.jniadapter.test.framework.examples
-JAVA_PKG_BASEPATH=foundation/pEp/jniadapter/test/framework/examples
+JAVA_PKG_BASENAME=foundation.pEp.jniadapter.test.pitytest.examples
+JAVA_PKG_BASEPATH=foundation/pEp/jniadapter/test/pitytest/examples
 JAVA_CWD=../../../../../../../
-JAVA=java
+JAVA=java -enableassertions
 
-JAVA_CLASSES_FRAMEWORK= \
+JAVA_CLASSES_PITYTEST= \
  	../../TestSuite.class \
  	../../TestUnit.class \
  	../../TestContextInterface.class \

test/java/foundation/pEp/jniadapter/test/framework/examples/ctxinitfail/Makefile → test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/Makefile

@@ -5,8 +5,8 @@ TEST_UNIT_NAME=ctxinitfail
 JAVA_CLASSES = \
  	TestMain.class \
 
-# Use the test framework
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+# Use PityTest
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/framework/examples/ctxinitfail/TestMain.java → test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/TestMain.java

@@ -1,8 +1,8 @@
-package foundation.pEp.jniadapter.test.framework.examples.ctxinitfail;
+package foundation.pEp.jniadapter.test.pitytest.examples.ctxinitfail;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 
 
 class CtxInitFailContext extends AbstractTestContext {
@@ -11,7 +11,7 @@ class CtxInitFailContext extends AbstractTestContext {
 
     @Override
     public void init() throws Throwable {
-        name = "UnitTestFrameWorkWithoutAName";
+        name = "PityTest";
         result = 50 / 0;
     }
 }
@@ -22,13 +22,13 @@ class TestMain {
 
         new TestUnit<CtxInitFailContext>("ctxinitfail1", new CtxInitFailContext(), ctx -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("Hello World from: " + ctx.name);
         });
 
         new TestUnit<CtxInitFailContext>("ctxinitfail1", new CtxInitFailContext(), ctx -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("Hello World from: " + ctx.name);
         });
 
@@ -36,19 +36,19 @@ class TestMain {
 
         new TestUnit<CtxInitFailContext>("ctxinitfail2", failingContext, ctx -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("Hello World from: " + ctx.name);
         });
 
         new TestUnit<CtxInitFailContext>("ctxinitfail3", failingContext, ctx -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("Hello World from: " + ctx.name);
         });
 
         new TestUnit<CtxInitFailContext>("ctxinitfail4", failingContext, ctx -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("Hello World from: " + ctx.name);
         });
 

test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/Makefile → test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/Makefile

@@ -5,8 +5,8 @@ TEST_UNIT_NAME=ctxmembers
 JAVA_CLASSES = \
  	TestMain.class \
 
-# Use the test framework
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+# Use PityTest
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/TestMain.java → test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/TestMain.java

@@ -1,7 +1,7 @@
-package foundation.pEp.jniadapter.test.framework.examples.ctxmembers;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+package foundation.pEp.jniadapter.test.pitytest.examples.ctxmembers;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 
 
 // Context member object instantiation
@@ -22,7 +22,7 @@ class CtxMembersTestContext extends AbstractTestContext {
         log("=== OUTPUT FROM TEST CONTEXT INIT BEGIN ===");
         log(getTestContextName()+ " - init() called");
         correct = new ExampleCtxMember(true);
-        name = "UnitTestFrameWorkWithoutAName";
+        name = "PityTest";
         log("=== OUTPUT FROM TEST CONTEXT INIT END   ===");
     }
 }
@@ -31,7 +31,7 @@ class TestMain {
     public static void main(String[] args) throws Exception {
         TestUnit test = new TestUnit<CtxMembersTestContext>("ctxmembers",new CtxMembersTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("=== OUTPUT FROM THE TEST ITSELF BEGIN ===");
             log("Hello World from: " + ctx.name);
             log("=== OUTPUT FROM THE TEST ITSELF END   ===");

test/java/foundation/pEp/jniadapter/test/framework/examples/helloworld/Makefile → test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/Makefile

@@ -5,8 +5,8 @@ TEST_UNIT_NAME=helloworld
 JAVA_CLASSES = \
  	TestMain.class \
 
-# Use the test framework
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+# Use PityTest
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/framework/examples/helloworld/TestMain.java → test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/TestMain.java

@@ -1,6 +1,6 @@
-package foundation.pEp.jniadapter.test.framework.examples.helloworld;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
+package foundation.pEp.jniadapter.test.pitytest.examples.helloworld;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 
 
 class HelloWorldTestContext extends AbstractTestContext {
@@ -8,7 +8,7 @@ class HelloWorldTestContext extends AbstractTestContext {
 
     @Override
     public void init() throws Throwable {
-        name = "UnitTestFrameWorkWithoutAName";
+        name = "PityTest";
     }
 }
 
@@ -16,7 +16,7 @@ class TestMain {
     public static void main(String[] args) throws Exception {
         new TestUnit<HelloWorldTestContext>("Hello World1",new HelloWorldTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("=== OUTPUT FROM THE TEST ITSELF BEGIN ===");
             log("OK Hello World 1 from: " + ctx.name);
             log("=== OUTPUT FROM THE TEST ITSELF END   ===");
@@ -24,7 +24,7 @@ class TestMain {
 
         new TestUnit<HelloWorldTestContext>("Hello World2",new HelloWorldTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("=== OUTPUT FROM THE TEST ITSELF BEGIN ===");
             log("OK Hello World 2 from: " + ctx.name);
             log("=== OUTPUT FROM THE TEST ITSELF END   ===");
@@ -32,11 +32,11 @@ class TestMain {
 
         new TestUnit<HelloWorldTestContext>("Hello World3",new HelloWorldTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("=== OUTPUT FROM THE TEST ITSELF BEGIN ===");
             log("Failing Hello World 3 from: " + ctx.name);
             log("=== OUTPUT FROM THE TEST ITSELF END   ===");
-            throw new RuntimeException();
+            assert false;
         }).run();
     }
 }

test/java/foundation/pEp/jniadapter/test/framework/examples/testsuite/Makefile → test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/Makefile

@@ -5,8 +5,8 @@ TEST_UNIT_NAME=testsuite
 JAVA_CLASSES = \
  	TestMain.class \
 
-# Use the test framework
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+# Use PityTest
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/framework/examples/testsuite/TestMain.java → test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/TestMain.java

@@ -1,13 +1,13 @@
-package foundation.pEp.jniadapter.test.framework.examples.testsuite;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
+package foundation.pEp.jniadapter.test.pitytest.examples.testsuite;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 
 class TestSuiteContext extends AbstractTestContext {
     String name;
 
     @Override
     public void init() throws Throwable {
-        name = "UnitTestFrameWorkWithoutAName";
+        name = "PityTest";
     }
 }
 

test/java/foundation/pEp/jniadapter/test/framework/utils/Pair.java → test/java/foundation/pEp/jniadapter/test/pitytest/utils/Pair.java

@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework.utils;
+package foundation.pEp.jniadapter.test.pitytest.utils;
 
 public class Pair<K, V> {
     private K key = null;

test/java/foundation/pEp/jniadapter/test/framework/utils/TestUtils.java → test/java/foundation/pEp/jniadapter/test/pitytest/utils/TestUtils.java

@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework.utils;
+package foundation.pEp.jniadapter.test.pitytest.utils;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-//import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
+//import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
 
 public class TestUtils {
     // Pure static class

test/java/foundation/pEp/jniadapter/test/regression/Makefile

@@ -7,7 +7,7 @@ JAVA_CLASSES = \
  	TestMain.class \
 	../utils/AdapterBaseTestContext.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/regression/TestMain.java

@@ -1,5 +1,5 @@
 package foundation.pEp.jniadapter.test.regression;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.test.utils.*;
 import foundation.pEp.jniadapter.*;
 

test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile

@@ -9,7 +9,7 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile alice test clean
 

test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java

@@ -1,7 +1,7 @@
 package foundation.pEp.jniadapter.test.templateAlice;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestAlice {
@@ -11,7 +11,7 @@ class TestAlice {
 
         new TestUnit<AdapterBaseTestContext>("Test Alice",new AdapterBaseTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
 
             ctx.alice = ctx.engine.myself(ctx.alice);
 

test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile

@@ -10,7 +10,7 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile alice bob test clean
 

test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java

@@ -1,9 +1,9 @@
 package foundation.pEp.jniadapter.test.templateAliceBob;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestAlice {

test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java

@@ -1,9 +1,9 @@
 package foundation.pEp.jniadapter.test.templateAliceBob;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestBob {

test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile

@@ -11,7 +11,7 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile alice bob carol test clean
 

test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java

@@ -1,7 +1,7 @@
 package foundation.pEp.jniadapter.test.templateAliceBobCarol;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestAlice {
@@ -11,7 +11,7 @@ class TestAlice {
 
         new TestUnit<AdapterBaseTestContext>("Test Alice",new AdapterBaseTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
 
             ctx.alice = ctx.engine.myself(ctx.alice);
 

test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java

@@ -1,7 +1,7 @@
 package foundation.pEp.jniadapter.test.templateAliceBobCarol;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestBob {
@@ -11,7 +11,7 @@ class TestBob {
 
         new TestUnit<AdapterBaseTestContext>("Test Bob",new AdapterBaseTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
 
             ctx.bob = ctx.engine.myself(ctx.bob);
 

test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java

@@ -1,7 +1,7 @@
 package foundation.pEp.jniadapter.test.templateAliceBobCarol;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestCarol {
@@ -11,7 +11,7 @@ class TestCarol {
 
         new TestUnit<AdapterBaseTestContext>("Test Carol",new AdapterBaseTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
 
 //            ctx.carol = ctx.engine.myself(ctx.carol);
 

test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java

@@ -1,10 +1,7 @@
 package foundation.pEp.jniadapter.test.utils;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.*;
-import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

test/java/foundation/pEp/jniadapter/test/utils/AdapterTestUtils.java

@@ -4,7 +4,7 @@ import foundation.pEp.jniadapter.*;
 import java.util.ArrayList;
 import java.util.Vector;
 
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.clipString;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.clipString;
 
 public class AdapterTestUtils {
     public static String identityToString(Identity i, Boolean full) {

test/java/foundation/pEp/jniadapter/test/utils/TestCallbacks.java

@@ -1,6 +1,6 @@
 package foundation.pEp.jniadapter.test.utils;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+
 import foundation.pEp.jniadapter.*;
 
 public class TestCallbacks implements Sync.MessageToSendCallback, Sync.NotifyHandshakeCallback {

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/FsMQManager.java

@@ -1,12 +1,12 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager;
 
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue.FsMsgQueue;
 
 import java.io.*;
 import java.util.*;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
 
 public class FsMQManager {
     public FsMQIdentities identities = null;

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/Makefile.conf

@@ -11,19 +11,19 @@ JAVA_CLASSES_FSMSGQUEUE= \
  	../../UnknownIdentityException.class \
  	../../../fsmsgqueue/FsMsgQueue.class
 
-JAVA_CLASSES_FRAMEWORK= \
- 	../../../../../framework/TestSuite.class \
- 	../../../../../framework/TestUnit.class \
- 	../../../../../framework/TestContextInterface.class \
- 	../../../../../framework/AbstractTestContext.class \
- 	../../../../../framework/TestLogger.class \
- 	../../../../../framework/utils/TestUtils.class \
- 	../../../../../framework/utils/Pair.class \
- 	../../../../../framework/TestState.class \
- 	../../../../../framework/TestResult.class
+JAVA_CLASSES_PITYTEST= \
+ 	../../../../../pitytest/TestSuite.class \
+ 	../../../../../pitytest/TestUnit.class \
+ 	../../../../../pitytest/TestContextInterface.class \
+ 	../../../../../pitytest/AbstractTestContext.class \
+ 	../../../../../pitytest/TestLogger.class \
+ 	../../../../../pitytest/utils/TestUtils.class \
+ 	../../../../../pitytest/utils/Pair.class \
+ 	../../../../../pitytest/TestState.class \
+ 	../../../../../pitytest/TestResult.class
 
 JAVA_CLASSES_TESTSCOMMON= \
 	../utils/FsMQManagerTestUtils.class \
 	../ctx/FsMQManagerBaseTestContext.class
 
-JAVA_CLASSES_TESTSCOMMON += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES_TESTSCOMMON += $(JAVA_CLASSES_PITYTEST)

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerBaseTestContext.java

@@ -1,7 +1,7 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.ctx;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.utils.FsMQManagerTestUtils;
 
 import java.util.*;

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile

@@ -6,6 +6,7 @@ JAVA_CLASSES = \
  	TestMain.class \
 
 JAVA_CLASSES += $(JAVA_CLASSES_FSMSGQUEUE)
+JAVA_CLASSES += $(JAVA_CLASSES_TESTSCOMMON)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/TestMain.java

@@ -1,9 +1,9 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.identities;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.utils.FsMQManagerTestUtils;
 
 import java.util.ArrayList;

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestAlice.java

@@ -1,10 +1,10 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.stateless_ping;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.ctx.*;
 
 import java.io.IOException;

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestBob.java

@@ -1,10 +1,10 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.stateless_ping;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.ctx.*;
 
 import java.io.IOException;

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/TestMain.java

@@ -1,9 +1,9 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.stateless_rxtx;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 
 import java.util.ArrayList;
 

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/utils/FsMQManagerTestUtils.java

@@ -3,7 +3,7 @@ package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.utils;
 import java.util.ArrayList;
 import java.util.List;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
 
 public class FsMQManagerTestUtils {
     public static List<String> createTestMessages(String from, int count) {

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/FsMsgQueue.java

@@ -1,9 +1,9 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue;
 
-import foundation.pEp.jniadapter.test.framework.utils.Pair;
+import foundation.pEp.jniadapter.test.pitytest.utils.Pair;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
 
 import java.io.File;
 import java.io.IOException;

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/Makefile.conf

@@ -5,3 +5,16 @@ JAVA=java -enableassertions
 
 JAVA_CLASSES_FSMSGQUEUE= \
  	../../FsMsgQueue.class
+
+JAVA_CLASSES_PITYTEST= \
+ 	../../../../../pitytest/TestSuite.class \
+ 	../../../../../pitytest/TestUnit.class \
+ 	../../../../../pitytest/TestContextInterface.class \
+ 	../../../../../pitytest/AbstractTestContext.class \
+ 	../../../../../pitytest/TestLogger.class \
+ 	../../../../../pitytest/utils/TestUtils.class \
+ 	../../../../../pitytest/utils/Pair.class \
+ 	../../../../../pitytest/TestState.class \
+ 	../../../../../pitytest/TestResult.class
+
+JAVA_CLASSES_TESTSCOMMON += $(JAVA_CLASSES_PITYTEST)

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile

@@ -6,6 +6,7 @@ JAVA_CLASSES = \
  	TestMain.class \
 
 JAVA_CLASSES += $(JAVA_CLASSES_FSMSGQUEUE)
+JAVA_CLASSES += $(JAVA_CLASSES_TESTSCOMMON)
 
 .PHONY: compile run test clean
 

test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/TestMain.java

@@ -1,11 +1,11 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue.test.regression;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue.*;
 
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 
 import java.io.File;
 import java.util.ArrayList;