summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Parkinson <ianp@google.com>2013-01-30 19:48:54 +0000
committerIan Parkinson <ianp@google.com>2013-01-30 19:48:54 +0000
commit1b0880635f5acf803bdb798c40aad60ea1206077 (patch)
tree16c2917d87b1e82828e395b9aa2c4702f418fea3
parente0ae5d7e87b1dd6e789803c1b9615a84bd7488b7 (diff)
downloadmockito-1b0880635f5acf803bdb798c40aad60ea1206077.tar.gz
Remove unused import in Mockito source code
Change-Id: I8e726e733e8570b16ed6c308e6537c68ee85fbad
-rw-r--r--CHANGES.android4
-rwxr-xr-xsrc/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java3
-rwxr-xr-xupdate_source.sh2
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGES.android b/CHANGES.android
new file mode 100644
index 0000000..302f6c6
--- /dev/null
+++ b/CHANGES.android
@@ -0,0 +1,4 @@
+One manual change is required after running update_source.sh:
+
+In src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java, remove
+the unused import org.mockito.internal.creation.jmock.ClassImposterizer.
diff --git a/src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java b/src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java
index c57c900..20168a4 100755
--- a/src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java
+++ b/src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java
@@ -8,7 +8,6 @@ import java.io.Serializable;
import org.mockito.internal.MockitoCore;
import org.mockito.internal.creation.MockSettingsImpl;
-import org.mockito.internal.creation.jmock.ClassImposterizer;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -34,4 +33,4 @@ public class ReturnsMocks implements Answer<Object>, Serializable {
return mockitoCore.mock(clazz, new MockSettingsImpl().defaultAnswer(this));
}
-} \ No newline at end of file
+}
diff --git a/update_source.sh b/update_source.sh
index f64bf87..bfe31f2 100755
--- a/update_source.sh
+++ b/update_source.sh
@@ -4,6 +4,8 @@
#
# Retrieves the current Mockito source code into the current direcory, exlcuding portions related
# to constructing Mock objects in the JVM.
+#
+# See also CHANGES.android for required manual changes to the Mockito source code.
SOURCE="git://github.com/mockito/mockito.git"
INCLUDE="