summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2013-10-24 14:56:38 +0100
committerBrian Carlstrom <bdc@google.com>2014-01-28 12:29:36 -0800
commitc58f516a6bb1e97d4423620f9d7ca0ab5f0af8b0 (patch)
tree7403a641121a22430470b36d1032ef328918523b
parent1922306d33d16f143d5a01daebba4e2cb477d0f5 (diff)
downloadandroid-mock-c58f516a6bb1e97d4423620f9d7ca0ab5f0af8b0.tar.gz
Delete some pointless and invalid code.
These "convenience" methods are invalid because they all have the same erasure. They do not compile with java-7-openjdk. android-mock is used only by QuicksearchBoxGoogle (which I'm going to remove soon) and no new projects should use it. (They should use mockito instead) bug: 8992787 (cherry picked from commit 41cc67f9282657bfcf6ed2b565ee42ed7a40ee6c) Change-Id: I31dd6741037a73ff005d90b3a1e43eafa3e93558
-rw-r--r--src/com/google/android/testing/mocking/AndroidMock.java90
1 files changed, 0 insertions, 90 deletions
diff --git a/src/com/google/android/testing/mocking/AndroidMock.java b/src/com/google/android/testing/mocking/AndroidMock.java
index 88f79b1..8378c4e 100644
--- a/src/com/google/android/testing/mocking/AndroidMock.java
+++ b/src/com/google/android/testing/mocking/AndroidMock.java
@@ -2361,96 +2361,6 @@ public class AndroidMock {
}
/**
- * Expect any {@code int/Integer} as a parameter to the mocked method, but capture it for later
- * use.
- *
- * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
- * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
- *
- * @param captured a container to hold the captured value, retrieved by
- * {@link org.easymock.Capture#getValue()}
- * @return {@code 0}. The return value is always ignored.
- */
- public static int capture(Capture<Integer> captured) {
- return EasyMock.capture(captured);
- }
-
- /**
- * Expect any {@code long/Long} as a parameter to the mocked method, but capture it for later
- * use.
- *
- * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
- * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
- *
- * @param captured a container to hold the captured value, retrieved by
- * {@link org.easymock.Capture#getValue()}
- * @return {@code 0}. The return value is always ignored.
- */
- public static long capture(Capture<Long> captured) {
- return EasyMock.capture(captured);
- }
-
- /**
- * Expect any {@code float/Float} as a parameter to the mocked method, but capture it for later
- * use.
- *
- * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
- * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
- *
- * @param captured a container to hold the captured value, retrieved by
- * {@link org.easymock.Capture#getValue()}
- * @return {@code 0}. The return value is always ignored.
- */
- public static float capture(Capture<Float> captured) {
- return EasyMock.capture(captured);
- }
-
- /**
- * Expect any {@code double/Double} as a parameter to the mocked method, but capture it for later
- * use.
- *
- * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
- * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
- *
- * @param captured a container to hold the captured value, retrieved by
- * {@link org.easymock.Capture#getValue()}
- * @return {@code 0}. The return value is always ignored.
- */
- public static double capture(Capture<Double> captured) {
- return EasyMock.capture(captured);
- }
-
- /**
- * Expect any {@code byte/Byte} as a parameter to the mocked method, but capture it for later
- * use.
- *
- * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
- * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
- *
- * @param captured a container to hold the captured value, retrieved by
- * {@link org.easymock.Capture#getValue()}
- * @return {@code 0}
- */
- public static byte capture(Capture<Byte> captured) {
- return EasyMock.capture(captured);
- }
-
- /**
- * Expect any {@code char/Character} as a parameter to the mocked method, but capture it for later
- * use.
- *
- * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
- * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
- *
- * @param captured a container to hold the captured value, retrieved by
- * {@link org.easymock.Capture#getValue()}
- * @return {@code 0}
- */
- public static char capture(Capture<Character> captured) {
- return EasyMock.capture(captured);
- }
-
- /**
* Switches the given mock objects (more exactly: the controls of the mock
* objects) to replay mode.
*