1.1 --- a/samples/visitor/21-clientprovider/src-test/org/apidesign/test/visitor/PrintTest.java	Sat Jun 14 09:59:16 2008 +0200
     1.2 +++ b/samples/visitor/21-clientprovider/src-test/org/apidesign/test/visitor/PrintTest.java	Sat Jun 14 09:59:20 2008 +0200
     1.3 @@ -1,48 +1,83 @@
     1.4  package org.apidesign.test.visitor;
     1.5  
     1.6 +import org.apidesign.visitor.Language.Expression;
     1.7 +import org.apidesign.visitor.Language.Number;
     1.8 +import org.apidesign.visitor.Language.Plus;
     1.9 +import org.apidesign.visitor.Language.Visitor;
    1.10 +import org.apidesign.visitor.Language.Visitor;
    1.11  import static junit.framework.Assert.*;
    1.12 -import org.apidesign.visitor.notevolutionready.Language.Expression;
    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.junit.Test;
    1.17  
    1.18  public class PrintTest {
    1.19 +    
    1.20 +    public static Number newNumber(final int value) {
    1.21 +        return new Number() {
    1.22 +            public int getValue() {
    1.23 +                return value;
    1.24 +            }
    1.25  
    1.26 -    // BEGIN: visitor.notevolutionready.print
    1.27 -    public static class PrintVisitor implements Visitor {
    1.28 +            public void visit(Visitor v) {
    1.29 +                v.dispatchNumber(this);
    1.30 +            }
    1.31 +        };
    1.32 +    }
    1.33 +    public static Plus newPlus(
    1.34 +        final Expression first, final Expression second
    1.35 +    ) {
    1.36 +        return new Plus() {
    1.37 +            public Expression getFirst() {
    1.38 +                return first;
    1.39 +            }
    1.40 +
    1.41 +            public Expression getSecond() {
    1.42 +                return second;
    1.43 +            }
    1.44 +
    1.45 +            public void visit(Visitor v) {
    1.46 +                v.dispatchPlus(this);
    1.47 +            }
    1.48 +        };
    1.49 +    }
    1.50 +
    1.51 +    public static class PrintVisitor implements Visitor.Version1_0 {
    1.52          StringBuffer sb = new StringBuffer();
    1.53          
    1.54 +        final Visitor dispatch = Visitor.create(this);
    1.55 +        
    1.56          public void visitPlus(Plus s) {
    1.57 -            s.getFirst().visit(this);
    1.58 +            s.getFirst().visit(dispatch);
    1.59              sb.append(" + ");
    1.60 -            s.getSecond().visit(this);
    1.61 +            s.getSecond().visit(dispatch);
    1.62          }
    1.63  
    1.64          public void visitNumber(Number n) {
    1.65              sb.append (n.getValue());
    1.66          }
    1.67 +
    1.68 +        public boolean visitUnknown(Expression e) {
    1.69 +            sb.append("unknown");
    1.70 +            return true;
    1.71 +        }
    1.72      }
    1.73      
    1.74      @Test public void printOnePlusOne() {
    1.75 -        Number one = new Number(1);
    1.76 -        Expression plus = new Plus(one, one);
    1.77 +        Number one = newNumber(1);
    1.78 +        Expression plus = newPlus(one, one);
    1.79          
    1.80          PrintVisitor print = new PrintVisitor();
    1.81 -        plus.visit(print);
    1.82 +        plus.visit(print.dispatch);
    1.83          
    1.84          assertEquals("1 + 1", print.sb.toString());
    1.85      }
    1.86 -    // END: visitor.notevolutionready.print
    1.87  
    1.88      @Test public void printOnePlusTwoPlusThree() {
    1.89 -        Number one = new Number(1);
    1.90 -        Number two = new Number(2);
    1.91 -        Number three = new Number(3);
    1.92 -        Expression plus = new Plus(one, new Plus(two, three));
    1.93 +        Number one = newNumber(1);
    1.94 +        Number two = newNumber(2);
    1.95 +        Number three = newNumber(3);
    1.96 +        Expression plus = newPlus(one, newPlus(two, three));
    1.97          
    1.98          PrintVisitor print = new PrintVisitor();
    1.99 -        plus.visit(print);
   1.100 +        plus.visit(print.dispatch);
   1.101          
   1.102          assertEquals("1 + 2 + 3", print.sb.toString());
   1.103      }