diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-11-28 11:18:24 +0100 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2014-11-28 15:12:40 +0100 |
| commit | 480700d449f6eaf0ce46e9e55a57e01bb186dc31 (patch) | |
| tree | 58e6c45d3b05e0a19f8082537033b32d0e0f50d6 /jack/tests | |
| parent | 298513d90d3f534dc2fc11201d33739b57d0a8ed (diff) | |
| download | toolchain_jack-480700d449f6eaf0ce46e9e55a57e01bb186dc31.zip toolchain_jack-480700d449f6eaf0ce46e9e55a57e01bb186dc31.tar.gz toolchain_jack-480700d449f6eaf0ce46e9e55a57e01bb186dc31.tar.bz2 | |
Clean FileType enum
- Add buildPropertyName, buildFileVPath and buildDirVPath methods
- Inline property key names directly into enum constructor
- Add description parameter into enum constructor
Change-Id: I7353d800269cfd80ec43ec88242bc2bc2c4446a0
Diffstat (limited to 'jack/tests')
| -rw-r--r-- | jack/tests/com/android/jack/errorhandling/JackFormatErrorTest.java | 6 | ||||
| -rw-r--r-- | jack/tests/com/android/jack/multidex/MultiDexTests.java | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/jack/tests/com/android/jack/errorhandling/JackFormatErrorTest.java b/jack/tests/com/android/jack/errorhandling/JackFormatErrorTest.java index 1460c5f..0cf9495 100644 --- a/jack/tests/com/android/jack/errorhandling/JackFormatErrorTest.java +++ b/jack/tests/com/android/jack/errorhandling/JackFormatErrorTest.java @@ -63,7 +63,7 @@ public class JackFormatErrorTest { + JackLibrary.KEY_LIB_EMITTER_VERSION + "=0\n" + JackLibrary.KEY_LIB_MAJOR_VERSION + "=" + Version.MAJOR + "\n" + JackLibrary.KEY_LIB_MINOR_VERSION + "=" + Version.MINOR + "\n" - + JayceProperties.KEY_JAYCE + "=true\n" + + FileType.JAYCE.buildPropertyName(null /*suffix*/) + "=true\n" + JayceProperties.KEY_JAYCE_MAJOR_VERSION + "=2\n" + JayceProperties.KEY_JAYCE_MINOR_VERSION + "=14\n"); @@ -108,7 +108,7 @@ public class JackFormatErrorTest { + JackLibrary.KEY_LIB_EMITTER_VERSION + "=0\n" + JackLibrary.KEY_LIB_MAJOR_VERSION + "=" + Version.MAJOR + "\n" + JackLibrary.KEY_LIB_MINOR_VERSION + "=" + Version.MINOR + "\n" - + JayceProperties.KEY_JAYCE + "=true\n" + + FileType.JAYCE.buildPropertyName(null /*suffix*/) + "=true\n" + JayceProperties.KEY_JAYCE_MAJOR_VERSION + "=2\n" + JayceProperties.KEY_JAYCE_MINOR_VERSION + "=14\n"); @@ -152,7 +152,7 @@ public class JackFormatErrorTest { + JackLibrary.KEY_LIB_EMITTER_VERSION + "=0\n" + JackLibrary.KEY_LIB_MAJOR_VERSION + "=" + Version.MAJOR + "\n" + JackLibrary.KEY_LIB_MINOR_VERSION + "=" + Version.MINOR + "\n" - + JayceProperties.KEY_JAYCE + "=true\n" + + FileType.JAYCE.buildPropertyName(null /*suffix*/) + "=true\n" + JayceProperties.KEY_JAYCE_MAJOR_VERSION + "=0\n" + JayceProperties.KEY_JAYCE_MINOR_VERSION + "=0\n"); diff --git a/jack/tests/com/android/jack/multidex/MultiDexTests.java b/jack/tests/com/android/jack/multidex/MultiDexTests.java index 20dfeec..9c89ee1 100644 --- a/jack/tests/com/android/jack/multidex/MultiDexTests.java +++ b/jack/tests/com/android/jack/multidex/MultiDexTests.java @@ -24,7 +24,6 @@ import com.android.jack.backend.dex.DexFileWriter; import com.android.jack.backend.dex.MultiDexLegacy; import com.android.jack.library.FileType; import com.android.jack.preprocessor.PreProcessor; -import com.android.jack.preprocessor.PreprocessorProperties; import com.android.jack.shrob.ListingComparator; import com.android.jack.util.ExecuteFile; @@ -273,7 +272,7 @@ public class MultiDexTests { } try { fos = new FileOutputStream(jackProperties); - libraryProperties.put(PreprocessorProperties.KEY_JPP, "true"); + libraryProperties.put(FileType.JPP.buildPropertyName(null /*suffix*/), "true"); libraryProperties.store(fos, "Library properties"); } catch (IOException e) { Assert.fail(); |