refactored some TODOs

--HG-- extra : convert_revision : svn%3Aaa2aecf3-ea3e-0410-9d70-716747e7c967/trunk%40327
huangbotao · Jan 22, 2008 · c11da9a · c11da9a
1 parent 25f1eaf
commit c11da9a
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 19 deletions.
diff --git a/src/org/mockito/exceptions/Reporter.java b/src/org/mockito/exceptions/Reporter.java
@@ -100,8 +100,7 @@ public void unfinishedVerificationException() {
         ));
     }
 
-    //TODO Printable for those strings?
-    public void wantedDiffersFromActual(String wanted, String actual, HasStackTrace actualInvocationStackTrace) {
+    public void wantedDiffersFromActual(Printable wanted, Printable actual, HasStackTrace actualInvocationStackTrace) {
         WantedDiffersFromActual cause1 = new WantedDiffersFromActual(join(
                 "Actual invocation:",
                 actual.toString()
@@ -124,7 +123,6 @@ public void wantedButNotInvoked(Printable wanted) {
         ));
     }
 
-    //TODO previous and previousStackTrace should be the same object
     public void wantedButNotInvokedInOrder(Printable wanted, Printable previous, HasStackTrace previousStackTrace) {
         WantedAnywhereAfterFollowingInteraction cause = new WantedAnywhereAfterFollowingInteraction(join(
                         "Wanted anywhere AFTER following interaction:",

diff --git a/src/org/mockito/internal/invocation/InvocationsPrinter.java b/src/org/mockito/internal/invocation/InvocationsPrinter.java
@@ -4,6 +4,8 @@
  */
 package org.mockito.internal.invocation;
 
+import org.mockito.exceptions.Printable;
+
 public class InvocationsPrinter {
 
     private final String wanted;
@@ -19,11 +21,17 @@ public InvocationsPrinter(InvocationMatcher wantedInvocation, Invocation actualI
         }
     }
 
-    public String printWanted() {
-        return wanted;
+    public Printable getWanted() {
+        return new Printable() {
+            public String toString() {
+                return wanted;
+        }};
     }
 
-    public String printActual() {
-        return actual;
+    public Printable getActual() {
+        return new Printable() {
+            public String toString() {
+                return actual;
+        }};
     }
 }
diff --git a/src/org/mockito/internal/verification/MissingInvocationVerifier.java b/src/org/mockito/internal/verification/MissingInvocationVerifier.java
@@ -43,7 +43,7 @@ public void verify(List<Invocation> invocations, InvocationMatcher wanted, Verif
     private void reportMissingInvocationError(InvocationMatcher wanted, Invocation similar) {
         if (similar != null) {
             InvocationsPrinter printer = new InvocationsPrinter(wanted, similar);
-            reporter.wantedDiffersFromActual(printer.printWanted(), printer.printActual(), similar.getStackTrace());
+            reporter.wantedDiffersFromActual(printer.getWanted(), printer.getActual(), similar.getStackTrace());
         } else {
             reporter.wantedButNotInvoked(wanted);
         }

diff --git a/src/org/mockito/internal/verification/VerifyingRecorder.java b/src/org/mockito/internal/verification/VerifyingRecorder.java
@@ -14,7 +14,6 @@
 
 public class VerifyingRecorder {
 
-    //TODO don't like LL coz it's too slow :)
     private LinkedList<Invocation> registeredInvocations = new LinkedList<Invocation>();
 
     private final List<? extends Verifier> verifiers;

diff --git a/test/org/mockito/MockitoTest.java b/test/org/mockito/MockitoTest.java
@@ -18,6 +18,8 @@ public class MockitoTest extends RequiresValidState {
     //TODO I want to have ruby script that will collect all java code from examples in javadoc/documentation
     // and create a test case that I can manually fix and run and make sure examples are valid
 
+    //TODO check if performace can be tweaked (e.g: LL -> AL)
+
     @Test
     public void shouldRemoveStubbableFromProgressAfterStubbing() {
         List mock = Mockito.mock(List.class);

diff --git a/test/org/mockito/internal/invocation/InvocationsPrinterTest.java b/test/org/mockito/internal/invocation/InvocationsPrinterTest.java
@@ -19,8 +19,8 @@ public void shouldPrintWantedAndActualInvocation() throws Exception {
         Invocation differentMethod = new InvocationBuilder().differentMethod().toInvocation();
         InvocationsPrinter printer = new InvocationsPrinter(simpleMethod, differentMethod);
 
-        assertEquals("Object.simpleMethod()", printer.printWanted());
-        assertEquals("Object.differentMethod()", printer.printActual());
+        assertEquals("Object.simpleMethod()", printer.getWanted().toString());
+        assertEquals("Object.differentMethod()", printer.getActual().toString());
     }
 
     class Super {
@@ -42,8 +42,8 @@ public void shouldPrintSequenceNumbersWhenMatchesButMocksDifferent() throws Exce
 
         assertEquals(invocationOne.toString(), invocationTwo.toString());
 
-        assertEquals("Object.test(class java.lang.Object)", printer.printWanted());
-        assertEquals("Object.test(class java.lang.String)", printer.printActual());
+        assertEquals("Object.test(class java.lang.Object)", printer.getWanted().toString());
+        assertEquals("Object.test(class java.lang.String)", printer.getActual().toString());
     }
 
     class Dummy {
@@ -62,7 +62,7 @@ public void shouldPrintTypesWhenMockArgsAndMethodNameMatchButMethodNotEqual() th
 
         assertEquals(invocationOne.toString(), invocationTwo.toString());
 
-        assertEquals("Object.test(class [Ljava.lang.Object;)", printer.printWanted());
-        assertEquals("Object.test(class [Ljava.lang.String;)", printer.printActual());
+        assertEquals("Object.test(class [Ljava.lang.Object;)", printer.getWanted().toString());
+        assertEquals("Object.test(class [Ljava.lang.String;)", printer.getActual().toString());
     }
 }
diff --git a/test/org/mockito/internal/verification/MissingInvocationVerifierTest.java b/test/org/mockito/internal/verification/MissingInvocationVerifierTest.java
@@ -86,19 +86,19 @@ public void shouldReportWantedInvocationDiffersFromActual() {
 
         verifier.verify(invocations, wanted, VerificationModeImpl.atLeastOnce());
 
-        assertEquals(wanted.toString(), reporterStub.wanted);
-        assertEquals(actualInvocation.toString(), reporterStub.actual);
+        assertEquals(wanted.toString(), reporterStub.wanted.toString());
+        assertEquals(actualInvocation.toString(), reporterStub.actual.toString());
         assertSame(actualInvocation.getStackTrace(), reporterStub.actualInvocationStackTrace);
     }
 
     class ReporterStub extends Reporter {
         private Object wanted;
-        private String actual;
+        private Object actual;
         private HasStackTrace actualInvocationStackTrace;
         @Override public void wantedButNotInvoked(Printable wanted) {
             this.wanted = wanted;
         }
-        @Override public void wantedDiffersFromActual(String wanted, String actual, HasStackTrace actualInvocationStackTrace) {
+        @Override public void wantedDiffersFromActual(Printable wanted, Printable actual, HasStackTrace actualInvocationStackTrace) {
                     this.wanted = wanted;
                     this.actual = actual;
                     this.actualInvocationStackTrace = actualInvocationStackTrace;