debian/changelog

@@ -3,7 +3,7 @@ libnanoxml2-java (2.2.3.dfsg-6) UNRELEASED; urgency=medium
   * Team upload
 
   [ Chris West (Faux) ]
-  * Update to -source 1.8 to allow build with Java 9:
+  * Update to -source 1.8 to allow build with Java 9 (Closes: #893268)
     - change -source arguments
     - rename all the "enum" variables to "enu"
 
@@ -12,7 +12,9 @@ libnanoxml2-java (2.2.3.dfsg-6) UNRELEASED; urgency=medium
   * Point Vcs-fields to Salsa
   * Standards-Version: 4.1.4
   * debhelper 11
-  * Set Maintainer to pkg-java-maintainers@alioth-lists.debian.net
+
+  [ Emmanuel Bourg ]
+  * Fixed the test cases
 
  -- Chris West (Faux) <debian@fau.xxx>  Fri, 08 Sep 2017 13:16:03 +0100
 

debian/clean

+Test/Lite/*.test_out
+Test/Java/*.test_out

debian/control

 Source: libnanoxml2-java
-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Sveinung Kvilhaugsvik <sveinung84@users.sourceforge.net>
 Section: java
 Priority: optional

debian/patches/02-fix-tests.patch

+--- a/Test/Java/double_dtd.xml.out
++++ b/Test/Java/double_dtd.xml.out
+@@ -1 +1 @@
+-<FOO x="1" z="defaultValue" y="fixedValue">blah</FOO>
+\ No newline at end of file
++<FOO x="1" y="fixedValue" z="defaultValue">blah</FOO>
+--- a/Test/Java/external_dtd.xml.out
++++ b/Test/Java/external_dtd.xml.out
+@@ -1,2 +1,2 @@
+-<FOO x="1" z="defaultValue" y="fixedValue">INCLUDE
+-</FOO>
+\ No newline at end of file
++<FOO x="1" y="fixedValue" z="defaultValue">INCLUDE
++</FOO>
+--- a/Test/Java/internal_dtd.xml.out
++++ b/Test/Java/internal_dtd.xml.out
+@@ -1,3 +1,3 @@
+-<FOO x="1" z="defaultValue" y="fixedValue">INCLUDE
++<FOO x="1" y="fixedValue" z="defaultValue">INCLUDE
+ &#x9;
+-&#xd;&#xd;</FOO>
+\ No newline at end of file
++&#xd;&#xd;</FOO>

debian/patches/series

 01-fix-java9-build.patch
+02-fix-tests.patch

debian/rules

@@ -37,10 +37,11 @@ override_dh_auto_build:
 	nanoxml net.n3.nanoxml net.n3.nanoxml.sax -d api
 
 override_dh_auto_test:
-	if [ $(filter nocheck, $(DEB_BUILD_OPTIONS)) ]; \
-		then	echo "Disabeling tests"; \
-		else	make -f debian/rules test; \
-	fi;
+ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
+	make -f debian/rules test
+else
+	echo "Disabling tests"
+endif
 
 override_dh_clean:
 	jh_clean
@@ -52,23 +53,22 @@ override_dh_clean:
 	dh_clean
 
 test:
-	set -e
-	set -x
+	set -e; \
+	set -x; \
 	cd Test/Lite && \
 	${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${LITE} `find -iname *.java` && \
 	for TESTFILE in *.xml; do \
 		${JAVA_HOME}/bin/java -cp .:../../${LITE} DumpXML_Lite $${TESTFILE} > $${TESTFILE}.test_out ; \
-		if diff -u $${TESTFILE}.out $${TESTFILE}.test_out ; \
+		if ! diff -u -w $${TESTFILE}.out $${TESTFILE}.test_out ; \
 		then	echo ${LITE} failed $${TESTFILE}; \
 			exit 1; \
 		fi; \
-	done
-
-	cd Test/Java && \
-	${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${NANOXML} `find -iname *.java` && \
+	done; \
+	cd ../Java && \
+	${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${NANOXML} $$(find -iname *.java) && \
 	for TESTFILE in *.xml; do\
 		${JAVA_HOME}/bin/java -cp .:../../${NANOXML} DumpXML $${TESTFILE} > $${TESTFILE}.test_out ; \
-		if diff -u $${TESTFILE}.out $${TESTFILE}.test_out ; \
+		if ! diff -u -w $${TESTFILE}.out $${TESTFILE}.test_out ; \
 		then	echo ${NANOXML} failed $${TESTFILE}; \
 			exit 1; \
 		fi; \
@@ -76,5 +76,5 @@ test:
 	touch $@
 
 get-orig-source:
-	set -e
+	set -e; \
 	sh ${SRCDIR}/debian/origCleaner.sh thisIsIgnored ${VERSION} alsoIgnored ${SRCDIR}/debian/orig.tmp