1.1 --- a/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:25 2008 +0200
     1.2 +++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:28 2008 +0200
     1.3 @@ -28,6 +28,7 @@
     1.4      protected abstract Scrambler getScrambler();
     1.5      
     1.6      public void display() {
     1.7 +        initWord();
     1.8          setVisible(true);
     1.9      }
    1.10  // FINISH: anagram.ui.Anagrams
    1.11 @@ -35,10 +36,12 @@
    1.12      String original;
    1.13      String scrambled;
    1.14      
    1.15 -    @Override
    1.16 -    public void addNotify() {
    1.17 -        super.addNotify();
    1.18 -        initWord();
    1.19 +    public final String getOriginalWord() {
    1.20 +        return original;
    1.21 +    }
    1.22 +    
    1.23 +    public final String getScrambledWord() {
    1.24 +        return scrambled;
    1.25      }
    1.26      
    1.27      /** This method is called from within the constructor to
    1.28 @@ -190,7 +193,7 @@
    1.29          guessedWord.requestFocus();
    1.30      }//GEN-LAST:event_nextTrialActionPerformed
    1.31  
    1.32 -    private void initWord() {
    1.33 +    protected final void initWord() {
    1.34          
    1.35          String[] words = getWordLibrary().getWords();
    1.36          int index = wordIdx % words.length;

     2.1 --- a/samples/componentinjection/anagram-modular/src-test/org/apidesign/anagram/gui/AnagramsTestBase.java	Sat Jun 14 10:08:25 2008 +0200
     2.2 +++ b/samples/componentinjection/anagram-modular/src-test/org/apidesign/anagram/gui/AnagramsTestBase.java	Sat Jun 14 10:08:28 2008 +0200
     2.3 @@ -30,13 +30,29 @@
     2.4          assertEquals(
     2.5              "It is the mock one", SingleMockLibrary.class, l.getClass()
     2.6          );
     2.7 +        
     2.8 +        ui.display();
     2.9 +        
    2.10 +        assertEquals(
    2.11 +            "The word from SingleMockLibrary is taken",
    2.12 +            "Hello World!", ui.getOriginalWord()
    2.13 +        );
    2.14 +        assertEquals(
    2.15 +            "The word is rotated using ReversingMockScrambler",
    2.16 +            "!dlroW olleH", ui.getScrambledWord()
    2.17 +        );
    2.18      }
    2.19      
    2.20 -    public static final class ReversingMockScrambler {
    2.21 -        
    2.22 +    public static final class ReversingMockScrambler implements Scrambler {
    2.23 +        public String scramble(String word) {
    2.24 +            return new StringBuilder(word).reverse().toString();
    2.25 +        }
    2.26      }
    2.27      
    2.28 -    public static final class SingleMockLibrary {
    2.29 +    public static final class SingleMockLibrary implements WordLibrary {
    2.30 +        public String[] getWords() {
    2.31 +            return new String[] { "Hello World!" };
    2.32 +        }
    2.33          
    2.34      }
    2.35  }