[qdox-scm] [1117] trunk/qdox/src/test/com/thoughtworks/qdox/parser: Remove MockLexer, replaced with Mockito mock

[rfscholte]

Title: [1117] trunk/qdox/src/test/com/thoughtworks/qdox/parser: Remove MockLexer, replaced with Mockito mock

Revision

1117

Author

rfscholte

Date

2011-03-14 17:16:57 -0500 (Mon, 14 Mar 2011)

Log Message

Remove MockLexer, replaced with Mockito mock

Modified Paths

• trunk/qdox/src/test/com/thoughtworks/qdox/parser/ParserTest.java

Removed Paths

trunk/qdox/src/test/com/thoughtworks/qdox/parser/MockLexer.java

Diff

Deleted: trunk/qdox/src/test/com/thoughtworks/qdox/parser/MockLexer.java (1116 => 1117)

--- trunk/qdox/src/test/com/thoughtworks/qdox/parser/MockLexer.java	2011-03-14 21:29:22 UTC (rev 1116)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/parser/MockLexer.java	2011-03-14 22:16:57 UTC (rev 1117)
@@ -1,38 +0,0 @@
-package com.thoughtworks.qdox.parser;
-
-import org.jmock.expectation.ReturnObjectList;
-
-class MockLexer implements Lexer {
-
-    private ReturnObjectList textReturn = new ReturnObjectList("text");
-    private ReturnObjectList lexReturn = new ReturnObjectList("lex");
-
-    public void setupText(String value) {
-        textReturn.addObjectToReturn(value);
-    }
-
-    public void setupLex(int value) {
-        lexReturn.addObjectToReturn(value);
-    }
-
-    public int lex() {
-        return ((Integer) lexReturn.nextReturnObject()).intValue();
-    }
-
-    public String text() {
-        return (String) textReturn.nextReturnObject();
-    }
-
-    public int getLine() {
-        return -1;
-    }
-
-    public int getColumn() {
-        return -1;
-    }
-
-
-    public String getCodeBody() {
-        return "";
-    }
-}

Modified: trunk/qdox/src/test/com/thoughtworks/qdox/parser/ParserTest.java (1116 => 1117)

--- trunk/qdox/src/test/com/thoughtworks/qdox/parser/ParserTest.java	2011-03-14 21:29:22 UTC (rev 1116)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/parser/ParserTest.java	2011-03-14 22:16:57 UTC (rev 1117)
@@ -1,10 +1,19 @@
 package com.thoughtworks.qdox.parser;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
 
 import junit.framework.TestCase;
 
+import org.mockito.stubbing.answers.ReturnsElementsOf;
+
 import com.thoughtworks.qdox.builder.Builder;
 import com.thoughtworks.qdox.parser.impl.Parser;
 import com.thoughtworks.qdox.parser.structs.ClassDef;
@@ -16,8 +25,11 @@
 import com.thoughtworks.qdox.parser.structs.WildcardTypeDef;
 
 public class ParserTest extends TestCase {
-
-    private MockLexer lexer;
+    
+    private Collection<Integer> lexValues = new LinkedList<Integer>();
+    private Collection<String> textValues = new LinkedList<String>();
+    
+    private Lexer lexer;
     private Builder builder;
 
     public ParserTest(String s) {
@@ -25,9 +37,10 @@
     }
 
     protected void setUp() throws Exception {
-        super.setUp();
-        lexer = new MockLexer();
         builder = mock(Builder.class);
+        lexer = mock(Lexer.class);
+        lexValues.clear();
+        textValues.clear();
     }
     
     @Override
@@ -2638,12 +2651,19 @@
     }
 
     private void setupLex(int token, String value) {
-        lexer.setupLex(token);
-        lexer.setupText(value);
+        lexValues.add( token );
+        textValues.add( value );
     }
 
-    private void setupLex(int token) {
-        setupLex(token, null);
+    private void setupLex( int token ) throws Exception
+    {
+        setupLex( token, null );
+        if ( token == 0 )
+        {
+            when( lexer.lex() ).thenAnswer( new ReturnsElementsOf( lexValues ) );
+            when( lexer.text() ).thenAnswer( new ReturnsElementsOf( textValues ) );
+            when( lexer.getLine() ).thenReturn( -1 );
+        }
     }
 
 }
\ No newline at end of file

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email