# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430370 -7200
# Node ID 77b3c0f1e4c33ff38d0e8e10ad4293837ef0796a
# Parent  81d72f69fa42b2fe2655afcee9bd5ba79c033b82
Adding tests also for 3.0 version of the API

diff -r 81d72f69fa42 -r 77b3c0f1e4c3 samples/visitor/21-clientprovider/build.xml
--- a/samples/visitor/21-clientprovider/build.xml	Sat Jun 14 09:59:27 2008 +0200
+++ b/samples/visitor/21-clientprovider/build.xml	Sat Jun 14 09:59:30 2008 +0200
@@ -21,18 +21,14 @@
             <param name="cp" value="build/api1.0/classes:${junit.jar}"/>
         </antcall>
 
-        <echo level="info" message="Next compilation will fails, as adding methods into interface is not binary compatible"/>
-        <antcall target="-build-one">
-            <param name="version" value="test"/>
-            <param name="out" value="will-not-compile"/>
-            <param name="cp" value="build/api2.0/classes:${junit.jar}"/>
-            <param name="failonerror" value="false"/>
-        </antcall>
-
         <antcall target="-build-one">
             <param name="version" value="test2.0"/>
             <param name="cp" value="build/api2.0/classes:build/test/classes:${junit.jar}"/>
         </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="test3.0"/>
+            <param name="cp" value="build/api3.0/classes:build/test/classes:build/test2.0/classes:${junit.jar}"/>
+        </antcall>
     </target>
     
     <target name="test" depends="build">
@@ -50,6 +46,12 @@
             <param name="extra.cp" value="build/test/classes"/>
             <param name="version" value="api2.0"/>
         </antcall>
+        <echo level="info" message="Using old Number with new visitors"/>
+        <antcall target="-run-one">
+            <param name="test" value="test3.0"/>
+            <param name="extra.cp" value="build/test/classes:build/test2.0/classes:"/>
+            <param name="version" value="api3.0"/>
+        </antcall>
     </target>
     
     <!-- support methods -->
diff -r 81d72f69fa42 -r 77b3c0f1e4c3 samples/visitor/21-clientprovider/nbproject/project.xml
--- a/samples/visitor/21-clientprovider/nbproject/project.xml	Sat Jun 14 09:59:27 2008 +0200
+++ b/samples/visitor/21-clientprovider/nbproject/project.xml	Sat Jun 14 09:59:30 2008 +0200
@@ -40,6 +40,12 @@
                     <location>src-test2.0</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>test-3.0</label>
+                    <type>java</type>
+                    <location>src-test3.0</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
             </folders>
             <ide-actions>
                 <action name="build">
@@ -66,20 +72,24 @@
                         <location>src-api1.0</location>
                     </source-folder>
                     <source-folder style="packages">
+                        <label>Usage of the API</label>
+                        <location>src-test</location>
+                    </source-folder>
+                    <source-folder style="packages">
                         <label>API Version 2.0</label>
                         <location>src-api2.0</location>
                     </source-folder>
                     <source-folder style="packages">
+                        <label>Usage of 2.0 structures with 1.0 visitor</label>
+                        <location>src-test2.0</location>
+                    </source-folder>
+                    <source-folder style="packages">
                         <label>API Version 3.0</label>
                         <location>src-api3.0</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>Usage of the API</label>
-                        <location>src-test</location>
-                    </source-folder>
-                    <source-folder style="packages">
-                        <label>Usage of new structures with old visitor</label>
-                        <location>src-test2.0</location>
+                        <label>Usage of 3.0 visitor</label>
+                        <location>src-test3.0</location>
                     </source-folder>
                     <source-file>
                         <location>build.xml</location>
@@ -116,6 +126,11 @@
                 <classpath mode="compile">src-api2.0:src-test:../../libs/dist/junit-4.4.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
+            <compilation-unit>
+                <package-root>src-test3.0</package-root>
+                <classpath mode="compile">src-api3.0:src-test:src-test2.0:../../libs/dist/junit-4.4.jar</classpath>
+                <source-level>1.5</source-level>
+            </compilation-unit>
         </java-data>
     </configuration>
 </project>
diff -r 81d72f69fa42 -r 77b3c0f1e4c3 samples/visitor/21-clientprovider/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/visitor/21-clientprovider/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java	Sat Jun 14 09:59:30 2008 +0200
@@ -0,0 +1,83 @@
+package org.apidesign.test.visitor;
+
+import org.apidesign.test.visitor.PrintTest.PrintVisitor;
+import static junit.framework.Assert.*;
+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.Real;
+import org.apidesign.visitor.Language.Visitor;
+import org.junit.Test;
+
+public class PrintRealTest {
+    @Test public void printOneMinusTwo() {
+        Real one = newReal(1);
+        Real two = newReal(2);
+        Expression plus = PrintOfMinusStructureTest.newMinus(one, two);
+        
+        PrintVisitor print = new PrintVisitor();
+        plus.visit(print.dispatch);
+        
+        assertEquals("1.0 - 2.0", print.sb.toString());
+    }
+    
+    @Test public void visitorReadyForVersion3_0() {
+        class PrintVisitor3_0 implements Visitor.Version3_0 {
+            StringBuffer sb = new StringBuffer();
+            Visitor dispatch = Visitor.create(this);
+
+            public boolean visitUnknown(Expression exp) {
+                sb.append("unknown");
+                return true;
+            }
+
+            public void visitPlus(Plus s) {
+                s.getFirst().visit(dispatch);
+                sb.append(" + ");
+                s.getSecond().visit(dispatch);
+            }
+
+            public void visitMinus(Minus m) {
+                m.getFirst().visit(dispatch);
+                sb.append(" - ");
+                m.getSecond().visit(dispatch);
+            }
+
+            public void visitReal(Real r) {
+                sb.append(r.getValue());
+            }
+        }
+        
+        Number one = PrintTest.newNumber(1);
+        Number two = PrintTest.newNumber(2);
+        Expression plus = PrintOfMinusStructureTest.newMinus(one, two);
+        
+        PrintVisitor3_0 print = new PrintVisitor3_0();
+        plus.visit(print.dispatch);
+        
+        assertEquals("1.0 - 2.0", print.sb.toString());
+
+        Real five = newReal(5);
+        Real three = newReal(3);
+        Expression realPlus = PrintOfMinusStructureTest.newMinus(five, three);
+        
+        PrintVisitor3_0 printReal = new PrintVisitor3_0();
+        realPlus.visit(printReal.dispatch);
+        
+        assertEquals("5.0 - 3.0", printReal.sb.toString());
+        
+    }
+    
+    public static Real newReal(final double value) {
+        return new Real() {
+            public double getValue() {
+                return value;
+            }
+
+            public void visit(Visitor v) {
+                v.dispatchReal(this);
+            }
+        };
+    }
+}