diff options
| author | Luis Sigal <luissigal@google.com> | 2011-03-10 12:25:13 +0000 |
|---|---|---|
| committer | Luis Sigal <luissigal@google.com> | 2011-03-10 12:32:43 +0000 |
| commit | 40bb73886c61d4b2e96bab98b50c1cbfcb54d9a3 (patch) | |
| tree | a86033a5b9ed8cecff0964b7ec378fac0b38c4c0 /src | |
| parent | f94b49ef86229503a9af53381a9543ed2c8799dc (diff) | |
| download | android_external_android-mock-40bb73886c61d4b2e96bab98b50c1cbfcb54d9a3.tar.gz android_external_android-mock-40bb73886c61d4b2e96bab98b50c1cbfcb54d9a3.tar.bz2 android_external_android-mock-40bb73886c61d4b2e96bab98b50c1cbfcb54d9a3.zip | |
Update AndroidMock with version that supports SDK 9.jellybean-stablejellybean
This is a simple export from the upstream repo.
Change-Id: I3b9d49116adb0089352357189c08a7b8f359814d
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-framework-gen.xml | 2 | ||||
| -rw-r--r-- | src/com/google/android/testing/mocking/FileUtils.java | 4 | ||||
| -rw-r--r-- | src/com/google/android/testing/mocking/SdkVersion.java | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/build-framework-gen.xml b/src/build-framework-gen.xml index c23ba7e..674ab30 100644 --- a/src/build-framework-gen.xml +++ b/src/build-framework-gen.xml @@ -14,6 +14,7 @@ <property name="android-201-jar" value="android_v201.jar"/> <property name="android-21-jar" value="android_v21.jar"/> <property name="android-22-jar" value="android_v22.jar"/> + <property name="android-23-jar" value="android_v23.jar"/> <!-- property name="framework.mock-bin" value=see build.properties --> <!-- property name="framework.mock-jar" value=see build.properties --> @@ -43,6 +44,7 @@ <generate-framework-mocks api-jar-file="${android-201-jar}" api-level="6"/> <generate-framework-mocks api-jar-file="${android-21-jar}" api-level="7"/> <generate-framework-mocks api-jar-file="${android-22-jar}" api-level="8"/> + <generate-framework-mocks api-jar-file="${android-23-jar}" api-level="9"/> <jar destfile="${framework.mock-bin}/${framework.mock-jar}" basedir="${framework.mock-staging}" includes="**/*.class" index="true"/> </target> diff --git a/src/com/google/android/testing/mocking/FileUtils.java b/src/com/google/android/testing/mocking/FileUtils.java index f759c57..b03a2c5 100644 --- a/src/com/google/android/testing/mocking/FileUtils.java +++ b/src/com/google/android/testing/mocking/FileUtils.java @@ -62,7 +62,9 @@ public class FileUtils { if (!filename.endsWith(".class")) { throw new IllegalArgumentException("Argument provided is not a class filename: " + filename); } - return filename.replace(File.separatorChar, '.').substring(0, filename.length() - 6); + // On non-Linux, files use the native separator, but jar entries use /... sigh + return filename.replace(File.separatorChar, '.').replace('/', '.') + .substring(0, filename.length() - 6); } static void saveClassToFolder(GeneratedClassFile clazz, String outputFolderName) diff --git a/src/com/google/android/testing/mocking/SdkVersion.java b/src/com/google/android/testing/mocking/SdkVersion.java index ee61707..ed1424b 100644 --- a/src/com/google/android/testing/mocking/SdkVersion.java +++ b/src/com/google/android/testing/mocking/SdkVersion.java @@ -27,7 +27,7 @@ import java.util.List; */ public enum SdkVersion { UNKNOWN("", -1), CUPCAKE("v15", 3), DONUT("v16", 4), ECLAIR_0_1("v201", 6), - ECLAIR_MR1("v21", 7), FROYO("v22", 8); + ECLAIR_MR1("v21", 7), FROYO("v22", 8), GINGERBREAD("v23", 9); private static final int SDK_VERSION; |