1.1 --- a/samples/visitor/01-notevolutionready/build.xml Sat Jun 14 21:41:07 2008 +0200
1.2 +++ b/samples/visitor/01-notevolutionready/build.xml Sat Jun 14 22:38:00 2008 +0200
1.3 @@ -73,6 +73,10 @@
1.4 <path location="${junit.jar}"/>
1.5 <path path="${extra.cp}"/>
1.6 </classpath>
1.7 + <syspropertyset>
1.8 + <propertyref prefix="test-sys-prop."/>
1.9 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.10 + </syspropertyset>
1.11 <formatter type="brief" usefile="false"/>
1.12 <formatter type="xml"/>
1.13 </junit>
1.14 @@ -91,6 +95,7 @@
1.15 source="1.5" target="1.5"
1.16 classpath="${cp}"
1.17 failonerror="${failonerror}"
1.18 + debug="true"
1.19 />
1.20 </target>
1.21 </project>
2.1 --- a/samples/visitor/01-notevolutionready/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200
2.2 +++ b/samples/visitor/01-notevolutionready/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200
2.3 @@ -5,12 +5,11 @@
2.4 import org.apidesign.visitor.notevolutionready.Language.Expression;
2.5 import org.apidesign.visitor.notevolutionready.Language.Minus;
2.6 import org.apidesign.visitor.notevolutionready.Language.Number;
2.7 -import org.apidesign.visitor.notevolutionready.Language.Plus;
2.8 -import org.apidesign.visitor.notevolutionready.Language.Visitor;
2.9 import org.junit.Test;
2.10
2.11 public class PrintOfMinusStructureTest {
2.12 @Test public void printOneMinusTwo() {
2.13 + if (Boolean.getBoolean("no.failures")) return;
2.14 // BEGIN: visitor.notevolutionready.oldwithnew
2.15 Number one = new Number(1);
2.16 Number two = new Number(2);
3.1 --- a/samples/visitor/02-abstractclass/build.xml Sat Jun 14 21:41:07 2008 +0200
3.2 +++ b/samples/visitor/02-abstractclass/build.xml Sat Jun 14 22:38:00 2008 +0200
3.3 @@ -71,6 +71,10 @@
3.4 <path location="${junit.jar}"/>
3.5 <path path="${extra.cp}"/>
3.6 </classpath>
3.7 + <syspropertyset>
3.8 + <propertyref prefix="test-sys-prop."/>
3.9 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
3.10 + </syspropertyset>
3.11 <formatter type="brief" usefile="false"/>
3.12 <formatter type="xml"/>
3.13 </junit>
3.14 @@ -89,6 +93,7 @@
3.15 source="1.5" target="1.5"
3.16 classpath="${cp}"
3.17 failonerror="${failonerror}"
3.18 + debug="true"
3.19 />
3.20 </target>
3.21 </project>
4.1 --- a/samples/visitor/02-abstractclass/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200
4.2 +++ b/samples/visitor/02-abstractclass/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200
4.3 @@ -5,12 +5,11 @@
4.4 import org.apidesign.visitor.Language.Expression;
4.5 import org.apidesign.visitor.Language.Minus;
4.6 import org.apidesign.visitor.Language.Number;
4.7 -import org.apidesign.visitor.Language.Plus;
4.8 -import org.apidesign.visitor.Language.Visitor;
4.9 import org.junit.Test;
4.10
4.11 public class PrintOfMinusStructureTest {
4.12 @Test public void printOneMinusTwo() {
4.13 + if (Boolean.getBoolean("no.failures")) return;
4.14 Number one = new Number(1);
4.15 Number two = new Number(2);
4.16 Expression minus = new Minus(one, two);
5.1 --- a/samples/visitor/03-visitunknown/build.xml Sat Jun 14 21:41:07 2008 +0200
5.2 +++ b/samples/visitor/03-visitunknown/build.xml Sat Jun 14 22:38:00 2008 +0200
5.3 @@ -71,6 +71,10 @@
5.4 <path location="${junit.jar}"/>
5.5 <path path="${extra.cp}"/>
5.6 </classpath>
5.7 + <syspropertyset>
5.8 + <propertyref prefix="test-sys-prop."/>
5.9 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
5.10 + </syspropertyset>
5.11 <formatter type="brief" usefile="false"/>
5.12 <formatter type="xml"/>
5.13 </junit>
5.14 @@ -89,6 +93,7 @@
5.15 source="1.5" target="1.5"
5.16 classpath="${cp}"
5.17 failonerror="${failonerror}"
5.18 + debug="true"
5.19 />
5.20 </target>
5.21 </project>
6.1 --- a/samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/InvalidCountNumbersTest.java Sat Jun 14 21:41:07 2008 +0200
6.2 +++ b/samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/InvalidCountNumbersTest.java Sat Jun 14 22:38:00 2008 +0200
6.3 @@ -15,10 +15,18 @@
6.4 Number four = new Number(4);
6.5 Expression minus = new Plus(one, new Minus(three, four));
6.6
6.7 + int cnt = CountNumbersTest.countNumbers(minus);
6.8 + if (Boolean.getBoolean("no.failures")) {
6.9 + // Should have three numbers, but visitor does not
6.10 + // know how to go through minus
6.11 + assertEquals(
6.12 + "Wrong result as there is no traversal through minus", 1, cnt
6.13 + );
6.14 + return;
6.15 + }
6.16 assertEquals(
6.17 "Should have three numbers, but visitor does not " +
6.18 - "know how to go through minus",
6.19 - 3, CountNumbersTest.countNumbers(minus)
6.20 + "know how to go through minus", 3, cnt
6.21 );
6.22 // END: visitor.visitunknown.traversal
6.23 }
7.1 --- a/samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200
7.2 +++ b/samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200
7.3 @@ -5,12 +5,11 @@
7.4 import org.apidesign.visitor.Language.Expression;
7.5 import org.apidesign.visitor.Language.Minus;
7.6 import org.apidesign.visitor.Language.Number;
7.7 -import org.apidesign.visitor.Language.Plus;
7.8 -import org.apidesign.visitor.Language.Visitor;
7.9 import org.junit.Test;
7.10
7.11 public class PrintOfMinusStructureTest {
7.12 @Test public void printOneMinusTwo() {
7.13 + if (Boolean.getBoolean("no.failures")) return;
7.14 Number one = new Number(1);
7.15 Number two = new Number(2);
7.16 Expression minus = new Minus(one, two);
8.1 --- a/samples/visitor/04-traversal/build.xml Sat Jun 14 21:41:07 2008 +0200
8.2 +++ b/samples/visitor/04-traversal/build.xml Sat Jun 14 22:38:00 2008 +0200
8.3 @@ -71,6 +71,10 @@
8.4 <path location="${junit.jar}"/>
8.5 <path path="${extra.cp}"/>
8.6 </classpath>
8.7 + <syspropertyset>
8.8 + <propertyref prefix="test-sys-prop."/>
8.9 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
8.10 + </syspropertyset>
8.11 <formatter type="brief" usefile="false"/>
8.12 <formatter type="xml"/>
8.13 </junit>
8.14 @@ -89,6 +93,7 @@
8.15 source="1.5" target="1.5"
8.16 classpath="${cp}"
8.17 failonerror="${failonerror}"
8.18 + debug="true"
8.19 />
8.20 </target>
8.21 </project>
9.1 --- a/samples/visitor/04-traversal/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200
9.2 +++ b/samples/visitor/04-traversal/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200
9.3 @@ -5,12 +5,11 @@
9.4 import org.apidesign.visitor.Language.Expression;
9.5 import org.apidesign.visitor.Language.Minus;
9.6 import org.apidesign.visitor.Language.Number;
9.7 -import org.apidesign.visitor.Language.Plus;
9.8 -import org.apidesign.visitor.Language.Visitor;
9.9 import org.junit.Test;
9.10
9.11 public class PrintOfMinusStructureTest {
9.12 @Test public void printOneMinusTwo() {
9.13 + if (Boolean.getBoolean("no.failures")) return;
9.14 Number one = new Number(1);
9.15 Number two = new Number(2);
9.16 Expression minus = new Minus(one, two);
10.1 --- a/samples/visitor/11-cleanversion/build.xml Sat Jun 14 21:41:07 2008 +0200
10.2 +++ b/samples/visitor/11-cleanversion/build.xml Sat Jun 14 22:38:00 2008 +0200
10.3 @@ -3,7 +3,6 @@
10.4 <target name="clean">
10.5 <delete dir="build"/>
10.6 </target>
10.7 -
10.8 <target name="compile" depends="build"/>
10.9 <target name="build" depends="-libraries">
10.10 <antcall target="-build-one">
10.11 @@ -15,12 +14,10 @@
10.12 <antcall target="-build-one">
10.13 <param name="version" value="api3.0"/>
10.14 </antcall>
10.15 -
10.16 <antcall target="-build-one">
10.17 <param name="version" value="test"/>
10.18 <param name="cp" value="build/api1.0/classes:${junit.jar}"/>
10.19 </antcall>
10.20 -
10.21 <antcall target="-build-one">
10.22 <param name="version" value="test2.0"/>
10.23 <param name="cp" value="build/api2.0/classes:build/test/classes:${junit.jar}"/>
10.24 @@ -30,7 +27,6 @@
10.25 <param name="cp" value="build/api3.0/classes:build/test/classes:${junit.jar}"/>
10.26 </antcall>
10.27 </target>
10.28 -
10.29 <target name="test" depends="build">
10.30 <echo level="info" message="PrintVisitor on old API. This should succeeds."/>
10.31 <antcall target="-run-one">
10.32 @@ -55,13 +51,10 @@
10.33 </target>
10.34
10.35 <!-- support methods -->
10.36 -
10.37 <target name="-libraries">
10.38 <ant dir="../../libs/"/>
10.39 -
10.40 <property name="junit.jar" location="../../libs/dist/junit-4.4.jar"/>
10.41 </target>
10.42 -
10.43 <target name="-run-one">
10.44 <fail message="You need to specify API version number" unless="version"/>
10.45 <property name="test" value="test"/>
10.46 @@ -78,14 +71,16 @@
10.47 <path location="${junit.jar}"/>
10.48 <path path="${extra.cp}"/>
10.49 </classpath>
10.50 + <syspropertyset>
10.51 + <propertyref prefix="test-sys-prop."/>
10.52 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
10.53 + </syspropertyset>
10.54 <formatter type="brief" usefile="false"/>
10.55 <formatter type="xml"/>
10.56 </junit>
10.57 </target>
10.58 -
10.59 <target name="-build-one">
10.60 <fail message="You need to specify version number" unless="version"/>
10.61 -
10.62 <property name="cp" value=""/>
10.63 <property name="out" value="${version}"/>
10.64 <property name="failonerror" value="true"/>
10.65 @@ -96,6 +91,7 @@
10.66 source="1.5" target="1.5"
10.67 classpath="${cp}"
10.68 failonerror="${failonerror}"
10.69 + debug="true"
10.70 />
10.71 </target>
10.72 </project>
11.1 --- a/samples/visitor/11-cleanversion/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 21:41:07 2008 +0200
11.2 +++ b/samples/visitor/11-cleanversion/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 22:38:00 2008 +0200
11.3 @@ -4,7 +4,6 @@
11.4 import org.apidesign.visitor.Language.Expression;
11.5 import org.apidesign.visitor.Language.Number;
11.6 import org.apidesign.visitor.Language.Plus;
11.7 -import org.apidesign.visitor.Language.Visitor;
11.8 import org.apidesign.visitor.Language.Visitor1_0;
11.9 import org.junit.Test;
11.10
12.1 --- a/samples/visitor/11-cleanversion/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200
12.2 +++ b/samples/visitor/11-cleanversion/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200
12.3 @@ -18,6 +18,13 @@
12.4 PrintVisitor print = new PrintVisitor();
12.5 plus.visit(print);
12.6
12.7 + if (Boolean.getBoolean("no.failures")) {
12.8 + assertEquals(
12.9 + "Not defined how to handle Minus. We'll get wrong result",
12.10 + "unknown", print.sb.toString()
12.11 + );
12.12 + return;
12.13 + }
12.14 assertEquals("1 - 2", print.sb.toString());
12.15 }
12.16
13.1 --- a/samples/visitor/11-cleanversion/src-test3.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200
13.2 +++ b/samples/visitor/11-cleanversion/src-test3.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200
13.3 @@ -7,7 +7,6 @@
13.4 import org.apidesign.visitor.Language.Number;
13.5 import org.apidesign.visitor.Language.Plus;
13.6 import org.apidesign.visitor.Language.Real;
13.7 -import org.apidesign.visitor.Language.Visitor2_0;
13.8 import org.apidesign.visitor.Language.Visitor3_0;
13.9 import org.junit.Test;
13.10
13.11 @@ -20,6 +19,13 @@
13.12 PrintVisitor print = new PrintVisitor();
13.13 plus.visit(print);
13.14
13.15 + if (Boolean.getBoolean("no.failures")) {
13.16 + assertEquals(
13.17 + "Not defined how to handle Minus. We'll get wrong result",
13.18 + "unknown", print.sb.toString()
13.19 + );
13.20 + return;
13.21 + }
13.22 assertEquals("1.0 - 2.0", print.sb.toString());
13.23 }
13.24
14.1 --- a/samples/visitor/21-clientprovider/build.xml Sat Jun 14 21:41:07 2008 +0200
14.2 +++ b/samples/visitor/21-clientprovider/build.xml Sat Jun 14 22:38:00 2008 +0200
14.3 @@ -78,6 +78,10 @@
14.4 <path location="${junit.jar}"/>
14.5 <path path="${extra.cp}"/>
14.6 </classpath>
14.7 + <syspropertyset>
14.8 + <propertyref prefix="test-sys-prop."/>
14.9 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
14.10 + </syspropertyset>
14.11 <formatter type="brief" usefile="false"/>
14.12 <formatter type="xml"/>
14.13 </junit>
14.14 @@ -96,6 +100,7 @@
14.15 source="1.5" target="1.5"
14.16 classpath="${cp}"
14.17 failonerror="${failonerror}"
14.18 + debug="true"
14.19 />
14.20 </target>
14.21 </project>
15.1 --- a/samples/visitor/21-clientprovider/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 21:41:07 2008 +0200
15.2 +++ b/samples/visitor/21-clientprovider/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 22:38:00 2008 +0200
15.3 @@ -4,7 +4,6 @@
15.4 import org.apidesign.visitor.Language.Number;
15.5 import org.apidesign.visitor.Language.Plus;
15.6 import org.apidesign.visitor.Language.Visitor;
15.7 -import org.apidesign.visitor.Language.Visitor;
15.8 import static junit.framework.Assert.*;
15.9 import org.junit.Test;
15.10
16.1 --- a/samples/visitor/21-clientprovider/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200
16.2 +++ b/samples/visitor/21-clientprovider/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200
16.3 @@ -36,6 +36,10 @@
16.4 PrintVisitor print = new PrintVisitor();
16.5 plus.visit(print.dispatch);
16.6
16.7 + if (Boolean.getBoolean("no.failures")) {
16.8 + assertEquals("unknown12", print.sb.toString());
16.9 + return;
16.10 + }
16.11 assertEquals("1 - 2", print.sb.toString());
16.12 }
16.13 }
17.1 --- a/samples/visitor/21-clientprovider/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 21:41:07 2008 +0200
17.2 +++ b/samples/visitor/21-clientprovider/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 22:38:00 2008 +0200
17.3 @@ -19,6 +19,10 @@
17.4 PrintVisitor print = new PrintVisitor();
17.5 plus.visit(print.dispatch);
17.6
17.7 + if (Boolean.getBoolean("no.failures")) {
17.8 + assertEquals("unknownunknownunknown", print.sb.toString());
17.9 + return;
17.10 + }
17.11 assertEquals("1.0 - 2.0", print.sb.toString());
17.12 }
17.13
18.1 --- a/samples/visitor/22-self/build.xml Sat Jun 14 21:41:07 2008 +0200
18.2 +++ b/samples/visitor/22-self/build.xml Sat Jun 14 22:38:00 2008 +0200
18.3 @@ -3,7 +3,6 @@
18.4 <target name="clean">
18.5 <delete dir="build"/>
18.6 </target>
18.7 -
18.8 <target name="compile" depends="build"/>
18.9 <target name="build" depends="-libraries">
18.10 <antcall target="-build-one">
18.11 @@ -15,12 +14,10 @@
18.12 <antcall target="-build-one">
18.13 <param name="version" value="api3.0"/>
18.14 </antcall>
18.15 -
18.16 <antcall target="-build-one">
18.17 <param name="version" value="test"/>
18.18 <param name="cp" value="build/api1.0/classes:${junit.jar}"/>
18.19 </antcall>
18.20 -
18.21 <antcall target="-build-one">
18.22 <param name="version" value="test2.0"/>
18.23 <param name="cp" value="build/api2.0/classes:build/test/classes:${junit.jar}"/>
18.24 @@ -30,7 +27,6 @@
18.25 <param name="cp" value="build/api3.0/classes:build/test/classes:build/test2.0/classes:${junit.jar}"/>
18.26 </antcall>
18.27 </target>
18.28 -
18.29 <target name="test" depends="build">
18.30 <echo level="info" message="PrintVisitor on old API. This should succeeds."/>
18.31 <antcall target="-run-one">
18.32 @@ -55,13 +51,10 @@
18.33 </target>
18.34
18.35 <!-- support methods -->
18.36 -
18.37 <target name="-libraries">
18.38 <ant dir="../../libs/"/>
18.39 -
18.40 <property name="junit.jar" location="../../libs/dist/junit-4.4.jar"/>
18.41 </target>
18.42 -
18.43 <target name="-run-one">
18.44 <fail message="You need to specify API version number" unless="version"/>
18.45 <property name="test" value="test"/>
18.46 @@ -78,14 +71,16 @@
18.47 <path location="${junit.jar}"/>
18.48 <path path="${extra.cp}"/>
18.49 </classpath>
18.50 + <syspropertyset>
18.51 + <propertyref prefix="test-sys-prop."/>
18.52 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
18.53 + </syspropertyset>
18.54 <formatter type="brief" usefile="false"/>
18.55 <formatter type="xml"/>
18.56 </junit>
18.57 </target>
18.58 -
18.59 <target name="-build-one">
18.60 <fail message="You need to specify version number" unless="version"/>
18.61 -
18.62 <property name="cp" value=""/>
18.63 <property name="out" value="${version}"/>
18.64 <property name="failonerror" value="true"/>
18.65 @@ -96,6 +91,7 @@
18.66 source="1.5" target="1.5"
18.67 classpath="${cp}"
18.68 failonerror="${failonerror}"
18.69 + debug="true"
18.70 />
18.71 </target>
18.72 </project>
19.1 --- a/samples/visitor/22-self/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200
19.2 +++ b/samples/visitor/22-self/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200
19.3 @@ -35,7 +35,11 @@
19.4
19.5 PrintVisitor print = new PrintVisitor();
19.6 plus.visit(Visitor.create(print));
19.7 -
19.8 +
19.9 + if (Boolean.getBoolean("no.failures")) {
19.10 + assertEquals("unknown12", print.sb.toString());
19.11 + return;
19.12 + }
19.13 assertEquals("1 - 2", print.sb.toString());
19.14 }
19.15 }
20.1 --- a/samples/visitor/22-self/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 21:41:07 2008 +0200
20.2 +++ b/samples/visitor/22-self/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 22:38:00 2008 +0200
20.3 @@ -19,6 +19,10 @@
20.4 PrintVisitor print = new PrintVisitor();
20.5 plus.visit(Visitor.create(print));
20.6
20.7 + if (Boolean.getBoolean("no.failures")) {
20.8 + assertEquals("unknownunknownunknown", print.sb.toString());
20.9 + return;
20.10 + }
20.11 assertEquals("1.0 - 2.0", print.sb.toString());
20.12 }
20.13