From 6b5832f524f678dace1cc943c927b6fadff3a69e Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <andreas.romeyke@slub-dresden.de>
Date: Fri, 21 Jul 2023 09:57:06 +0200
Subject: [PATCH] - refactoring, moved test code to resources/
---
Makefile | 16 ++++++++++------
.../plugin/TestXmlFormatValidationPlugin.java | 0
.../plugin/Validation/TestValidateDTD.java | 0
.../plugin/Validation/TestValidateRelaxNG.java | 0
.../plugin/Validation/TestValidateSchema.java | 0
5 files changed, 10 insertions(+), 6 deletions(-)
rename {java => resources}/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java (100%)
rename {java => resources}/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java (100%)
rename {java => resources}/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java (100%)
rename {java => resources}/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java (100%)
diff --git a/Makefile b/Makefile
index f64c28a..ec5ba98 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ LOCALJARS=$(shell if [ -d lib ]; then find lib -name "*.jar" -print |xargs echo
JAR:=XmlFormatValidationPlugin.jar
# classpath
-JUNITCLASSPATH:=./java/:/usr/share/java/junit4.jar:$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar" -print |xargs echo |sed -e "s/ /:/g"):$(JAR)
+JUNITCLASSPATH:=./java/:./resources/:/usr/share/java/junit4.jar:$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar" -print |xargs echo |sed -e "s/ /:/g"):$(JAR)
#SOURCESCLASSPATH=org/slub/rosetta/dps/repository/plugin/storage/nfs
CLASSPATH:=${ROSETTASDKDEPOSIT}/dps-sdk-${ROSETTAVERSION}.jar:${LOCALJARS}
#BUILDPATH=$(CLASSPATH)
@@ -28,6 +28,9 @@ SOURCES:=$(shell find java/ -name "*.java" -print | xargs echo )
OBJS:=$(SOURCES:.java=.class)
BUILD:=build/
+TESTSOURCES:=$(shell find resources/ -name "*.java" -print | xargs echo )
+TESTOBJS:=$(TESTSOURCES:.java=.class)
+
all: $(BUILD) $(JAR)
help:
@@ -40,16 +43,16 @@ help:
jarclean:
@rm -Rf $(BUILD)
-test_dtd: $(JAR)
+test_dtd: $(TESTOBJS) $(JAR)
java -Djaxp.debug=1 -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.Validation.TestValidateDTD;
-test_schema: $(JAR)
+test_schema: $(TESTOBJS) $(JAR)
java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.Validation.TestValidateSchema;
-test_relaxNG: $(JAR)
+test_relaxNG: $(TESTOBJS) $(JAR)
java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.Validation.TestValidateRelaxNG;
-test_combined: $(JAR)
+test_combined: $(TESTOBJS) $(JAR)
java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.TestXmlFormatValidationPlugin
test: test_dtd test_schema test_relaxNG
@@ -68,9 +71,10 @@ $(BUILD):
@mkdir $@/lib
$(JAR): $(OBJS)
- @cp -r resources $(BUILD)
+ #@cp -r resources $(BUILD)
@cp -r PLUGIN-INF/ $(BUILD)
@cp -r META-INF/ $(BUILD)
+ @cp -r lib/ $(BUILD)
@cd java; find ./ -name "*.class" -print -exec cp --parents -r \{\} $(PWD)/$(BUILD) \; ; cd ..
@cd $(BUILD); ${JAVAPATH}/jar cfvM ../$@ ./* ; cd ..
diff --git a/java/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java b/resources/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java
similarity index 100%
rename from java/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java
rename to resources/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java b/resources/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java
similarity index 100%
rename from java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java
rename to resources/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java b/resources/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java
similarity index 100%
rename from java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java
rename to resources/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java b/resources/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java
similarity index 100%
rename from java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java
rename to resources/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java
--
GitLab