Merge pull request #49 from TheSoftwareDesignLab/develop

MO4 and MO17 compilation errors solved

Author: caev03

src/uniandes/tsdl/mutapk/MutAPK.java

@@ -82,7 +82,7 @@ public static void runMutAPK(String[] args) throws Exception {
 		Helper.getInstance();
 		Helper.setPackageName(appName);
 		// Decode the APK
-		//APKToolWrapper.openAPK(apkPath, extraPath);
+		APKToolWrapper.openAPK(apkPath, extraPath);
 
 		//Read selected operators
 		OperatorBundle operatorBundle = new OperatorBundle(operatorsDir);

src/uniandes/tsdl/mutapk/operators/activity/InvalidKeyIntentPutExtra.java

@@ -7,6 +7,7 @@
 
 import org.antlr.runtime.tree.CommonTree;
 
+import uniandes.tsdl.antlr.smaliParser;
 import uniandes.tsdl.mutapk.helper.FileHelper;
 import uniandes.tsdl.mutapk.helper.Helper;
 import uniandes.tsdl.mutapk.helper.StringGenerator;
@@ -20,20 +21,29 @@ public boolean performMutation(MutationLocation location, BufferedWriter writer,
 
 		ASTMutationLocation mLocation = (ASTMutationLocation) location;
         CommonTree parent = (CommonTree) mLocation.getTree().getParent();
-//        System.out.println(parent.toStringTree());
         List<CommonTree> hijos = (List<CommonTree>)parent.getChildren();
         String extraKeyVar = hijos.get(1).getChild(1).toString();
         CommonTree method = (CommonTree) parent.getParent();
         int putExtraPos = parent.getChildIndex();
-        int extraKeyValPos = 0;
+        int extraKeyValPos = -1;
         boolean finished = false;
         for (int i = putExtraPos; i >-1 && !finished; i--) {
         	CommonTree temp = (CommonTree) method.getChild(i);
-        	if(temp.getType()==140 && temp.getChild(1).toString().equals(extraKeyVar)) {
+        	System.out.println(mutantIndex+" - "+temp.getType()+" - "+temp.toStringTree());
+        	if(temp.getType()==smaliParser.I_STATEMENT_FORMAT22x && temp.getChild(1).toString().equals(extraKeyVar)) {
+        		extraKeyVar=temp.getChild(2).toString();
+        	}
+        	if(temp.getType()==smaliParser.I_STATEMENT_FORMAT21c_STRING && temp.getChild(1).toString().equals(extraKeyVar)) {
         		extraKeyValPos = temp.getLine();
         		finished = true;
         	}
 		}
+        
+        if (extraKeyValPos==-1) {
+			extraKeyValPos=mLocation.getLine()-1;
+		}
+        
+        
         String newKey = StringGenerator.generateRandomString();
 
         List<String> newLines = new ArrayList<String>();

src/uniandes/tsdl/mutapk/operators/data/android/InvalidURI.java

@@ -32,13 +32,13 @@ public boolean performMutation(MutationLocation location, BufferedWriter writer,
 		for(int i=0; i < mLocation.getLine()-1; i++){
 			newLines.add(lines.get(i));
 		}
-		String newVarName = varName.substring(0, 1)+(Integer.parseInt(varName.substring(1))+2);
+		//String newVarName = varName.substring(0, 1)+(Integer.parseInt(varName.substring(1))+2);
 		String newVarValue = StringGenerator.generateRandomString();
 //		//Apply mutation
 		newLines.add("");
-		newLines.add("   const-string "+newVarName+", \""+newVarValue+"\"");
+		newLines.add("    const-string "+varName+", \""+newVarValue+"\"");
 		newLines.add("");
-		newLines.add(lines.get(mLocation.getLine()-1).replaceAll(varName, newVarName));
+		newLines.add(lines.get(mLocation.getLine()-1));
 		newLines.add("");
 
 		for(int i=mLocation.getLine(); i < lines.size() ; i++){

test/MutAPK-0.0.1.jar

@@ -1,4 +1,5 @@
 # 30	=	BuggyGUIListener
 # 15	=	BluetoothAdapterAlwaysEnabled
 # 31	=	InvalidIDFindView
-2	=	DifferentActivityIntentDefinition
+# 2	=	DifferentActivityIntentDefinition
+4	=	InvalidKeyIntentPutExtra