From 2c33a4430df3c47f256518881929ac2e8132f1d3 Mon Sep 17 00:00:00 2001 From: heck Date: Thu, 18 Jun 2020 16:17:17 +0200 Subject: [PATCH] Test framework "PityTest" moved to pkg foundation.pEp.pitytest --- .../pEp/jniadapter/test/Makefile.conf | 13 +--------- .../pEp/jniadapter/test/basic/Makefile | 9 +++---- .../pEp/jniadapter/test/basic/TestMain.java | 6 ++--- .../pEp/jniadapter/test/jni100/Makefile | 9 +++---- .../pEp/jniadapter/test/jni100/TestMain.java | 2 +- .../pEp/jniadapter/test/jni88/Makefile | 9 +++---- .../pEp/jniadapter/test/jni91/Makefile | 9 +++---- .../pEp/jniadapter/test/jni92/Makefile | 9 +++---- .../pEp/jniadapter/test/jni92/TestMain.java | 2 +- .../pEp/jniadapter/test/jni94/Makefile | 9 +++---- .../pEp/jniadapter/test/jni94/TestMain.java | 2 +- .../pEp/jniadapter/test/jni98/Makefile | 9 +++---- .../pEp/jniadapter/test/jni98/TestMain.java | 6 ++--- .../pEp/jniadapter/test/regression/Makefile | 9 +++---- .../jniadapter/test/regression/TestMain.java | 2 +- .../jniadapter/test/templateAlice/Makefile | 9 +++---- .../test/templateAlice/TestAlice.java | 6 ++--- .../jniadapter/test/templateAliceBob/Makefile | 9 +++---- .../test/templateAliceBob/TestAlice.java | 6 ++--- .../test/templateAliceBob/TestBob.java | 6 ++--- .../test/templateAliceBobCarol/Makefile | 9 +++---- .../test/templateAliceBobCarol/TestAlice.java | 6 ++--- .../test/templateAliceBobCarol/TestBob.java | 6 ++--- .../test/templateAliceBobCarol/TestCarol.java | 6 ++--- .../test/utils/AdapterBaseTestContext.java | 2 +- .../test/utils/AdapterTestUtils.java | 2 +- .../jniadapter/test/utils/TestCallbacks.java | 2 +- .../transport/fsmqmanager/FsMQManager.java | 4 ++-- .../transport/fsmqmanager/test/Makefile.conf | 13 +--------- .../test/ctx/FsMQManagerBaseTestContext.java | 2 +- .../fsmqmanager/test/identities/Makefile | 7 ++++-- .../fsmqmanager/test/identities/TestMain.java | 4 ++-- .../fsmqmanager/test/stateless_ping/Makefile | 7 ++++-- .../test/stateless_ping/TestAlice.java | 6 ++--- .../test/stateless_ping/TestBob.java | 6 ++--- .../fsmqmanager/test/stateless_rxtx/Makefile | 7 ++++-- .../test/stateless_rxtx/TestMain.java | 4 ++-- .../test/utils/FsMQManagerTestUtils.java | 2 +- .../transport/fsmsgqueue/FsMsgQueue.java | 6 ++--- .../transport/fsmsgqueue/test/Makefile.conf | 13 +--------- .../fsmsgqueue/test/regression/Makefile | 7 ++++-- .../fsmsgqueue/test/regression/TestMain.java | 6 ++--- .../pitytest/AbstractTestContext.java | 2 +- test/java/foundation/pEp/pitytest/Makefile | 24 +++++++++++++++++++ .../foundation/pEp/pitytest/Makefile.conf | 17 +++++++++++++ .../pitytest/TestContextInterface.java | 2 +- .../test => }/pitytest/TestLogger.java | 6 ++--- .../test => }/pitytest/TestResult.java | 2 +- .../test => }/pitytest/TestState.java | 2 +- .../test => }/pitytest/TestSuite.java | 8 +++---- .../test => }/pitytest/TestUnit.java | 10 ++++---- .../test => }/pitytest/examples/Makefile.conf | 8 +++---- .../pitytest/examples/ctxinitfail/Makefile | 8 +++++-- .../examples/ctxinitfail/TestMain.java | 6 ++--- .../pitytest/examples/ctxmembers/Makefile | 8 +++++-- .../examples/ctxmembers/TestMain.java | 8 +++---- .../pitytest/examples/helloworld/Makefile | 8 +++++-- .../examples/helloworld/TestMain.java | 6 ++--- .../pitytest/examples/testsuite/Makefile | 8 +++++-- .../pitytest/examples/testsuite/TestMain.java | 6 ++--- .../test => }/pitytest/utils/Pair.java | 2 +- .../test => }/pitytest/utils/TestUtils.java | 4 ++-- 62 files changed, 230 insertions(+), 183 deletions(-) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/AbstractTestContext.java (94%) create mode 100644 test/java/foundation/pEp/pitytest/Makefile create mode 100644 test/java/foundation/pEp/pitytest/Makefile.conf rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/TestContextInterface.java (86%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/TestLogger.java (94%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/TestResult.java (61%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/TestState.java (73%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/TestSuite.java (91%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/TestUnit.java (94%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/examples/Makefile.conf (59%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/examples/ctxinitfail/Makefile (72%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/examples/ctxinitfail/TestMain.java (89%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/examples/ctxmembers/Makefile (72%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/examples/ctxmembers/TestMain.java (86%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/examples/helloworld/Makefile (72%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/examples/helloworld/TestMain.java (88%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/examples/testsuite/Makefile (72%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/examples/testsuite/TestMain.java (86%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/utils/Pair.java (87%) rename test/java/foundation/pEp/{jniadapter/test => }/pitytest/utils/TestUtils.java (98%) diff --git a/test/java/foundation/pEp/jniadapter/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/Makefile.conf index 6100b2c..0ee4a7b 100644 --- a/test/java/foundation/pEp/jniadapter/test/Makefile.conf +++ b/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/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 - - +PITYTEST_DIR=../../../pitytest ifdef ENGINE_LIB_PATH ifeq ($(PLATFORM),linux) diff --git a/test/java/foundation/pEp/jniadapter/test/basic/Makefile b/test/java/foundation/pEp/jniadapter/test/basic/Makefile index d42697f..0b1c12a 100644 --- a/test/java/foundation/pEp/jniadapter/test/basic/Makefile +++ b/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: compile run test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java b/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java index 82d25b1..d1f290c 100644 --- a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java +++ b/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.jniadapter.test.pitytest.TestUnit; +import foundation.pEp.pitytest.TestSuite; +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; diff --git a/test/java/foundation/pEp/jniadapter/test/jni100/Makefile b/test/java/foundation/pEp/jniadapter/test/jni100/Makefile index 96a4b47..caec686 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni100/Makefile +++ b/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: compile run test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java index 0897498..2a0ddd8 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java +++ b/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.*; diff --git a/test/java/foundation/pEp/jniadapter/test/jni88/Makefile b/test/java/foundation/pEp/jniadapter/test/jni88/Makefile index 38367ba..9b8b4bf 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni88/Makefile +++ b/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: compile run test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/jni91/Makefile b/test/java/foundation/pEp/jniadapter/test/jni91/Makefile index d5a474f..d9a904c 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni91/Makefile +++ b/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: compile run test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/jni92/Makefile b/test/java/foundation/pEp/jniadapter/test/jni92/Makefile index 56db63a..290268b 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni92/Makefile +++ b/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: compile run test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/jni92/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni92/TestMain.java index 439b95e..5a9d3c7 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni92/TestMain.java +++ b/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; diff --git a/test/java/foundation/pEp/jniadapter/test/jni94/Makefile b/test/java/foundation/pEp/jniadapter/test/jni94/Makefile index 69812e8..1d3819a 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni94/Makefile +++ b/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: compile run test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/jni94/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni94/TestMain.java index f20e04e..9e1115c 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni94/TestMain.java +++ b/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; diff --git a/test/java/foundation/pEp/jniadapter/test/jni98/Makefile b/test/java/foundation/pEp/jniadapter/test/jni98/Makefile index 46b41b7..0243a27 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni98/Makefile +++ b/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: compile run test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java index ff85ed3..a8327e1 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java +++ b/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.jniadapter.test.pitytest.TestLogger.logH2; +import static foundation.pEp.pitytest.TestLogger.log; +import static foundation.pEp.pitytest.TestLogger.logH2; import static foundation.pEp.jniadapter.test.utils.AdapterTestUtils.msgToString; /* diff --git a/test/java/foundation/pEp/jniadapter/test/regression/Makefile b/test/java/foundation/pEp/jniadapter/test/regression/Makefile index 0df99b2..2271f45 100644 --- a/test/java/foundation/pEp/jniadapter/test/regression/Makefile +++ b/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: compile run test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java index d01b3a6..f48b501 100644 --- a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java +++ b/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.*; diff --git a/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile index 4ea392e..e1e5748 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile +++ b/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: compile alice test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java index d82a4f7..9904bf2 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java +++ b/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 foundation.pEp.jniadapter.test.pitytest.*; -import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils; +import static foundation.pEp.pitytest.TestLogger.*; +import foundation.pEp.pitytest.*; +import foundation.pEp.pitytest.utils.TestUtils; import foundation.pEp.jniadapter.test.utils.*; class TestAlice { diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile index a868856..6595fb5 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile +++ b/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: compile alice bob test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java index c200e88..f905aca 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java +++ b/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.jniadapter.test.pitytest.utils.TestUtils; +import foundation.pEp.pitytest.*; +import foundation.pEp.pitytest.utils.TestUtils; import foundation.pEp.jniadapter.test.utils.*; class TestAlice { diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java index d70c030..38165c6 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java +++ b/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.jniadapter.test.pitytest.utils.TestUtils; +import foundation.pEp.pitytest.*; +import foundation.pEp.pitytest.utils.TestUtils; import foundation.pEp.jniadapter.test.utils.*; class TestBob { diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile index 32a8ec5..644a79e 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile +++ b/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: compile alice bob carol test clean +.PHONY: pitytest 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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java index 82eaf1e..adc0d98 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java +++ b/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 foundation.pEp.jniadapter.test.pitytest.*; -import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils; +import static foundation.pEp.pitytest.TestLogger.*; +import foundation.pEp.pitytest.*; +import foundation.pEp.pitytest.utils.TestUtils; import foundation.pEp.jniadapter.test.utils.*; class TestAlice { diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java index 9121f1c..67410c6 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java +++ b/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 foundation.pEp.jniadapter.test.pitytest.*; -import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils; +import static foundation.pEp.pitytest.TestLogger.*; +import foundation.pEp.pitytest.*; +import foundation.pEp.pitytest.utils.TestUtils; import foundation.pEp.jniadapter.test.utils.*; class TestBob { diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java index d57b93d..3f90625 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java +++ b/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 foundation.pEp.jniadapter.test.pitytest.*; -import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils; +import static foundation.pEp.pitytest.TestLogger.*; +import foundation.pEp.pitytest.*; +import foundation.pEp.pitytest.utils.TestUtils; import foundation.pEp.jniadapter.test.utils.*; class TestCarol { diff --git a/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java b/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java index 4434654..8bb1562 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java +++ b/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; diff --git a/test/java/foundation/pEp/jniadapter/test/utils/AdapterTestUtils.java b/test/java/foundation/pEp/jniadapter/test/utils/AdapterTestUtils.java index 48e3efb..fd2cd1b 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/AdapterTestUtils.java +++ b/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) { diff --git a/test/java/foundation/pEp/jniadapter/test/utils/TestCallbacks.java b/test/java/foundation/pEp/jniadapter/test/utils/TestCallbacks.java index c0381c7..24923ce 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/TestCallbacks.java +++ b/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.*; diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/FsMQManager.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/FsMQManager.java index 1f58aaf..2247b92 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/FsMQManager.java +++ b/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; diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/Makefile.conf index d0d7cfd..ff07779 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/Makefile.conf +++ b/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) \ No newline at end of file +PITYTEST_DIR=../../../../../../../pitytest diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerBaseTestContext.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerBaseTestContext.java index e896773..0542b35 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerBaseTestContext.java +++ b/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.*; diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile index ca19942..0d73d43 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile +++ b/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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/TestMain.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/TestMain.java index beb43a7..70f23b8 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/TestMain.java +++ b/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; diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/Makefile b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/Makefile index dcc59ce..7f67743 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/Makefile +++ b/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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestAlice.java index 565ada5..bc99562 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestAlice.java +++ b/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; diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestBob.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestBob.java index 5ec65e1..784bf5c 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestBob.java +++ b/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; diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/Makefile b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/Makefile index f84b30a..566a944 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/Makefile +++ b/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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/TestMain.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/TestMain.java index 28ca193..3dd3070 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/TestMain.java +++ b/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; diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/utils/FsMQManagerTestUtils.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/utils/FsMQManagerTestUtils.java index 8f19a71..be5dda4 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/utils/FsMQManagerTestUtils.java +++ b/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 createTestMessages(String from, int count) { diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/FsMsgQueue.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/FsMsgQueue.java index cb3256d..58c86f4 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/FsMsgQueue.java +++ b/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.jniadapter.test.pitytest.utils.TestUtils.*; +import static foundation.pEp.pitytest.TestLogger.*; +import static foundation.pEp.pitytest.utils.TestUtils.*; import java.io.File; import java.io.IOException; diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/Makefile.conf index 3e16b69..07114b7 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/Makefile.conf +++ b/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/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) \ No newline at end of file +PITYTEST_DIR=../../../../../../../pitytest diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile index ab7ff9c..ebfd10e 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile +++ b/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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/TestMain.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/TestMain.java index 9228676..2dd38c2 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/TestMain.java +++ b/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.jniadapter.test.pitytest.utils.TestUtils.*; +import static foundation.pEp.pitytest.TestLogger.*; +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; diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/AbstractTestContext.java b/test/java/foundation/pEp/pitytest/AbstractTestContext.java similarity index 94% rename from test/java/foundation/pEp/jniadapter/test/pitytest/AbstractTestContext.java rename to test/java/foundation/pEp/pitytest/AbstractTestContext.java index 04b51b6..a53d87a 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/AbstractTestContext.java +++ b/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; diff --git a/test/java/foundation/pEp/pitytest/Makefile b/test/java/foundation/pEp/pitytest/Makefile new file mode 100644 index 0000000..bb49978 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/test/java/foundation/pEp/pitytest/Makefile.conf b/test/java/foundation/pEp/pitytest/Makefile.conf new file mode 100644 index 0000000..9805a1c --- /dev/null +++ b/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 + diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/TestContextInterface.java b/test/java/foundation/pEp/pitytest/TestContextInterface.java similarity index 86% rename from test/java/foundation/pEp/jniadapter/test/pitytest/TestContextInterface.java rename to test/java/foundation/pEp/pitytest/TestContextInterface.java index fe925cd..177bbb5 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/TestContextInterface.java +++ b/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; diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/TestLogger.java b/test/java/foundation/pEp/pitytest/TestLogger.java similarity index 94% rename from test/java/foundation/pEp/jniadapter/test/pitytest/TestLogger.java rename to test/java/foundation/pEp/pitytest/TestLogger.java index b4b4f48..d5618a4 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/TestLogger.java +++ b/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 { diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/TestResult.java b/test/java/foundation/pEp/pitytest/TestResult.java similarity index 61% rename from test/java/foundation/pEp/jniadapter/test/pitytest/TestResult.java rename to test/java/foundation/pEp/pitytest/TestResult.java index 335c9b2..68e4e46 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/TestResult.java +++ b/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, diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/TestState.java b/test/java/foundation/pEp/pitytest/TestState.java similarity index 73% rename from test/java/foundation/pEp/jniadapter/test/pitytest/TestState.java rename to test/java/foundation/pEp/pitytest/TestState.java index d6c5e1e..3f5eb4c 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/TestState.java +++ b/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, diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/TestSuite.java b/test/java/foundation/pEp/pitytest/TestSuite.java similarity index 91% rename from test/java/foundation/pEp/jniadapter/test/pitytest/TestSuite.java rename to test/java/foundation/pEp/pitytest/TestSuite.java index b11d8cf..2bbe926 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/TestSuite.java +++ b/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.jniadapter.test.pitytest.utils.TestUtils.TermColor; -import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*; +import static foundation.pEp.pitytest.TestLogger.*; +import static foundation.pEp.pitytest.utils.TestUtils.TermColor; +import static foundation.pEp.pitytest.utils.TestUtils.*; import java.util.ArrayList; diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/TestUnit.java b/test/java/foundation/pEp/pitytest/TestUnit.java similarity index 94% rename from test/java/foundation/pEp/jniadapter/test/pitytest/TestUnit.java rename to test/java/foundation/pEp/pitytest/TestUnit.java index 4ddc6b9..6e543ef 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/TestUnit.java +++ b/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.jniadapter.test.pitytest.utils.TestUtils.TermColor; -import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.colorString; +import static foundation.pEp.pitytest.TestLogger.*; +import static foundation.pEp.pitytest.utils.TestUtils.TermColor; +import static foundation.pEp.pitytest.utils.TestUtils.colorString; import java.util.function.Consumer; diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/Makefile.conf b/test/java/foundation/pEp/pitytest/examples/Makefile.conf similarity index 59% rename from test/java/foundation/pEp/jniadapter/test/pitytest/examples/Makefile.conf rename to test/java/foundation/pEp/pitytest/examples/Makefile.conf index b84047f..97fdd45 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/Makefile.conf +++ b/test/java/foundation/pEp/pitytest/examples/Makefile.conf @@ -1,7 +1,6 @@ -JAVA_PKG_BASENAME=foundation.pEp.jniadapter.test.pitytest.examples -JAVA_PKG_BASEPATH=foundation/pEp/jniadapter/test/pitytest/examples -JAVA_CWD=../../../../../../../ -JAVA=java -enableassertions +JAVA_PKG_BASENAME=foundation.pEp.pitytest.examples +JAVA_PKG_BASEPATH=foundation/pEp/pitytest/examples +JAVA_CWD=../../../../../ JAVA_CLASSES_PITYTEST= \ ../../TestSuite.class \ @@ -14,3 +13,4 @@ JAVA_CLASSES_PITYTEST= \ ../../TestState.class \ ../../TestResult.class +PITYTEST_DIR=../../ diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/Makefile b/test/java/foundation/pEp/pitytest/examples/ctxinitfail/Makefile similarity index 72% rename from test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/Makefile rename to test/java/foundation/pEp/pitytest/examples/ctxinitfail/Makefile index ed02c86..5586816 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/Makefile +++ b/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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/TestMain.java b/test/java/foundation/pEp/pitytest/examples/ctxinitfail/TestMain.java similarity index 89% rename from test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/TestMain.java rename to test/java/foundation/pEp/pitytest/examples/ctxinitfail/TestMain.java index b63b995..8f787de 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/TestMain.java +++ b/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 { diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/Makefile b/test/java/foundation/pEp/pitytest/examples/ctxmembers/Makefile similarity index 72% rename from test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/Makefile rename to test/java/foundation/pEp/pitytest/examples/ctxmembers/Makefile index 7820571..27efb57 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/Makefile +++ b/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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/TestMain.java b/test/java/foundation/pEp/pitytest/examples/ctxmembers/TestMain.java similarity index 86% rename from test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/TestMain.java rename to test/java/foundation/pEp/pitytest/examples/ctxmembers/TestMain.java index 261ee0a..7fcce08 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/TestMain.java +++ b/test/java/foundation/pEp/pitytest/examples/ctxmembers/TestMain.java @@ -1,7 +1,7 @@ -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; +package foundation.pEp.pitytest.examples.ctxmembers; +import static foundation.pEp.pitytest.TestLogger.*; +import foundation.pEp.pitytest.*; +import foundation.pEp.pitytest.utils.TestUtils; // Context member object instantiation diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/Makefile b/test/java/foundation/pEp/pitytest/examples/helloworld/Makefile similarity index 72% rename from test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/Makefile rename to test/java/foundation/pEp/pitytest/examples/helloworld/Makefile index a1fec04..4e02f47 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/Makefile +++ b/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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/TestMain.java b/test/java/foundation/pEp/pitytest/examples/helloworld/TestMain.java similarity index 88% rename from test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/TestMain.java rename to test/java/foundation/pEp/pitytest/examples/helloworld/TestMain.java index 955f065..1924aee 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/TestMain.java +++ b/test/java/foundation/pEp/pitytest/examples/helloworld/TestMain.java @@ -1,6 +1,6 @@ -package foundation.pEp.jniadapter.test.pitytest.examples.helloworld; -import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*; -import foundation.pEp.jniadapter.test.pitytest.*; +package foundation.pEp.pitytest.examples.helloworld; +import static foundation.pEp.pitytest.TestLogger.*; +import foundation.pEp.pitytest.*; class HelloWorldTestContext extends AbstractTestContext { diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/Makefile b/test/java/foundation/pEp/pitytest/examples/testsuite/Makefile similarity index 72% rename from test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/Makefile rename to test/java/foundation/pEp/pitytest/examples/testsuite/Makefile index e54d839..987f50b 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/Makefile +++ b/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)/$< diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/TestMain.java b/test/java/foundation/pEp/pitytest/examples/testsuite/TestMain.java similarity index 86% rename from test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/TestMain.java rename to test/java/foundation/pEp/pitytest/examples/testsuite/TestMain.java index 18b00a8..06d2485 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/TestMain.java +++ b/test/java/foundation/pEp/pitytest/examples/testsuite/TestMain.java @@ -1,6 +1,6 @@ -package foundation.pEp.jniadapter.test.pitytest.examples.testsuite; -import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*; -import foundation.pEp.jniadapter.test.pitytest.*; +package foundation.pEp.pitytest.examples.testsuite; +import static foundation.pEp.pitytest.TestLogger.*; +import foundation.pEp.pitytest.*; class TestSuiteContext extends AbstractTestContext { String name; diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/utils/Pair.java b/test/java/foundation/pEp/pitytest/utils/Pair.java similarity index 87% rename from test/java/foundation/pEp/jniadapter/test/pitytest/utils/Pair.java rename to test/java/foundation/pEp/pitytest/utils/Pair.java index 1ac23d0..220775b 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/utils/Pair.java +++ b/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 { private K key = null; diff --git a/test/java/foundation/pEp/jniadapter/test/pitytest/utils/TestUtils.java b/test/java/foundation/pEp/pitytest/utils/TestUtils.java similarity index 98% rename from test/java/foundation/pEp/jniadapter/test/pitytest/utils/TestUtils.java rename to test/java/foundation/pEp/pitytest/utils/TestUtils.java index c8fba5c..2f89ed6 100644 --- a/test/java/foundation/pEp/jniadapter/test/pitytest/utils/TestUtils.java +++ b/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