name change refactoring

--HG-- rename : src/org/mockito/exceptions/verification/VerifcationInOrderFailed.java => src/org/mockito/exceptions/verification/VerifcationInOrderFailure.java extra : convert_revision : svn%3Aaa2aecf3-ea3e-0410-9d70-716747e7c967/trunk%40326
huangbotao · Jan 22, 2008 · 25f1eaf · 25f1eaf
1 parent 004ce06
commit 25f1eaf
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 75 deletions.
diff --git a/src/org/mockito/exceptions/Printable.java b/src/org/mockito/exceptions/Printable.java
@@ -1,6 +1,5 @@
 package org.mockito.exceptions;
 
-//TODO exceptions.Printable ?
 public interface Printable {
 
     String toString();

diff --git a/src/org/mockito/exceptions/Reporter.java b/src/org/mockito/exceptions/Reporter.java
@@ -19,7 +19,7 @@
 import org.mockito.exceptions.verification.NoInteractionsWanted;
 import org.mockito.exceptions.verification.TooLittleActualInvocations;
 import org.mockito.exceptions.verification.TooManyActualInvocations;
-import org.mockito.exceptions.verification.VerifcationInOrderFailed;
+import org.mockito.exceptions.verification.VerifcationInOrderFailure;
 import org.mockito.exceptions.verification.WantedButNotInvoked;
 
 /**
@@ -131,8 +131,8 @@ public void wantedButNotInvokedInOrder(Printable wanted, Printable previous, Has
                         previous.toString()));
         cause.setStackTrace(previousStackTrace.getStackTrace());
 
-        throw new VerifcationInOrderFailed(join(
-                    "Verification in order failed",
+        throw new VerifcationInOrderFailure(join(
+                    "Verification in order failure",
                     "Wanted but not invoked:",
                     wanted.toString()
         ), cause);
@@ -150,8 +150,8 @@ public void tooManyActualInvocations(int wantedCount, int actualCount, Printable
     public void tooManyActualInvocationsInOrder(int wantedCount, int actualCount, Printable wanted, HasStackTrace firstUndesired) {
         UndesiredInvocation cause = createUndesiredInvocationCause(firstUndesired);
 
-        throw new VerifcationInOrderFailed(join(
-                "Verification in order failed",
+        throw new VerifcationInOrderFailure(join(
+                "Verification in order failure",
                 wanted.toString(),
                 "Wanted " + pluralize(wantedCount) + " but was " + actualCount
         ), cause);
@@ -176,8 +176,8 @@ public void tooLittleActualInvocations(int wantedCount, int actualCount, Printab
     public void tooLittleActualInvocationsInOrder(int wantedCount, int actualCount, Printable wanted, HasStackTrace lastActualStackTrace) {
         TooLittleInvocations cause = createTooLittleInvocationsCause(lastActualStackTrace);
 
-        throw new VerifcationInOrderFailed(join(
-                "Verification in order failed",
+        throw new VerifcationInOrderFailure(join(
+                "Verification in order failure",
                 wanted.toString(),
                 "Wanted " + pluralize(wantedCount) + " but was " + actualCount
         ), cause);

diff --git a/...erification/VerifcationInOrderFailed.java → ...rification/VerifcationInOrderFailure.java b/...erification/VerifcationInOrderFailed.java → ...rification/VerifcationInOrderFailure.java
@@ -6,16 +6,15 @@
 
 import org.mockito.exceptions.base.MockitoAssertionError;
 
-//TODO change to 'failure'
-public class VerifcationInOrderFailed extends MockitoAssertionError {
+public class VerifcationInOrderFailure extends MockitoAssertionError {
 
     private static final long serialVersionUID = 1L;
 
-    public VerifcationInOrderFailed(String message, Throwable cause) {
+    public VerifcationInOrderFailure(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public VerifcationInOrderFailed(String message) {
+    public VerifcationInOrderFailure(String message) {
         super(message);
     }
 }
diff --git a/test/org/mockito/internal/verification/NumberOfInvocationsInOrderVerifierTest.java b/test/org/mockito/internal/verification/NumberOfInvocationsInOrderVerifierTest.java
@@ -15,7 +15,7 @@
 import org.junit.Test;
 import org.mockito.RequiresValidState;
 import org.mockito.exceptions.Reporter;
-import org.mockito.exceptions.verification.VerifcationInOrderFailed;
+import org.mockito.exceptions.verification.VerifcationInOrderFailure;
 import org.mockito.internal.invocation.Invocation;
 import org.mockito.internal.invocation.InvocationBuilder;
 import org.mockito.internal.invocation.InvocationMatcher;
@@ -66,7 +66,7 @@ public void shouldReportTooLittleInvocations() throws Exception {
         try {
             verifier.verify(invocations, wanted, new VerificationModeBuilder().times(4).inOrder());
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e, messageContains("Wanted 4 times but was 2"));
         }
     }
@@ -80,7 +80,7 @@ public void shouldReportTooManyInvocations() throws Exception {
         try {
             verifier.verify(invocations, wanted, new VerificationModeBuilder().times(1).inOrder());
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e, messageContains("Wanted 1 time but was 2"));
         }
     }

diff --git a/test/org/mockitousage/PointingStackTraceToActualInvocationChunkInOrderTest.java b/test/org/mockitousage/PointingStackTraceToActualInvocationChunkInOrderTest.java
@@ -14,7 +14,7 @@
 import org.mockito.InOrder;
 import org.mockito.Mockito;
 import org.mockito.RequiresValidState;
-import org.mockito.exceptions.verification.VerifcationInOrderFailed;
+import org.mockito.exceptions.verification.VerifcationInOrderFailure;
 
 //TODO pmd rule so that all that starts with should have @Test annotation (or all XTest have some annotations on public methods)
 public class PointingStackTraceToActualInvocationChunkInOrderTest extends RequiresValidState {
@@ -60,7 +60,7 @@ public void shouldPointStackTraceToPreviousInvocation() {
         try {
             inOrder.verify(mock).simpleMethod(999);
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e.getCause(), hasFirstMethodInStackTrace("secondChunk"));
         }
     }
@@ -72,7 +72,7 @@ public void shouldPointToThirdInteractionBecauseAtLeastOnceUsed() {
         try {
             inOrder.verify(mockTwo).simpleMethod(999);
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e.getCause(), hasFirstMethodInStackTrace("thirdChunk"));
         }
     }
@@ -86,7 +86,7 @@ public void shouldPointToThirdChunkWhenTooLittleActualInvocations() {
         try {
             inOrder.verify(mockTwo, times(3)).simpleMethod(999);
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e.getCause(), hasFirstMethodInStackTrace("thirdChunk"));
         }
     }
@@ -98,7 +98,7 @@ public void shouldPointToFourthChunkBecauseTooManyActualInvocations() {
         try {
             inOrder.verify(mockTwo, times(0)).simpleMethod(anyInt());
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e.getCause(), hasFirstMethodInStackTrace("fourthChunk"));
         }
     }

diff --git a/test/org/mockitousage/PointingStackTraceToActualInvocationInOrderTest.java b/test/org/mockitousage/PointingStackTraceToActualInvocationInOrderTest.java
@@ -14,7 +14,7 @@
 import org.mockito.InOrder;
 import org.mockito.Mockito;
 import org.mockito.RequiresValidState;
-import org.mockito.exceptions.verification.VerifcationInOrderFailed;
+import org.mockito.exceptions.verification.VerifcationInOrderFailure;
 
 public class PointingStackTraceToActualInvocationInOrderTest extends RequiresValidState {
 
@@ -55,7 +55,7 @@ public void shouldPointStackTraceToPreviousVerified() {
         try {
             inOrder.verify(mock).simpleMethod(999);
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e.getCause(), hasFirstMethodInStackTrace("fourth"));
         }
     }
@@ -67,7 +67,7 @@ public void shouldPointToThirdMethod() {
         try {
             inOrder.verify(mockTwo).simpleMethod(999);
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e.getCause(), hasFirstMethodInStackTrace("third"));
         }
     }
@@ -80,7 +80,7 @@ public void shouldPointToSecondMethod() {
         try {
             inOrder.verify(mockTwo, times(3)).simpleMethod(999);
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e.getCause(), hasFirstMethodInStackTrace("second"));
         }
     }
@@ -90,7 +90,7 @@ public void shouldPointToFirstMethodBecauseOfTooManyActualInvocations() {
         try {
             inOrder.verify(mock, times(0)).simpleMethod(anyInt());
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e.getCause(), hasFirstMethodInStackTrace("first"));
         }
     }    
@@ -102,7 +102,7 @@ public void shouldPointToSecondMethodBecauseOfTooManyActualInvocations() {
         try {
             inOrder.verify(mockTwo, times(0)).simpleMethod(anyInt());
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e.getCause(), hasFirstMethodInStackTrace("second"));
         }
     }
@@ -116,7 +116,7 @@ public void shouldPointToFourthMethodBecauseOfTooLittleActualInvocations() {
         try {
             inOrder.verify(mockTwo, times(3)).simpleMethod(anyInt());
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e.getCause(), hasFirstMethodInStackTrace("fourth"));
         }
     }

diff --git a/test/org/mockitousage/StackTraceFilteringTest.java b/test/org/mockitousage/StackTraceFilteringTest.java
@@ -17,7 +17,7 @@
 import org.mockito.InOrder;
 import org.mockito.exceptions.base.MockitoException;
 import org.mockito.exceptions.verification.NoInteractionsWanted;
-import org.mockito.exceptions.verification.VerifcationInOrderFailed;
+import org.mockito.exceptions.verification.VerifcationInOrderFailure;
 import org.mockito.exceptions.verification.WantedButNotInvoked;
 
 public class StackTraceFilteringTest extends RequiresValidState {
@@ -88,7 +88,7 @@ public void shouldFilterStacktraceWhenVerifyingInOrder() {
         try {
             inOrder.verify(mock).oneArg(true);
             fail();
-        } catch (VerifcationInOrderFailed e) {
+        } catch (VerifcationInOrderFailure e) {
             assertThat(e, hasFirstMethodInStackTrace("shouldFilterStacktraceWhenVerifyingInOrder"));
         }
     }

diff --git a/test/org/mockitousage/verification/BasicVerificationInOrderTest.java b/test/org/mockitousage/verification/BasicVerificationInOrderTest.java
@@ -12,7 +12,7 @@
 import org.mockito.RequiresValidState;
 import org.mockito.InOrder;
 import org.mockito.exceptions.verification.NoInteractionsWanted;
-import org.mockito.exceptions.verification.VerifcationInOrderFailed;
+import org.mockito.exceptions.verification.VerifcationInOrderFailure;
 import org.mockito.exceptions.verification.WantedButNotInvoked;
 import org.mockitousage.IMethods;
 
@@ -79,7 +79,7 @@ public void shouldFailWhenFirstMockCalledTwice() {
         try {
             inOrder.verify(mockOne).simpleMethod(1);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }
 
     @Test
@@ -92,15 +92,15 @@ public void shouldFailWhenLastMockCalledTwice() {
         try {
             inOrder.verify(mockOne).simpleMethod(4);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }
 
-    @Test(expected=VerifcationInOrderFailed.class)
+    @Test(expected=VerifcationInOrderFailure.class)
     public void shouldFailOnFirstMethodBecauseOneInvocationWanted() {
         inOrder.verify(mockOne, times(0)).simpleMethod(1);
     }
 
-    @Test(expected=VerifcationInOrderFailed.class)
+    @Test(expected=VerifcationInOrderFailure.class)
     public void shouldFailOnFirstMethodBecauseOneInvocationWantedAgain() {
         inOrder.verify(mockOne, times(2)).simpleMethod(1);
     }
@@ -111,7 +111,7 @@ public void shouldFailOnSecondMethodBecauseFourInvocationsWanted() {
         try {
             inOrder.verify(mockTwo, times(4)).simpleMethod(2);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }
 
     @Test
@@ -120,7 +120,7 @@ public void shouldFailOnSecondMethodBecauseTwoInvocationsWantedAgain() {
         try {
             inOrder.verify(mockTwo, times(0)).simpleMethod(2);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }    
 
     @Test
@@ -132,7 +132,7 @@ public void shouldFailOnLastMethodBecauseOneInvocationWanted() {
         try {
             inOrder.verify(mockOne, times(0)).simpleMethod(4);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }
 
     @Test
@@ -144,7 +144,7 @@ public void shouldFailOnLastMethodBecauseOneInvocationWantedAgain() {
         try {
             inOrder.verify(mockOne, times(2)).simpleMethod(4);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }    
 
     /* ------------- */
@@ -165,7 +165,7 @@ public void shouldFailOnSecondMethodBecauseDifferentArgsWanted() {
         try {
             inOrder.verify(mockTwo, times(2)).simpleMethod(-999);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }
 
     @Test
@@ -174,7 +174,7 @@ public void shouldFailOnSecondMethodBecauseDifferentMethodWanted() {
         try {
             inOrder.verify(mockTwo, times(2)).oneArg(true);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }    
 
     @Test
@@ -186,7 +186,7 @@ public void shouldFailOnLastMethodBecauseDifferentArgsWanted() {
         try {
             inOrder.verify(mockOne).simpleMethod(-666);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }
 
     @Test
@@ -198,7 +198,7 @@ public void shouldFailOnLastMethodBecauseDifferentMethodWanted() {
         try {
             inOrder.verify(mockOne).oneArg(false);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }    
 
     /* -------------- */
@@ -209,7 +209,7 @@ public void shouldFailWhenLastMethodVerifiedFirst() {
         try {
             inOrder.verify(mockOne).simpleMethod(1);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }
 
     @Test
@@ -218,7 +218,7 @@ public void shouldFailWhenMiddleMethodVerifiedFirst() {
         try {
             inOrder.verify(mockOne).simpleMethod(1);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }
 
     @Test
@@ -227,7 +227,7 @@ public void shouldFailWhenMiddleMethodVerifiedFirstInAtLeastOnceMode() {
         try {
             inOrder.verify(mockOne).simpleMethod(1);
             fail();
-        } catch (VerifcationInOrderFailed e) {}
+        } catch (VerifcationInOrderFailure e) {}
     }
 
     @Test