summaryrefslogtreecommitdiffstats
path: root/jack-tests
diff options
context:
space:
mode:
Diffstat (limited to 'jack-tests')
-rw-r--r--jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java126
-rw-r--r--jack-tests/tests/com/android/jack/imports/ImportTests.java33
-rw-r--r--jack-tests/tests/com/android/jack/library/LibraryTests.java3
-rw-r--r--jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java93
-rw-r--r--jack-tests/tests/com/android/jack/shrob/test043/refsObfuscationWithoutMapping/expected-001.txt4
5 files changed, 149 insertions, 110 deletions
diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
index 20ef80e..451a030 100644
--- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
+++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
@@ -17,10 +17,12 @@
package com.android.jack.fileconflict;
-import com.android.jack.backend.jayce.ImportConflictException;
+import com.android.jack.JackAbortException;
import com.android.jack.backend.jayce.JayceFileImporter;
+import com.android.jack.backend.jayce.TypeImportConflictException;
import com.android.jack.library.FileType;
import com.android.jack.library.JackLibrary;
+import com.android.jack.library.LibraryReadingException;
import com.android.jack.resource.ResourceImportConflictException;
import com.android.jack.resource.ResourceImporter;
import com.android.jack.shrob.obfuscation.NameProviderFactory;
@@ -41,6 +43,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -49,6 +52,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
+import java.io.OutputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -125,10 +129,17 @@ public class FileConflictTests {
@Test
public void test001a() throws Exception {
File jackOutput = AbstractTestTools.createTempDir();
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
try {
- runTest001(jackOutput, null, /* isApiTest = */ true);
+ runTest001(jackOutput, null, errOut, /* isApiTest = */ true);
Assert.fail();
- } catch (ImportConflictException e) {
+ } catch (JackAbortException e) {
+ Assert.assertTrue(e.getCause() instanceof LibraryReadingException);
+ Assert.assertTrue(e.getCause().getCause() instanceof TypeImportConflictException);
+ String errString = errOut.toString();
+ Assert.assertTrue(
+ errString.contains("Type com.android.jack.fileconflict.test001.jack.MyClass"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
}
@@ -140,10 +151,17 @@ public class FileConflictTests {
@Test
public void test001b() throws Exception {
File jackOutput = AbstractTestTools.createTempDir();
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
try {
- runTest001(jackOutput, "fail", /* isApiTest = */ true);
+ runTest001(jackOutput, "fail", errOut, /* isApiTest = */ true);
Assert.fail();
- } catch (ImportConflictException e) {
+ } catch (JackAbortException e) {
+ Assert.assertTrue(e.getCause() instanceof LibraryReadingException);
+ Assert.assertTrue(e.getCause().getCause() instanceof TypeImportConflictException);
+ String errString = errOut.toString();
+ Assert.assertTrue(
+ errString.contains("Type com.android.jack.fileconflict.test001.jack.MyClass"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
}
@@ -155,13 +173,22 @@ public class FileConflictTests {
@Test
public void test001c() throws Exception {
File jackOutput = AbstractTestTools.createTempDir();
- runTest001(jackOutput, "keep-first", /* isApiTest = */ false);
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
+ runTest001(jackOutput, "keep-first", errOut /* errorStream */, /* isApiTest = */ false);
File myClass1 = new File(jackOutput, JACK_FILE_PATH_1);
File myClass2 = new File(jackOutput, JACK_FILE_PATH_2);
File myClass3 = new File(jackOutput, JACK_FILE_PATH_3);
Assert.assertTrue(myClass1.exists());
Assert.assertTrue(myClass2.exists());
Assert.assertTrue(myClass3.exists());
+ String errString = errOut.toString();
+ Assert.assertTrue(
+ errString.contains("Type com.android.jack.fileconflict.test001.jack.MyClass"));
+ Assert.assertTrue(
+ errString.contains("Type com.android.jack.fileconflict.test001.jack.MyClass2"));
+ Assert.assertTrue(
+ errString.contains("Type com.android.jack.fileconflict.test001.jack.MyClass3"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
/**
@@ -172,10 +199,17 @@ public class FileConflictTests {
@Test
public void test002a() throws Exception {
File jackOutput;
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
try {
- jackOutput = runTest002(false /* non-zipped */, null, /* isApiTest = */ true);
+ jackOutput = runTest002(false /* non-zipped */, null /* collisionPolicy */, errOut, /* isApiTest = */ true);
Assert.fail();
- } catch (ResourceImportConflictException e) {
+ } catch (JackAbortException e) {
+ Assert.assertTrue(e.getCause() instanceof LibraryReadingException);
+ Assert.assertTrue(e.getCause().getCause() instanceof ResourceImportConflictException);
+ String errString = errOut.toString();
+ Assert.assertTrue(errString.contains("Resource in"));
+ Assert.assertTrue(errString.contains("rsc/Resource1"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
}
@@ -187,10 +221,17 @@ public class FileConflictTests {
@Test
public void test002b() throws Exception {
File jackOutput;
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
try {
- jackOutput = runTest002(false /* non-zipped */, "fail", /* isApiTest = */ true);
+ jackOutput = runTest002(false /* non-zipped */, "fail", errOut, /* isApiTest = */ true);
Assert.fail();
- } catch (ResourceImportConflictException e) {
+ } catch (JackAbortException e) {
+ Assert.assertTrue(e.getCause() instanceof LibraryReadingException);
+ Assert.assertTrue(e.getCause().getCause() instanceof ResourceImportConflictException);
+ String errString = errOut.toString();
+ Assert.assertTrue(errString.contains("Resource in"));
+ Assert.assertTrue(errString.contains("rsc/Resource1"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
}
@@ -202,10 +243,15 @@ public class FileConflictTests {
@Test
public void test002c() throws Exception {
File jackOutput;
- jackOutput = runTest002(false /* non-zipped */, "keep-first", /* isApiTest = */ false);
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
+ jackOutput = runTest002(false /* non-zipped */, "keep-first", errOut, /* isApiTest = */ false);
checkResourceContent(jackOutput, RESOURCE1_LONGPATH, "Res1");
checkResourceContent(jackOutput, RESOURCE2_LONGPATH, "Res2");
checkResourceContent(jackOutput, RESOURCE3_LONGPATH, "Res3");
+ String errString = errOut.toString();
+ Assert.assertTrue(errString.contains("Resource in"));
+ Assert.assertTrue(errString.contains("rsc/Resource1"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
/**
@@ -216,10 +262,17 @@ public class FileConflictTests {
@Test
public void test002d() throws Exception {
File jackOutput;
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
try {
- jackOutput = runTest002(true /* zipped */, null, /* isApiTest = */ true);
+ jackOutput = runTest002(true /* zipped */, null, errOut, /* isApiTest = */ true);
Assert.fail();
- } catch (ResourceImportConflictException e) {
+ } catch (JackAbortException e) {
+ Assert.assertTrue(e.getCause() instanceof LibraryReadingException);
+ Assert.assertTrue(e.getCause().getCause() instanceof ResourceImportConflictException);
+ String errString = errOut.toString();
+ Assert.assertTrue(errString.contains("Resource in"));
+ Assert.assertTrue(errString.contains("rsc/Resource1"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
}
@@ -231,10 +284,17 @@ public class FileConflictTests {
@Test
public void test002e() throws Exception {
File jackOutput;
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
try {
- jackOutput = runTest002(true /* zipped */, "fail", /* isApiTest = */ true);
+ jackOutput = runTest002(true /* zipped */, "fail", errOut, /* isApiTest = */ true);
Assert.fail();
- } catch (ResourceImportConflictException e) {
+ } catch (JackAbortException e) {
+ Assert.assertTrue(e.getCause() instanceof LibraryReadingException);
+ Assert.assertTrue(e.getCause().getCause() instanceof ResourceImportConflictException);
+ String errString = errOut.toString();
+ Assert.assertTrue(errString.contains("Resource in"));
+ Assert.assertTrue(errString.contains("rsc/Resource1"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
}
@@ -246,11 +306,16 @@ public class FileConflictTests {
@Test
public void test002f() throws Exception {
File jackOutput;
- jackOutput = runTest002(true /* zipped */, "keep-first", /* isApiTest = */ false);
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
+ jackOutput = runTest002(true /* zipped */, "keep-first", errOut, /* isApiTest = */ false);
ZipFile zipFile = new ZipFile(jackOutput);
checkResourceContent(zipFile, RESOURCE1_LONGPATH, "Res1");
checkResourceContent(zipFile, RESOURCE2_LONGPATH, "Res2");
checkResourceContent(zipFile, RESOURCE3_LONGPATH, "Res3");
+ String errString = errOut.toString();
+ Assert.assertTrue(errString.contains("Resource in"));
+ Assert.assertTrue(errString.contains("rsc/Resource1"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
/**
@@ -390,7 +455,6 @@ public class FileConflictTests {
copyFileToDir(libProperties, libPropName, jackImport1);
copyFileToDir(myClass1, jackFilePath, jackImport1);
copyFileToDir(resource, "com/android/jack/fileconflict/test004/jack/MyClass.txt", jackImport1);
- System.out.println(jackImport1.getAbsolutePath());
// copy a different resource to output dir with the same name
File resource2 = new File(testSrcDir, "a.txt");
@@ -417,14 +481,16 @@ public class FileConflictTests {
}
private void runTest001(@Nonnull File jackOutput, @CheckForNull String collisionPolicy,
- boolean isApiTest) throws Exception {
+ @CheckForNull OutputStream errorStream, boolean isApiTest) throws Exception {
// compile source files to a Jack dir
File tempJackFolder = AbstractTestTools.createTempDir();
JackBasedToolchain toolchain = getToolchain(isApiTest);
- toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
- .srcToLib(
+ if (errorStream != null) {
+ toolchain.setErrorStream(errorStream);
+ }
+ toolchain.addToClasspath(toolchain.getDefaultBootClasspath()).srcToLib(
tempJackFolder,
/* zipFile = */ false,
TEST001_DIR);
@@ -466,11 +532,14 @@ public class FileConflictTests {
if (collisionPolicy != null) {
toolchain.addProperty(JayceFileImporter.COLLISION_POLICY.getName(), collisionPolicy);
}
+ if (errorStream != null) {
+ toolchain.setErrorStream(errorStream);
+ }
toolchain.libToLib(new File [] {jackImport1, jackImport2}, jackOutput, /* zipFiles = */ false);
}
@Nonnull
- private File runTest002(boolean zip, @CheckForNull String collisionPolicy, boolean isApiTest)
+ private File runTest002(boolean zip, @CheckForNull String collisionPolicy, @CheckForNull OutputStream errorStream, boolean isApiTest)
throws Exception {
// compile source files to a Jack dir
File jackImport1 = AbstractTestTools.createTempDir();
@@ -478,8 +547,10 @@ public class FileConflictTests {
JackBasedToolchain toolchain = getToolchain(isApiTest);
toolchain.addResource(new File(lib1, "rsc"));
- toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
- .srcToLib(
+ if (errorStream != null) {
+ toolchain.setErrorStream(errorStream);
+ }
+ toolchain.addToClasspath(toolchain.getDefaultBootClasspath()).srcToLib(
jackImport1,
/* zipFiles = */ false,
lib1);
@@ -488,8 +559,10 @@ public class FileConflictTests {
File lib2 = new File(TEST002_DIR, "lib2");
toolchain = getToolchain(isApiTest);
toolchain.addResource(new File(lib2, "rsc"));
- toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
- .srcToLib(
+ if (errorStream != null) {
+ toolchain.setErrorStream(errorStream);
+ }
+ toolchain.addToClasspath(toolchain.getDefaultBootClasspath()).srcToLib(
jackImport2,
/* zipFiles = */ false,
lib2);
@@ -506,6 +579,9 @@ public class FileConflictTests {
} else {
jackOutput = AbstractTestTools.createTempDir();
}
+ if (errorStream != null) {
+ toolchain.setErrorStream(errorStream);
+ }
toolchain.libToLib(new File[] {jackImport1,jackImport2}, jackOutput, /* zipFiles = */ zip);
return jackOutput;
diff --git a/jack-tests/tests/com/android/jack/imports/ImportTests.java b/jack-tests/tests/com/android/jack/imports/ImportTests.java
index f0a3c0c..3b508cf 100644
--- a/jack-tests/tests/com/android/jack/imports/ImportTests.java
+++ b/jack-tests/tests/com/android/jack/imports/ImportTests.java
@@ -16,9 +16,10 @@
package com.android.jack.imports;
-import com.android.jack.backend.jayce.ImportConflictException;
+import com.android.jack.JackAbortException;
import com.android.jack.backend.jayce.JayceFileImporter;
import com.android.jack.backend.jayce.TypeImportConflictException;
+import com.android.jack.library.LibraryReadingException;
import com.android.jack.test.toolchain.AbstractTestTools;
import com.android.jack.test.toolchain.IToolchain;
import com.android.jack.test.toolchain.JackApiToolchain;
@@ -29,6 +30,7 @@ import junit.framework.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import java.io.ByteArrayOutputStream;
import java.io.File;
public class ImportTests {
@@ -69,6 +71,9 @@ public class ImportTests {
toolchain = AbstractTestTools.getCandidateToolchain();
toolchain.addStaticLibs(jackOut);
+
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
+ toolchain.setErrorStream(errOut);
try {
toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
.srcToExe(
@@ -76,8 +81,13 @@ public class ImportTests {
/* zipFile = */ false,
AbstractTestTools.getTestRootDir("com.android.jack.fibonacci.test001.jack"));
Assert.fail();
- } catch (ImportConflictException e) {
+ } catch (JackAbortException e) {
// expected
+ Assert.assertTrue(e.getCause() instanceof LibraryReadingException);
+ Assert.assertTrue(e.getCause().getCause() instanceof TypeImportConflictException);
+ String errString = errOut.toString();
+ Assert.assertTrue(errString.contains("Type com.android.jack.fibonacci.test001.jack.Fibo"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
}
@@ -120,6 +130,9 @@ public class ImportTests {
// import twice the same lib
toolchain.addStaticLibs(lib, lib);
toolchain.addProperty(JayceFileImporter.COLLISION_POLICY.getName(), "fail");
+
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
+ toolchain.setErrorStream(errOut);
try {
toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
.srcToExe(
@@ -127,8 +140,13 @@ public class ImportTests {
/* zipFile = */ true,
AbstractTestTools.getTestRootDir(testName + ".jack"));
Assert.fail();
- } catch (TypeImportConflictException e) {
+ } catch (JackAbortException e) {
// Exception is ok
+ Assert.assertTrue(e.getCause() instanceof LibraryReadingException);
+ Assert.assertTrue(e.getCause().getCause() instanceof TypeImportConflictException);
+ String errString = errOut.toString();
+ Assert.assertTrue(errString.contains("Type com.android.jack.inner.test015.lib.A"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
}
@@ -158,6 +176,8 @@ public class ImportTests {
toolchain.addStaticLibs(lib1, lib2);
toolchain.addProperty(JayceFileImporter.COLLISION_POLICY.getName(), "fail");
+ ByteArrayOutputStream errOut = new ByteArrayOutputStream();
+ toolchain.setErrorStream(errOut);
try {
toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
.srcToExe(
@@ -165,8 +185,13 @@ public class ImportTests {
/* zipFile = */ true,
AbstractTestTools.getTestRootDir(testName + ".jack"));
Assert.fail();
- } catch (TypeImportConflictException e) {
+ } catch (JackAbortException e) {
// Exception is ok
+ Assert.assertTrue(e.getCause() instanceof LibraryReadingException);
+ Assert.assertTrue(e.getCause().getCause() instanceof TypeImportConflictException);
+ String errString = errOut.toString();
+ Assert.assertTrue(errString.contains("Type com.android.jack.inner.test015.lib.A"));
+ Assert.assertTrue(errString.contains("has already been imported"));
}
}
}
diff --git a/jack-tests/tests/com/android/jack/library/LibraryTests.java b/jack-tests/tests/com/android/jack/library/LibraryTests.java
index 65deb4a..1ec0024 100644
--- a/jack-tests/tests/com/android/jack/library/LibraryTests.java
+++ b/jack-tests/tests/com/android/jack/library/LibraryTests.java
@@ -21,13 +21,10 @@ import com.android.jack.test.toolchain.AndroidToolchain;
import com.android.jack.test.toolchain.IToolchain;
import com.android.jack.test.toolchain.JackBasedToolchain;
import com.android.jack.test.toolchain.JackCliToolchain;
-import com.android.jack.test.toolchain.LegacyJillToolchain;
import com.android.sched.util.RunnableHooks;
import com.android.sched.util.file.FileOrDirectory.ChangePermission;
import com.android.sched.util.file.FileOrDirectory.Existence;
import com.android.sched.util.file.InputZipFile;
-import com.android.sched.vfs.InputVFS;
-import com.android.sched.vfs.InputZipVFS;
import com.android.sched.vfs.ReadZipFS;
import com.android.sched.vfs.VFS;
diff --git a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java
index 065decf..77bf6d0 100644
--- a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java
@@ -17,10 +17,10 @@
package com.android.jack.shrob;
import com.android.jack.Options;
-import com.android.jack.test.category.KnownBugs;
import com.android.jack.shrob.obfuscation.NameProviderFactory;
import com.android.jack.shrob.proguard.GrammarActions;
import com.android.jack.shrob.spec.Flags;
+import com.android.jack.test.category.KnownBugs;
import com.android.jack.test.comparator.ComparatorMapping;
import com.android.jack.test.helper.SourceToDexComparisonTestHelper;
import com.android.jack.test.toolchain.AbstractTestTools;
@@ -36,12 +36,23 @@ import javax.annotation.Nonnull;
public class ObfuscationWithoutMappingTests extends AbstractTest {
+
+
@Override
protected void runTest(
@Nonnull String testNumber,
@Nonnull String flagNumber,
@Nonnull String mappingNumber)
throws Exception {
+ runTest(testNumber, flagNumber, mappingNumber, "rot13");
+ }
+
+ protected void runTest(
+ @Nonnull String testNumber,
+ @Nonnull String flagNumber,
+ @Nonnull String mappingNumber,
+ @Nonnull String nameProvider)
+ throws Exception {
String testPackageName = "com.android.jack.shrob.test" + testNumber;
File testFolder = AbstractTestTools.getTestRootDir(testPackageName);
@@ -52,7 +63,7 @@ public class ObfuscationWithoutMappingTests extends AbstractTest {
GrammarActions.parse("proguard.flags" + flagNumber, testFolder.getAbsolutePath(), flags);
File refFolder = new File(testFolder, "refsObfuscationWithoutMapping");
- toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13");
+ toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), nameProvider);
toolchain.addProperty(Options.METHOD_FILTER.getName(), "supported-methods");
File candidateOutputMapping = AbstractTestTools.createTempFile("mapping", ".txt");
@@ -67,53 +78,6 @@ public class ObfuscationWithoutMappingTests extends AbstractTest {
env.setReferenceTestTools(new DummyToolchain());
env.runTest(new ComparatorMapping(candidateOutputMapping, refOutputMapping));
-
- // // ==============================================================
-
- /*
- * Comment for reviewers: the following code is an attempt to use jack based toolchain.
- * It works, but requires to manipulate (copy, write...) shrob flags.
- * Here I added a shrob option manually, but ideally to be able to use
- * a Flags like object for CLI based toochains, we must be able to dump
- * the flags as a file (TBD). Plus, if flags have "-include" directives with relative
- * paths, files must be in the same location.
- */
-
-//
-// String testName = "shrob/test" + testNumber;
-// File testFolder = TestTools.getJackTestFolder(testName);
-// File refFolder = new File(testFolder, "refsObfuscationWithoutMapping");
-//
-// JackBasedToolchain jackToolchain = AbstractTestTools.getJackBasedToolchainAsCandidate();
-//
-// jackToolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13");
-// jackToolchain.addProperty(Options.METHOD_FILTER.getName(), "supported-methods");
-//
-// File candidateOutputMapping = TestTools.createTempFile("mapping", ".txt");
-// File refOutputMapping = new File(refFolder, "expected-" + flagNumber + ".txt");
-//
-// jackToolchain.getCompilationResult().proguardMappingFile = candidateOutputMapping;
-//
-// // TODO(jmhenaff): having to seems like a no go for JackBasedToolchain (i.e. cli)
-// File candidateFlags = new File(testFolder.getAbsolutePath(), "tmp-proguard.flags" + flagNumber);
-// candidateFlags.deleteOnExit();
-// appendStringToFileCopy(new File(testFolder.getAbsolutePath(), "proguard.flags" + flagNumber),
-// candidateFlags, "-printmapping " + candidateOutputMapping.getAbsolutePath());
-//
-// SourceToDexComparisonTestEnv env = new SourceToDexComparisonTestEnv(bootclasspath, classpath,
-// TestTools.getJackTestsWithJackFolder(testName));
-//
-// env.setProguardFlags(new ProguardFlags[] {new ProguardFlags(candidateFlags)});
-//
-// CompilationResult compilationResult = new CompilationResult();
-// compilationResult.proguardMappingFile = refOutputMapping;
-//
-// env.setCandidateTestTools(jackToolchain);
-// env.setReferenceTestTools(new DummyTestTools(compilationResult));
-//
-// env.addComparator(env.createMappingComparator());
-// env.compare();
-
}
@Override
@@ -138,33 +102,10 @@ public class ObfuscationWithoutMappingTests extends AbstractTest {
}
@Test
- @Category(KnownBugs.class)
public void test43_001() throws Exception {
- runTest("043", "001", "");
+ /* Use "lower-case" name provider because a rot13 has invalid behavior on sources that would
+ * allow to reproduce the problem. Using "lower-case" makes it a very fragile test anyway
+ */
+ runTest("043", "001", "", "lower-case");
}
-
-// private void appendStringToFileCopy(File source, File dest, String appended) throws IOException {
-// BufferedReader reader = null;
-// BufferedWriter writer = null;
-// try {
-// reader = new BufferedReader(new FileReader(source));
-// writer = new BufferedWriter(new FileWriter(dest));
-// String line;
-// while ((line = reader.readLine()) != null) {
-// writer.write(line);
-// writer.write("\n");
-// }
-// writer.write(appended);
-// } finally {
-// try {
-// reader.close();
-// } catch (IOException e) {
-// }
-// try {
-// writer.close();
-// } catch (IOException e) {
-// }
-// }
-// }
-
}
diff --git a/jack-tests/tests/com/android/jack/shrob/test043/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test043/refsObfuscationWithoutMapping/expected-001.txt
index 8f11a51..5725166 100644
--- a/jack-tests/tests/com/android/jack/shrob/test043/refsObfuscationWithoutMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test043/refsObfuscationWithoutMapping/expected-001.txt
@@ -1,4 +1,4 @@
-com.android.jack.shrob.test043.jack.packb.ClassA1 -> com.android.jack.shrob.test043.jack.PynggN1:
+com.android.jack.shrob.test043.jack.packa.ClassA1 -> com.android.jack.shrob.test043.jack.a:
void <init>() -> <init>
-com.android.jack.shrob.test043.jack.packa.ClassA1 -> com.android.jack.shrob.test043.jack.PynggN1:
+com.android.jack.shrob.test043.jack.packb.ClassA1 -> com.android.jack.shrob.test043.jack.b:
void <init>() -> <init>