# HG changeset patch # User Jaroslav Tulach # Date 1213475880 -7200 # Node ID eb31b2d1822ad28651732157188e9e19566e5e99 # Parent 312188b7ba9392c98569ad663b8d5567fdff83ae All tests are passing now in the "no.failures" mode diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/01-notevolutionready/build.xml --- a/samples/visitor/01-notevolutionready/build.xml Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/01-notevolutionready/build.xml Sat Jun 14 22:38:00 2008 +0200 @@ -73,6 +73,10 @@ + + + + @@ -91,6 +95,7 @@ source="1.5" target="1.5" classpath="${cp}" failonerror="${failonerror}" + debug="true" /> diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/01-notevolutionready/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java --- a/samples/visitor/01-notevolutionready/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/01-notevolutionready/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -5,12 +5,11 @@ import org.apidesign.visitor.notevolutionready.Language.Expression; import org.apidesign.visitor.notevolutionready.Language.Minus; import org.apidesign.visitor.notevolutionready.Language.Number; -import org.apidesign.visitor.notevolutionready.Language.Plus; -import org.apidesign.visitor.notevolutionready.Language.Visitor; import org.junit.Test; public class PrintOfMinusStructureTest { @Test public void printOneMinusTwo() { + if (Boolean.getBoolean("no.failures")) return; // BEGIN: visitor.notevolutionready.oldwithnew Number one = new Number(1); Number two = new Number(2); diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/02-abstractclass/build.xml --- a/samples/visitor/02-abstractclass/build.xml Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/02-abstractclass/build.xml Sat Jun 14 22:38:00 2008 +0200 @@ -71,6 +71,10 @@ + + + + @@ -89,6 +93,7 @@ source="1.5" target="1.5" classpath="${cp}" failonerror="${failonerror}" + debug="true" /> diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/02-abstractclass/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java --- a/samples/visitor/02-abstractclass/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/02-abstractclass/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -5,12 +5,11 @@ import org.apidesign.visitor.Language.Expression; import org.apidesign.visitor.Language.Minus; import org.apidesign.visitor.Language.Number; -import org.apidesign.visitor.Language.Plus; -import org.apidesign.visitor.Language.Visitor; import org.junit.Test; public class PrintOfMinusStructureTest { @Test public void printOneMinusTwo() { + if (Boolean.getBoolean("no.failures")) return; Number one = new Number(1); Number two = new Number(2); Expression minus = new Minus(one, two); diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/03-visitunknown/build.xml --- a/samples/visitor/03-visitunknown/build.xml Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/03-visitunknown/build.xml Sat Jun 14 22:38:00 2008 +0200 @@ -71,6 +71,10 @@ + + + + @@ -89,6 +93,7 @@ source="1.5" target="1.5" classpath="${cp}" failonerror="${failonerror}" + debug="true" /> diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/InvalidCountNumbersTest.java --- a/samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/InvalidCountNumbersTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/InvalidCountNumbersTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -15,10 +15,18 @@ Number four = new Number(4); Expression minus = new Plus(one, new Minus(three, four)); + int cnt = CountNumbersTest.countNumbers(minus); + if (Boolean.getBoolean("no.failures")) { + // Should have three numbers, but visitor does not + // know how to go through minus + assertEquals( + "Wrong result as there is no traversal through minus", 1, cnt + ); + return; + } assertEquals( "Should have three numbers, but visitor does not " + - "know how to go through minus", - 3, CountNumbersTest.countNumbers(minus) + "know how to go through minus", 3, cnt ); // END: visitor.visitunknown.traversal } diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java --- a/samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -5,12 +5,11 @@ import org.apidesign.visitor.Language.Expression; import org.apidesign.visitor.Language.Minus; import org.apidesign.visitor.Language.Number; -import org.apidesign.visitor.Language.Plus; -import org.apidesign.visitor.Language.Visitor; import org.junit.Test; public class PrintOfMinusStructureTest { @Test public void printOneMinusTwo() { + if (Boolean.getBoolean("no.failures")) return; Number one = new Number(1); Number two = new Number(2); Expression minus = new Minus(one, two); diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/04-traversal/build.xml --- a/samples/visitor/04-traversal/build.xml Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/04-traversal/build.xml Sat Jun 14 22:38:00 2008 +0200 @@ -71,6 +71,10 @@ + + + + @@ -89,6 +93,7 @@ source="1.5" target="1.5" classpath="${cp}" failonerror="${failonerror}" + debug="true" /> diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/04-traversal/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java --- a/samples/visitor/04-traversal/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/04-traversal/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -5,12 +5,11 @@ import org.apidesign.visitor.Language.Expression; import org.apidesign.visitor.Language.Minus; import org.apidesign.visitor.Language.Number; -import org.apidesign.visitor.Language.Plus; -import org.apidesign.visitor.Language.Visitor; import org.junit.Test; public class PrintOfMinusStructureTest { @Test public void printOneMinusTwo() { + if (Boolean.getBoolean("no.failures")) return; Number one = new Number(1); Number two = new Number(2); Expression minus = new Minus(one, two); diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/11-cleanversion/build.xml --- a/samples/visitor/11-cleanversion/build.xml Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/11-cleanversion/build.xml Sat Jun 14 22:38:00 2008 +0200 @@ -3,7 +3,6 @@ - @@ -15,12 +14,10 @@ - - @@ -30,7 +27,6 @@ - @@ -55,13 +51,10 @@ - - - @@ -78,14 +71,16 @@ + + + + - - @@ -96,6 +91,7 @@ source="1.5" target="1.5" classpath="${cp}" failonerror="${failonerror}" + debug="true" /> diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/11-cleanversion/src-test/org/apidesign/test/visitor/PrintTest.java --- a/samples/visitor/11-cleanversion/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/11-cleanversion/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -4,7 +4,6 @@ import org.apidesign.visitor.Language.Expression; import org.apidesign.visitor.Language.Number; import org.apidesign.visitor.Language.Plus; -import org.apidesign.visitor.Language.Visitor; import org.apidesign.visitor.Language.Visitor1_0; import org.junit.Test; diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/11-cleanversion/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java --- a/samples/visitor/11-cleanversion/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/11-cleanversion/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -18,6 +18,13 @@ PrintVisitor print = new PrintVisitor(); plus.visit(print); + if (Boolean.getBoolean("no.failures")) { + assertEquals( + "Not defined how to handle Minus. We'll get wrong result", + "unknown", print.sb.toString() + ); + return; + } assertEquals("1 - 2", print.sb.toString()); } diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/11-cleanversion/src-test3.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java --- a/samples/visitor/11-cleanversion/src-test3.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/11-cleanversion/src-test3.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -7,7 +7,6 @@ import org.apidesign.visitor.Language.Number; import org.apidesign.visitor.Language.Plus; import org.apidesign.visitor.Language.Real; -import org.apidesign.visitor.Language.Visitor2_0; import org.apidesign.visitor.Language.Visitor3_0; import org.junit.Test; @@ -20,6 +19,13 @@ PrintVisitor print = new PrintVisitor(); plus.visit(print); + if (Boolean.getBoolean("no.failures")) { + assertEquals( + "Not defined how to handle Minus. We'll get wrong result", + "unknown", print.sb.toString() + ); + return; + } assertEquals("1.0 - 2.0", print.sb.toString()); } diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/21-clientprovider/build.xml --- a/samples/visitor/21-clientprovider/build.xml Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/21-clientprovider/build.xml Sat Jun 14 22:38:00 2008 +0200 @@ -78,6 +78,10 @@ + + + + @@ -96,6 +100,7 @@ source="1.5" target="1.5" classpath="${cp}" failonerror="${failonerror}" + debug="true" /> diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/21-clientprovider/src-test/org/apidesign/test/visitor/PrintTest.java --- a/samples/visitor/21-clientprovider/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/21-clientprovider/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -4,7 +4,6 @@ import org.apidesign.visitor.Language.Number; import org.apidesign.visitor.Language.Plus; import org.apidesign.visitor.Language.Visitor; -import org.apidesign.visitor.Language.Visitor; import static junit.framework.Assert.*; import org.junit.Test; diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/21-clientprovider/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java --- a/samples/visitor/21-clientprovider/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/21-clientprovider/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -36,6 +36,10 @@ PrintVisitor print = new PrintVisitor(); plus.visit(print.dispatch); + if (Boolean.getBoolean("no.failures")) { + assertEquals("unknown12", print.sb.toString()); + return; + } assertEquals("1 - 2", print.sb.toString()); } } diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/21-clientprovider/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java --- a/samples/visitor/21-clientprovider/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/21-clientprovider/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -19,6 +19,10 @@ PrintVisitor print = new PrintVisitor(); plus.visit(print.dispatch); + if (Boolean.getBoolean("no.failures")) { + assertEquals("unknownunknownunknown", print.sb.toString()); + return; + } assertEquals("1.0 - 2.0", print.sb.toString()); } diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/22-self/build.xml --- a/samples/visitor/22-self/build.xml Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/22-self/build.xml Sat Jun 14 22:38:00 2008 +0200 @@ -3,7 +3,6 @@ - @@ -15,12 +14,10 @@ - - @@ -30,7 +27,6 @@ - @@ -55,13 +51,10 @@ - - - @@ -78,14 +71,16 @@ + + + + - - @@ -96,6 +91,7 @@ source="1.5" target="1.5" classpath="${cp}" failonerror="${failonerror}" + debug="true" /> diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/22-self/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java --- a/samples/visitor/22-self/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/22-self/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -35,7 +35,11 @@ PrintVisitor print = new PrintVisitor(); plus.visit(Visitor.create(print)); - + + if (Boolean.getBoolean("no.failures")) { + assertEquals("unknown12", print.sb.toString()); + return; + } assertEquals("1 - 2", print.sb.toString()); } } diff -r 312188b7ba93 -r eb31b2d1822a samples/visitor/22-self/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java --- a/samples/visitor/22-self/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 21:41:07 2008 +0200 +++ b/samples/visitor/22-self/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 22:38:00 2008 +0200 @@ -19,6 +19,10 @@ PrintVisitor print = new PrintVisitor(); plus.visit(Visitor.create(print)); + if (Boolean.getBoolean("no.failures")) { + assertEquals("unknownunknownunknown", print.sb.toString()); + return; + } assertEquals("1.0 - 2.0", print.sb.toString()); }