Test framework "PityTest" moved to pkg foundation.pEp.pitytest

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

@@ -18,18 +18,7 @@ CLASSPATH=.:$(REPOROOT)/src
 
 JAVA=java -enableassertions -Xcheck:jni -cp $(CLASSPATH) -Djava.library.path=$(CLASSPATH)
 
-JAVA_CLASSES_PITYTEST= \
+PITYTEST_DIR=../../../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
-
-
 
 ifdef ENGINE_LIB_PATH
 	ifeq ($(PLATFORM),linux)

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

@@ -9,17 +9,18 @@ JAVA_CLASSES = \
 	../utils/AdapterTestUtils.class \
 	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile run test clean
-
-.PHONY: compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile clean-pep-home
 	cd $(JAVA_CWD);HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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.pitytest.TestSuite;
+import foundation.pEp.pitytest.TestSuite;
-import foundation.pEp.jniadapter.test.pitytest.TestUnit;
+import foundation.pEp.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.pitytest.TestLogger.log;
+import static foundation.pEp.pitytest.TestLogger.log;
 
 class BasicTestContext extends AdapterBaseTestContext {
     Message enc;

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

@@ -8,17 +8,18 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile run test clean
-
-.PHONY: compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile clean-pep-home
 	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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

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

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

@@ -6,17 +6,18 @@ TEST_UNIT_NAME=jni88
 JAVA_CLASSES = \
  	TestMain.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile run test clean
-
-.PHONY: compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile clean-pep-home
 	cd $(JAVA_CWD);HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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

@@ -6,17 +6,18 @@ TEST_UNIT_NAME=jni91
 JAVA_CLASSES = \
  	TestMain.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile run test clean
-
-.PHONY: compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile clean-pep-home
 	cd $(JAVA_CWD);HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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

@@ -7,17 +7,18 @@ JAVA_CLASSES = \
  	TestMain.class \
  	../utils/AdapterTestUtils.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile run test clean
-
-.PHONY: compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile clean-pep-home
 	cd $(JAVA_CWD);HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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.pitytest.*;
+import foundation.pEp.pitytest.*;
 import foundation.pEp.jniadapter.*;
 
 import java.lang.Thread;

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

@@ -6,17 +6,18 @@ TEST_UNIT_NAME=jni94
 JAVA_CLASSES = \
  	TestMain.class \
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile run test clean
-
-.PHONY: compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile clean-pep-home
 	cd $(JAVA_CWD);HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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

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

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

@@ -7,17 +7,18 @@ JAVA_CLASSES = \
  	TestMain.class \
 	../utils/AdapterTestUtils.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile run test clean
-
-.PHONY: compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile clean-pep-home
 	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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.pitytest.TestUnit;
+import foundation.pEp.pitytest.TestUnit;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
 
-import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
+import static foundation.pEp.pitytest.TestLogger.log;
-import static foundation.pEp.jniadapter.test.pitytest.TestLogger.logH2;
+import static foundation.pEp.pitytest.TestLogger.logH2;
 import static foundation.pEp.jniadapter.test.utils.AdapterTestUtils.msgToString;
 
 /*

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

@@ -7,17 +7,18 @@ JAVA_CLASSES = \
  	TestMain.class \
 	../utils/AdapterBaseTestContext.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile run test clean
-
-.PHONY: compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile clean-pep-home
 	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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

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

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

@@ -9,16 +9,17 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile alice test clean
-
-.PHONY: compile alice test clean
 
 all: alice compile
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 alice: compile clean-pep-home-alice
 	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR_ALICE) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestAlice
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
-import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
+import foundation.pEp.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestAlice {

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

@@ -10,19 +10,20 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile alice bob test clean
-
-.PHONY: compile alice bob test clean
 
 all: alice compile
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 alice: compile clean-pep-home-alice
 	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR_ALICE) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestAlice
 
 bob: compile clean-pep-home-bob
 	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR_BOB) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestBob
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
-import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
+import foundation.pEp.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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
-import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
+import foundation.pEp.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestBob {

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

@@ -11,12 +11,13 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+.PHONY: pitytest compile alice bob carol test clean
-
-.PHONY: compile alice bob carol test clean
 
 all: alice compile
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 alice: compile clean-pep-home-alice
 	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR_ALICE) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestAlice
 
@@ -26,7 +27,7 @@ bob: compile clean-pep-home-bob
 carol: compile clean-pep-home-carol
 	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR_CAROL) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestCarol
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
-import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
+import foundation.pEp.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestAlice {

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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
-import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
+import foundation.pEp.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestBob {

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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
-import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
+import foundation.pEp.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestCarol {

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

@@ -1,6 +1,6 @@
 package foundation.pEp.jniadapter.test.utils;
 
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
 import foundation.pEp.jniadapter.*;
 
 import java.nio.file.Files;

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.pitytest.utils.TestUtils.clipString;
+import static foundation.pEp.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,5 +1,5 @@
 package foundation.pEp.jniadapter.test.utils;
-import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
 
 import foundation.pEp.jniadapter.*;
 

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.pitytest.utils.TestUtils;
+import foundation.pEp.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue.FsMsgQueue;
 
 import java.io.*;
 import java.util.*;
 
-import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
+import static foundation.pEp.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,8 @@ JAVA_CLASSES_FSMSGQUEUE= \
  	../../UnknownIdentityException.class \
  	../../../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= \
 	../utils/FsMQManagerTestUtils.class \
 	../ctx/FsMQManagerBaseTestContext.class
 
-JAVA_CLASSES_TESTSCOMMON += $(JAVA_CLASSES_PITYTEST)
+PITYTEST_DIR=../../../../../../../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.pitytest.*;
+import foundation.pEp.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

@@ -8,15 +8,18 @@ JAVA_CLASSES = \
 JAVA_CLASSES += $(JAVA_CLASSES_FSMSGQUEUE)
 JAVA_CLASSES += $(JAVA_CLASSES_TESTSCOMMON)
 
-.PHONY: compile run test clean
+.PHONY: pitytest compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile
 	cd $(JAVA_CWD);$(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.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/Makefile

@@ -9,17 +9,20 @@ JAVA_CLASSES = \
 JAVA_CLASSES += $(JAVA_CLASSES_FSMSGQUEUE)
 JAVA_CLASSES += $(JAVA_CLASSES_TESTSCOMMON)
 
-.PHONY: all alice bob compile clean
+.PHONY: pitytest all alice bob compile clean
 
 all: alice compile
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 alice: compile
 	cd $(JAVA_CWD);$(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestAlice
 
 bob: compile
 	cd $(JAVA_CWD);$(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestBob
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
+import foundation.pEp.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
+import foundation.pEp.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.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/Makefile

@@ -9,15 +9,18 @@ JAVA_CLASSES += $(JAVA_CLASSES_FSMSGQUEUE)
 JAVA_CLASSES += $(JAVA_CLASSES_TESTSCOMMON)
 
 
-.PHONY: compile run test clean
+.PHONY: pitytest compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile
 	cd $(JAVA_CWD);$(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.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.pitytest.TestLogger.log;
+import static foundation.pEp.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.pitytest.utils.Pair;
+import foundation.pEp.pitytest.utils.Pair;
 
-import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
-import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
+import static foundation.pEp.pitytest.utils.TestUtils.*;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -6,15 +6,4 @@ JAVA=java -enableassertions
 JAVA_CLASSES_FSMSGQUEUE= \
  	../../FsMsgQueue.class
 
-JAVA_CLASSES_PITYTEST= \
+PITYTEST_DIR=../../../../../../../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

@@ -8,15 +8,18 @@ JAVA_CLASSES = \
 JAVA_CLASSES += $(JAVA_CLASSES_FSMSGQUEUE)
 JAVA_CLASSES += $(JAVA_CLASSES_TESTSCOMMON)
 
-.PHONY: compile run test clean
+.PHONY: pitytest compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile
 	cd $(JAVA_CWD);$(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
-import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
+import static foundation.pEp.pitytest.utils.TestUtils.*;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue.*;
 
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
 
 import java.io.File;
 import java.util.ArrayList;

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

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

test/java/foundation/pEp/pitytest/Makefile

@@ -0,0 +1,24 @@
+include Makefile.conf
+
+PKGNAME=pitytest
+
+JAVA_CLASSES = $(JAVA_CLASSES_PITYTEST)
+
+.PHONY: all compile clean
+
+all: compile
+
+#run: compile clean-pep-home
+#	cd $(JAVA_CWD);HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(PKGNAME).TestMain
+
+compile: $(JAVA_CLASSES)
+
+%.class: %.java
+	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(PKGNAME)/$<
+
+clean:
+	rm -f $(JAVA_CLASSES)
+	rm -f *.class
+	rm -f *.log
+	rm -Rf .gnupg
+	rm -Rf .lldb

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

@@ -0,0 +1,17 @@
+JAVA_PKG_BASENAME=foundation.pEp
+JAVA_PKG_BASEPATH=foundation/pEp
+CLASSPATH=.
+JAVA=java -enableassertions
+JAVA_CWD=../../../
+
+JAVA_CLASSES_PITYTEST= \
+ 	TestSuite.class \
+ 	TestUnit.class \
+ 	TestContextInterface.class \
+ 	AbstractTestContext.class \
+ 	TestLogger.class \
+ 	utils/TestUtils.class \
+ 	utils/Pair.class \
+ 	TestState.class \
+ 	TestResult.class
+

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-package foundation.pEp.jniadapter.test.pitytest;
+package foundation.pEp.pitytest;
 
-import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
-import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.TermColor;
+import static foundation.pEp.pitytest.utils.TestUtils.TermColor;
-import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
+import static foundation.pEp.pitytest.utils.TestUtils.*;
 
 import java.util.ArrayList;
 

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

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

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

@@ -1,7 +1,6 @@
-JAVA_PKG_BASENAME=foundation.pEp.jniadapter.test.pitytest.examples
+JAVA_PKG_BASENAME=foundation.pEp.pitytest.examples
-JAVA_PKG_BASEPATH=foundation/pEp/jniadapter/test/pitytest/examples
+JAVA_PKG_BASEPATH=foundation/pEp/pitytest/examples
-JAVA_CWD=../../../../../../../
+JAVA_CWD=../../../../../
-JAVA=java -enableassertions
 
 JAVA_CLASSES_PITYTEST= \
  	../../TestSuite.class \
@@ -14,3 +13,4 @@ JAVA_CLASSES_PITYTEST= \
  	../../TestState.class \
  	../../TestResult.class
 
+PITYTEST_DIR=../../

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

@@ -1,3 +1,4 @@
+include ../../Makefile.conf
 include ../Makefile.conf
 
 TEST_UNIT_NAME=ctxinitfail
@@ -8,15 +9,18 @@ JAVA_CLASSES = \
 # Use PityTest
 JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
-.PHONY: compile run test clean
+.PHONY: pitytest compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile
 	cd $(JAVA_CWD);$(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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

@@ -1,8 +1,8 @@
-package foundation.pEp.jniadapter.test.pitytest.examples.ctxinitfail;
+package foundation.pEp.pitytest.examples.ctxinitfail;
 
-import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
 
 
 class CtxInitFailContext extends AbstractTestContext {

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

@@ -1,3 +1,4 @@
+include ../../Makefile.conf
 include ../Makefile.conf
 
 TEST_UNIT_NAME=ctxmembers
@@ -8,15 +9,18 @@ JAVA_CLASSES = \
 # Use PityTest
 JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
-.PHONY: compile run test clean
+.PHONY: pitytest compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile
 	cd $(JAVA_CWD);$(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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

@@ -1,7 +1,7 @@
-package foundation.pEp.jniadapter.test.pitytest.examples.ctxmembers;
+package foundation.pEp.pitytest.examples.ctxmembers;
-import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
-import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
+import foundation.pEp.pitytest.utils.TestUtils;
 
 
 // Context member object instantiation

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

@@ -1,3 +1,4 @@
+include ../../Makefile.conf
 include ../Makefile.conf
 
 TEST_UNIT_NAME=helloworld
@@ -8,15 +9,18 @@ JAVA_CLASSES = \
 # Use PityTest
 JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
-.PHONY: compile run test clean
+.PHONY: pitytest compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile
 	cd $(JAVA_CWD);$(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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

@@ -1,6 +1,6 @@
-package foundation.pEp.jniadapter.test.pitytest.examples.helloworld;
+package foundation.pEp.pitytest.examples.helloworld;
-import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
 
 
 class HelloWorldTestContext extends AbstractTestContext {

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

@@ -1,3 +1,4 @@
+include ../../Makefile.conf
 include ../Makefile.conf
 
 TEST_UNIT_NAME=testsuite
@@ -8,15 +9,18 @@ JAVA_CLASSES = \
 # Use PityTest
 JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
-.PHONY: compile run test clean
+.PHONY: pitytest compile run test clean
 
 all: compile
 	$(MAKE) run
 
+pitytest:
+	$(MAKE) -C $(PITYTEST_DIR)
+
 run: compile
 	cd $(JAVA_CWD);$(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
 
-compile: $(JAVA_CLASSES)
+compile: $(JAVA_CLASSES) pitytest
 
 %.class: %.java
 	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

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

@@ -1,6 +1,6 @@
-package foundation.pEp.jniadapter.test.pitytest.examples.testsuite;
+package foundation.pEp.pitytest.examples.testsuite;
-import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.pitytest.TestLogger.*;
-import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.pitytest.*;
 
 class TestSuiteContext extends AbstractTestContext {
     String name;

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

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

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

@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.pitytest.utils;
+package foundation.pEp.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.pitytest.TestLogger.log;
+//import static foundation.pEp.pitytest.TestLogger.log;
 
 public class TestUtils {
     // Pure static class