1.1 --- a/samples/composition/nbproject/project.xml	Sat Jun 14 09:51:05 2008 +0200
     1.2 +++ b/samples/composition/nbproject/project.xml	Sat Jun 14 09:51:05 2008 +0200
     1.3 @@ -81,7 +81,7 @@
     1.4              </compilation-unit>
     1.5              <compilation-unit>
     1.6                  <package-root>src-test</package-root>
     1.7 -                <classpath mode="compile">src-api1.0:../libs/dist/junit-4.1.jar</classpath>
     1.8 +                <classpath mode="compile">src-api1.0:../libs/dist/junit-4.4.jar</classpath>
     1.9                  <source-level>1.5</source-level>
    1.10              </compilation-unit>
    1.11          </java-data>

     2.1 --- a/samples/composition/src-test/api/ArithmeticaTest.java	Sat Jun 14 09:51:05 2008 +0200
     2.2 +++ b/samples/composition/src-test/api/ArithmeticaTest.java	Sat Jun 14 09:51:05 2008 +0200
     2.3 @@ -1,8 +1,3 @@
     2.4 -/*
     2.5 - * Žluťoučký kůň je naše hříbátko.
     2.6 - * and open the template in the editor.
     2.7 - */
     2.8 -
     2.9  package api;
    2.10  
    2.11  import junit.framework.TestCase;
    2.12 @@ -27,6 +22,7 @@
    2.13          super.tearDown();
    2.14      }
    2.15  
    2.16 +    //BEGIN: design.composition.arith.test
    2.17      public void testSumTwo() {
    2.18          Arithmetica instance = new Arithmetica();
    2.19          assertEquals("+", 5, instance.sumTwo(3, 2));
    2.20 @@ -42,5 +38,6 @@
    2.21          assertEquals("+", 6, instance.sumRange(1, 3));
    2.22          assertEquals("10", 55, instance.sumRange(1, 10));
    2.23      }
    2.24 +    //END: design.composition.arith.test
    2.25  
    2.26  }

     3.1 --- a/samples/composition/src-test/api/FactorialTest.java	Sat Jun 14 09:51:05 2008 +0200
     3.2 +++ b/samples/composition/src-test/api/FactorialTest.java	Sat Jun 14 09:51:05 2008 +0200
     3.3 @@ -43,7 +43,8 @@
     3.4       * Arithmetica methods to do multiplication instead of
     3.5       * addition.
     3.6       */
     3.7 -    private static class Factorial extends Arithmetica {
     3.8 +    //BEGIN: design.composition.arith.factorial
     3.9 +    public static final class Factorial extends Arithmetica {
    3.10          public static int factorial(int n) {
    3.11              return new Factorial().sumRange(1, n);
    3.12          }
    3.13 @@ -52,6 +53,7 @@
    3.14              return one * second;
    3.15          }
    3.16      }
    3.17 +    //END: design.composition.arith.factorial
    3.18  
    3.19      
    3.20  }