more (incomplete) work on directory comparison, misc test fixes.

10 files changed, 40 insertions, 24 deletions

diff --git a/testing/testdata/dirChangesTestDir/diff/actual/one-one.txt b/testing/testdata/dirChangesTestDir/diff/actual/one-one.txt
new file mode 100644
index 000000000..8fc31fff8
--- /dev/null
+++ b/testing/testdata/dirChangesTestDir/diff/actual/one-one.txt
@@ -0,0 +1,4 @@
+First line
+Second line
+
+Fourth line changed
diff --git a/testing/testdata/dirChangesTestDir/diff/actual/subone/one-subone-one.txt b/testing/testdata/dirChangesTestDir/diff/actual/subone/one-subone-one.txt
new file mode 100644
index 000000000..1cff85a6b
--- /dev/null
+++ b/testing/testdata/dirChangesTestDir/diff/actual/subone/one-subone-one.txt
@@ -0,0 +1,4 @@
+First line
+Second line changed in one-subone-one.txt
+
+Fourth line
diff --git a/testing/testdata/dirChangesTestDir/diff/expected/one-one.txt b/testing/testdata/dirChangesTestDir/diff/expected/one-one.txt
new file mode 100644
index 000000000..76f55bd20
--- /dev/null
+++ b/testing/testdata/dirChangesTestDir/diff/expected/one-one.txt
@@ -0,0 +1,4 @@
+First line
+Second line
+
+Fourth line
diff --git a/testing/testdata/dirChangesTestDir/diff/expected/subone/one-subone-one.txt b/testing/testdata/dirChangesTestDir/diff/expected/subone/one-subone-one.txt
new file mode 100644
index 000000000..76f55bd20
--- /dev/null
+++ b/testing/testdata/dirChangesTestDir/diff/expected/subone/one-subone-one.txt
@@ -0,0 +1,4 @@
+First line
+Second line
+
+Fourth line
diff --git a/testing/testdata/dirChangesTestDir/readme.txt b/testing/testdata/dirChangesTestDir/readme.txt
new file mode 100644
index 000000000..c8ec1ec8c
--- /dev/null
+++ b/testing/testdata/dirChangesTestDir/readme.txt
@@ -0,0 +1,5 @@
+
+This directory contains test data for
+
+ testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java
+ 
\ No newline at end of file
diff --git a/testing/testdata/dirChangesTestDir/same/actual/one-one.txt b/testing/testdata/dirChangesTestDir/same/actual/one-one.txt
new file mode 100644
index 000000000..76f55bd20
--- /dev/null
+++ b/testing/testdata/dirChangesTestDir/same/actual/one-one.txt
@@ -0,0 +1,4 @@
+First line
+Second line
+
+Fourth line
diff --git a/testing/testdata/dirChangesTestDir/same/actual/subone/one-subone-one.txt b/testing/testdata/dirChangesTestDir/same/actual/subone/one-subone-one.txt
new file mode 100644
index 000000000..76f55bd20
--- /dev/null
+++ b/testing/testdata/dirChangesTestDir/same/actual/subone/one-subone-one.txt
@@ -0,0 +1,4 @@
+First line
+Second line
+
+Fourth line
diff --git a/testing/testdata/dirChangesTestDir/same/expected/one-one.txt b/testing/testdata/dirChangesTestDir/same/expected/one-one.txt
new file mode 100644
index 000000000..76f55bd20
--- /dev/null
+++ b/testing/testdata/dirChangesTestDir/same/expected/one-one.txt
@@ -0,0 +1,4 @@
+First line
+Second line
+
+Fourth line
diff --git a/testing/testdata/dirChangesTestDir/same/expected/subone/one-subone-one.txt b/testing/testdata/dirChangesTestDir/same/expected/subone/one-subone-one.txt
new file mode 100644
index 000000000..76f55bd20
--- /dev/null
+++ b/testing/testdata/dirChangesTestDir/same/expected/subone/one-subone-one.txt
@@ -0,0 +1,4 @@
+First line
+Second line
+
+Fourth line
diff --git a/testing/testdata/suite.xml b/testing/testdata/suite.xml
index 660af524f..cbf3a60b7 100644
--- a/testing/testdata/suite.xml
+++ b/testing/testdata/suite.xml
@@ -1,32 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!DOCTYPE suite [
-     <!ELEMENT suite (ajc-test+)>
-     <!ELEMENT ajc-test (compile*,run*)>
-     <!ATTLIST ajc-test title CDATA #REQUIRED >
-     <!ATTLIST ajc-test dir CDATA #REQUIRED >
-     <!ATTLIST ajc-test pr CDATA #IMPLIED >
-
-     <!ELEMENT compile (file*,message*)>
-     
-     <!ELEMENT run (#PCDATA)>
-     <!ATTLIST run class CDATA #REQUIRED >
-     <!ATTLIST run args CDATA "" >
-
-     <!ELEMENT file (#PCDATA)>
-     <!ELEMENT message (#PCDATA)>
-     <!ATTLIST message kind (error | warning | Xlint) #REQUIRED >
-     <!ATTLIST message line CDATA #REQUIRED >
-     <!ATTLIST message file CDATA #IMPLIED >
-     ]>
-
 
+<!DOCTYPE suite SYSTEM "../../tests/ajcTestSuite.dtd">
 
 <suite>
 <!--correct behavior for 1.0 is good error message, see real test in knownbugs-->
 <ajc-test title="harness error test"
           dir="harness" pr="9998">
-<compile file="ErrorTest.java">
+<compile files="ErrorTest.java">
 <message kind="error" line="5"/>
 <message kind="error" line="6"/>
 </compile>
@@ -35,7 +14,7 @@
 
 <ajc-test title="harness test with run"
           dir="harness" pr="101">
-<compile file="TestNoTester.java"/>
+<compile files="TestNoTester.java"/>
 <run class="TestNoTester"/>
 </ajc-test>