diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-04-25 18:40:35 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-04-25 18:40:35 +0200 |
| commit | 862a5e566a04d89fd6cad78f5a07b41e559b9834 (patch) | |
| tree | 1432a449afae3ff79bce713b379920cca9ae0e7d /jill | |
| parent | 15ffbfb6944429b985230461297268388c98f9da (diff) | |
| download | toolchain_jill-862a5e566a04d89fd6cad78f5a07b41e559b9834.tar.gz toolchain_jill-862a5e566a04d89fd6cad78f5a07b41e559b9834.tar.bz2 toolchain_jill-862a5e566a04d89fd6cad78f5a07b41e559b9834.zip | |
Restore changes lost during initial import.
Change-Id: I5eb7d49513f33da7a7a2ec94b070b9421778f915
Diffstat (limited to 'jill')
| -rw-r--r-- | jill/.settings/org.eclipse.jdt.core.prefs | 2 | ||||
| -rw-r--r-- | jill/MODULE_LICENSE_APACHE2 | 0 | ||||
| -rw-r--r-- | jill/tests/com/android/jill/shrob/ShrinkTest.java | 25 |
3 files changed, 21 insertions, 6 deletions
diff --git a/jill/.settings/org.eclipse.jdt.core.prefs b/jill/.settings/org.eclipse.jdt.core.prefs index 405f687..159ed4a 100644 --- a/jill/.settings/org.eclipse.jdt.core.prefs +++ b/jill/.settings/org.eclipse.jdt.core.prefs @@ -184,7 +184,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_header=false org.eclipse.jdt.core.formatter.comment.format_html=true org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true org.eclipse.jdt.core.formatter.comment.format_line_comments=true diff --git a/jill/MODULE_LICENSE_APACHE2 b/jill/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/jill/MODULE_LICENSE_APACHE2 diff --git a/jill/tests/com/android/jill/shrob/ShrinkTest.java b/jill/tests/com/android/jill/shrob/ShrinkTest.java index 1814b33..41a2219 100644 --- a/jill/tests/com/android/jill/shrob/ShrinkTest.java +++ b/jill/tests/com/android/jill/shrob/ShrinkTest.java @@ -52,18 +52,33 @@ public class ShrinkTest { } @Test - public void test27_001() throws Exception { + public void test3_001() throws Exception { File libzip = JillTestTools.createTempFile("lib", ".zip"); - JillTestTools.runJillToZip(JillTestTools.getJackTestLibFolder("shrob/test027"), libzip); - String testName = "shrob/test027"; + String testName = "shrob/test003"; File testFolder = JillTestTools.getJackTestFolder(testName); + JillTestTools.runJillToZip(JillTestTools.getJackTestLibFolder(testName), libzip); File refFolder = new File(testFolder, "refsShrinking"); ProguardFlags[] proguardflagsFiles = new ProguardFlags[] { dontObfuscateFlagFile, - new ProguardFlags(testFolder, "proguard.flags001"), + new ProguardFlags(testFolder, "proguard.flags001")}; + JillTestTools.checkListing(defaultBootclasspath, new File[] {libzip}, + JillTestTools.getJackTestsWithJackFolder(testName), proguardflagsFiles, + new File(refFolder, "expected-001.txt")); + } + + @Test + public void test3_002() throws Exception { + File libzip = JillTestTools.createTempFile("lib", ".zip"); + String testName = "shrob/test003"; + File testFolder = JillTestTools.getJackTestFolder(testName); + JillTestTools.runJillToZip(JillTestTools.getJackTestLibFolder(testName), libzip); + File refFolder = new File(testFolder, "refsShrinking"); + ProguardFlags[] proguardflagsFiles = new ProguardFlags[] { + dontObfuscateFlagFile, + new ProguardFlags(testFolder, "proguard.flags002"), generateInjars(libzip)}; JillTestTools.checkListing(defaultBootclasspath, null, JillTestTools.getJackTestsWithJackFolder(testName), proguardflagsFiles, - new File(refFolder, "expected-001.txt")); + new File(refFolder, "expected-002.txt")); } } |