From d36b0660074a2564c17b9a78dad1e97a58085aac Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Sun, 1 Mar 2015 21:56:40 -0800 Subject: [PATCH] Simplify how the accessorTest is built and run Conflicts: brut.apktool.smali/dexlib2/build.gradle brut.apktool.smali/dexlib2/src/accessorTest/java/org/jf/dexlib2/AccessorTest.java dexlib2/src/accessorTest/java/org/jf/dexlib2/AccessorTest.java dexlib2/src/test/java/org/jf/dexlib2/AccessorTest.java --- brut.apktool.smali/dexlib2/build.gradle | 73 ++++------ .../java/org/jf/dexlib2/AccessorTest.java | 133 ++++++++++++++++++ 2 files changed, 160 insertions(+), 46 deletions(-) create mode 100644 brut.apktool.smali/dexlib2/src/test/java/org/jf/dexlib2/AccessorTest.java diff --git a/brut.apktool.smali/dexlib2/build.gradle b/brut.apktool.smali/dexlib2/build.gradle index e956b7d7..ad55d461 100644 --- a/brut.apktool.smali/dexlib2/build.gradle +++ b/brut.apktool.smali/dexlib2/build.gradle @@ -46,37 +46,6 @@ dependencies { ext.testAccessorOutputDir = file("${buildDir}/generated-accessor-test-sources") ext.testAccessorOutputFile = file("${buildDir}/generated-accessor-test-sources/org/jf/dexlib2/AccessorTypes.java") -sourceSets { - // The sources for building the test dex file for the accessor test - accessorTestDex { - java { - srcDir testAccessorOutputDir - } - } - - // The sources for the accessor test itself - accessorTest { - java { - compileClasspath += main.output - runtimeClasspath += main.output - } - } -} - -configurations { - accessorTestDexCompile.extendsFrom compile - accessorTestDexRuntime.extendsFrom runtime - - accessorTestCompile.extendsFrom testCompile - accessorTestRuntime.extendsFrom testRuntime -} - -idea { - module { - testSourceDirs += sourceSets.accessorTest.java.srcDirs - } -} - // You must manually execute this task to regenerate SyntheticAccessorFSM.java, after modifying the ragel file // e.g. ./gradlew ragel task ragel(type:Exec) { @@ -87,33 +56,45 @@ task ragel(type:Exec) { } task generateAccessorTestSource(type: JavaExec) { - outputs.dir file(testAccessorOutputDir) + doFirst { + file(testAccessorOutputFile.parent).mkdirs() + } - mkdir(file(testAccessorOutputFile).parent) + outputs.dir file(testAccessorOutputDir) + sourceSets['test'].java.srcDir file(testAccessorOutputDir) classpath = configurations.accessorTestGenerator main = 'org.jf.dexlib2.AccessorTestGenerator' args testAccessorOutputFile } -compileAccessorTestDexJava.dependsOn(generateAccessorTestSource) +compileTestJava.dependsOn generateAccessorTestSource -task generateAccessorTestDex(type: Exec, dependsOn: compileAccessorTestDexJava) { - def outputDex = file("${sourceSets.accessorTest.output.resourcesDir}/accessorTest.dex") - mkdir(outputDex.parent) +task generateAccessorTestDex(type: Exec, dependsOn: compileTestJava) { + def outputDex = file(new File(sourceSets.test.output.resourcesDir, 'accessorTest.dex')) - inputs.dir project.sourceSets.accessorTestDex.output.classesDir + doFirst { + file(outputDex.parent).mkdirs() + } + + inputs.dir(project.sourceSets.test.output.classesDir) outputs.file outputDex - sourceSets.accessorTest.resources - - workingDir project.sourceSets.accessorTestDex.output.classesDir + workingDir project.sourceSets.test.output.classesDir executable 'dx' args '--dex' + args '--no-strict' args "--output=${outputDex}" - args '.' + + doFirst { + // this has to be done in doFirst, so that the generated classes will be available. + // otherwise, it the tree will be populated while the build is being configured, + // which is before the compileTestJava has run + fileTree(project.sourceSets.test.output.classesDir) { + include 'org/jf/dexlib2/AccessorTypes*.class' + }.each { File file -> + args file + } + } } -task accessorTest(type: Test, dependsOn: generateAccessorTestDex) { - testClassesDir = project.sourceSets.accessorTest.output.classesDir - classpath = project.sourceSets.accessorTest.runtimeClasspath -} +test.dependsOn generateAccessorTestDex \ No newline at end of file diff --git a/brut.apktool.smali/dexlib2/src/test/java/org/jf/dexlib2/AccessorTest.java b/brut.apktool.smali/dexlib2/src/test/java/org/jf/dexlib2/AccessorTest.java new file mode 100644 index 00000000..13e7b30f --- /dev/null +++ b/brut.apktool.smali/dexlib2/src/test/java/org/jf/dexlib2/AccessorTest.java @@ -0,0 +1,133 @@ +/* + * Copyright 2012, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.jf.dexlib2; + +import com.google.common.collect.ImmutableMap; +import junit.framework.Assert; +import org.jf.dexlib2.iface.ClassDef; +import org.jf.dexlib2.iface.DexFile; +import org.jf.dexlib2.iface.Method; +import org.jf.dexlib2.iface.MethodImplementation; +import org.jf.dexlib2.iface.instruction.Instruction; +import org.jf.dexlib2.iface.instruction.ReferenceInstruction; +import org.jf.dexlib2.iface.reference.FieldReference; +import org.jf.dexlib2.iface.reference.MethodReference; +import org.jf.dexlib2.util.SyntheticAccessorResolver; +import org.junit.Test; + +import java.io.IOException; +import java.net.URL; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class AccessorTest { + private Pattern accessorMethodPattern = Pattern.compile("([a-zA-Z]*)_([a-zA-Z]*)"); + + private static final Map operationTypes; + + static { + ImmutableMap.Builder builder = ImmutableMap.builder(); + builder.put("postinc", SyntheticAccessorResolver.POSTFIX_INCREMENT); + builder.put("preinc", SyntheticAccessorResolver.PREFIX_INCREMENT); + builder.put("postdec", SyntheticAccessorResolver.POSTFIX_DECREMENT); + builder.put("predec", SyntheticAccessorResolver.PREFIX_DECREMENT); + builder.put("add", SyntheticAccessorResolver.ADD_ASSIGNMENT); + builder.put("sub", SyntheticAccessorResolver.SUB_ASSIGNMENT); + builder.put("mul", SyntheticAccessorResolver.MUL_ASSIGNMENT); + builder.put("div", SyntheticAccessorResolver.DIV_ASSIGNMENT); + builder.put("rem", SyntheticAccessorResolver.REM_ASSIGNMENT); + builder.put("and", SyntheticAccessorResolver.AND_ASSIGNMENT); + builder.put("or", SyntheticAccessorResolver.OR_ASSIGNMENT); + builder.put("xor", SyntheticAccessorResolver.XOR_ASSIGNMENT); + builder.put("shl", SyntheticAccessorResolver.SHL_ASSIGNMENT); + builder.put("shr", SyntheticAccessorResolver.SHR_ASSIGNMENT); + builder.put("ushr", SyntheticAccessorResolver.USHR_ASSIGNMENT); + operationTypes = builder.build(); + } + + @Test + public void testAccessors() throws IOException { + URL url = AccessorTest.class.getClassLoader().getResource("accessorTest.dex"); + Assert.assertNotNull(url); + DexFile f = DexFileFactory.loadDexFile(url.getFile(), 15); + + SyntheticAccessorResolver sar = new SyntheticAccessorResolver(f.getClasses()); + + ClassDef accessorTypesClass = null; + ClassDef accessorsClass = null; + + for (ClassDef classDef: f.getClasses()) { + String className = classDef.getType(); + + if (className.equals("Lorg/jf/dexlib2/AccessorTypes;")) { + accessorTypesClass = classDef; + } else if (className.equals("Lorg/jf/dexlib2/AccessorTypes$Accessors;")) { + accessorsClass = classDef; + } + } + + Assert.assertNotNull(accessorTypesClass); + Assert.assertNotNull(accessorsClass); + + for (Method method: accessorsClass.getMethods()) { + Matcher m = accessorMethodPattern.matcher(method.getName()); + if (!m.matches()) { + continue; + } + String type = m.group(1); + String operation = m.group(2); + + MethodImplementation methodImpl = method.getImplementation(); + Assert.assertNotNull(methodImpl); + + for (Instruction instruction: methodImpl.getInstructions()) { + Opcode opcode = instruction.getOpcode(); + if (opcode == Opcode.INVOKE_STATIC || opcode == Opcode.INVOKE_STATIC_RANGE) { + MethodReference accessorMethod = + (MethodReference)((ReferenceInstruction) instruction).getReference(); + + SyntheticAccessorResolver.AccessedMember accessedMember = sar.getAccessedMember(accessorMethod); + + Assert.assertNotNull(String.format("Could not resolve accessor for %s_%s", type, operation), + accessedMember); + + int operationType = operationTypes.get(operation); + Assert.assertEquals(operationType, accessedMember.accessedMemberType); + + Assert.assertEquals(String.format("%s_val", type), + ((FieldReference)accessedMember.accessedMember).getName()); + } + } + } + } +}