1.1 --- a/samples/visitor/21-clientprovider/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java	Sat Jun 14 09:59:16 2008 +0200
     1.2 +++ b/samples/visitor/21-clientprovider/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java	Sat Jun 14 09:59:20 2008 +0200
     1.3 @@ -1,25 +1,41 @@
     1.4  package org.apidesign.test.visitor;
     1.5  
     1.6  import org.apidesign.test.visitor.PrintTest.PrintVisitor;
     1.7 +import org.apidesign.visitor.Language.Expression;
     1.8 +import org.apidesign.visitor.Language.Minus;
     1.9 +import org.apidesign.visitor.Language.Number;
    1.10  import static junit.framework.Assert.*;
    1.11 -import org.apidesign.visitor.notevolutionready.Language.Expression;
    1.12 -import org.apidesign.visitor.notevolutionready.Language.Minus;
    1.13 -import org.apidesign.visitor.notevolutionready.Language.Number;
    1.14 -import org.apidesign.visitor.notevolutionready.Language.Plus;
    1.15 -import org.apidesign.visitor.notevolutionready.Language.Visitor;
    1.16 +import org.apidesign.visitor.Language.Visitor;
    1.17  import org.junit.Test;
    1.18  
    1.19  public class PrintOfMinusStructureTest {
    1.20 +    public static Minus newMinus(
    1.21 +        final Expression first, final Expression second
    1.22 +    ) {
    1.23 +        return new Minus() {
    1.24 +            public Expression getFirst() {
    1.25 +                return first;
    1.26 +            }
    1.27 +
    1.28 +            public Expression getSecond() {
    1.29 +                return second;
    1.30 +            }
    1.31 +
    1.32 +            public void visit(Visitor v) {
    1.33 +                v.dispatchMinus(this);
    1.34 +            }
    1.35 +        };
    1.36 +    }
    1.37 +    
    1.38 +    
    1.39      @Test public void printOneMinusTwo() {
    1.40 -        // BEGIN: visitor.notevolutionready.oldwithnew
    1.41 -        Number one = new Number(1);
    1.42 -        Number two = new Number(2);
    1.43 -        Expression plus = new Minus(one, two);
    1.44 +        Number one = PrintTest.newNumber(1);
    1.45 +        Number two = PrintTest.newNumber(2);
    1.46 +        Expression plus = newMinus(one, two);
    1.47          
    1.48          PrintVisitor print = new PrintVisitor();
    1.49 -        plus.visit(print); // fails with AbstractMethodError
    1.50 +        plus.visit(print.dispatch);
    1.51          
    1.52          assertEquals("1 - 2", print.sb.toString());
    1.53 -        // END: visitor.notevolutionready.oldwithnew
    1.54      }
    1.55  }