Make autotest/autotest.sh runnable & add ant task

Fixes w3c#17

Author: sideshowbarker

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "autotest/testsuite"]
 	path = autotest/testsuite
 	url = https://github.com/w3c/css-validator-testsuite.git
+[submodule "testsuite"]
+	path = testsuite
+	url = https://github.com/w3c/css-validator-testsuite.git

autotest/AutoTestContentHandler.java

@@ -37,8 +37,7 @@
  */
 public class AutoTestContentHandler implements ContentHandler {
 
-	//public static final String VALIDATOR = "http://jigsaw.w3.org/css-validator/validator?";
-	public static final String VALIDATOR = "http://qa-dev.w3.org:8001/css-validator/validator?";
+	public static final String VALIDATOR = "http://jigsaw.w3.org/css-validator/validator?";
 	public static final String PARAMS = "&output=soap12";
 	public static final int TESTSUITE = "testsuite".hashCode();
 	public static final int TEST = "test".hashCode();
@@ -264,12 +263,13 @@ public void endElement(String nameSpaceURI, String localName, String rawName)
 			System.err.println(urlString);
 			String validURL = createValidURL(urlString);
 			if (isFile) {
-				URL fileURL = AutoTestContentHandler.class
-						.getResource(urlString);
 				InputStream content;
 				String text = "";
 				try {
-					content = fileURL.openStream();
+					content = //
+						AutoTestContentHandler.class //
+						.getClassLoader()
+						.getResourceAsStream(urlString);
 					byte[] textBytes = new byte[content.available()];
 					content.read(textBytes, 0, textBytes.length);
 					text = createValidURL(new String(textBytes));

autotest/autotest.sh

@@ -1,3 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
-java -cp .:/usr/share/java/jaxp-1.2.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xmlParserAPIs.jar:/usr/local/Jigsaw/classes/jigsaw.jar autotest.AutoTest $1
+[[ ! -f css-validator.jar ]] && \
+  echo && \
+  echo "Building css-validator.jar..." && \
+  ant -quiet jar
+
+javac -classpath css-validator.jar \
+  ./autotest/AutoTest.java \
+  ./autotest/AutoTestContentHandler.java \
+  ./autotest/Result.java
+
+[[ -z "$1" ]] && \
+  echo && \
+  echo "Error: autotest.sh failed to run" && \
+  echo && \
+  echo "Usage: autotest.sh ./testsuite/xml/FILENAME.xml" && \
+  exit 1
+
+java -cp css-validator.jar autotest.AutoTest "$1"

build.xml

@@ -148,6 +148,22 @@
     </war>
   </target>
 
+  <target name="autotest" depends="jar">
+    <fail message="&#xa0;${line.separator}${line.separator}
+  Usage: ant autotest -Dtestfile=testsuite/xml/FILENAME.xml">
+      <condition>
+        <not>
+          <isset property="testfile"/>
+        </not>
+      </condition>
+    </fail>
+    <javac srcdir="autotest" classpath="css-validator.jar"
+      includeantruntime="false"/>
+    <java classname="autotest.AutoTest" classpath="css-validator.jar">
+      <arg value="${testfile}"/>
+    </java>
+  </target>
+
   <target name="clean" description="Cleans up generated files">
     <delete file="${jar.file}"/>
     <delete file="${war.file}"/>