fix InvalidIDFindView param value

Author: caev03

src/uniandes/tsdl/mutapk/MutAPK.java

@@ -76,7 +76,7 @@ public static void runMutAPK(String[] args) throws Exception {
 			apkName = apkPath.substring(apkPath.lastIndexOf("/"));
 		}
 		// Decode the APK
-		//APKToolWrapper.openAPK(apkPath, extraPath);
+		APKToolWrapper.openAPK(apkPath, extraPath);
 
 		//Read selected operators
 		OperatorBundle operatorBundle = new OperatorBundle(operatorsDir);

src/uniandes/tsdl/mutapk/helper/ASTHelper.java

@@ -69,7 +69,7 @@ public static CommonTree getFirstUncleNamedOfType(int type, String name, CommonT
 		}
 		return null;
 	}
-	
+
 	public static CommonTree getFirstBackUncleNamedOfType(int type, String name, CommonTree t) {
 		CommonTree parent = (CommonTree) t.getParent();
 		List<CommonTree> uncles = (List<CommonTree>)((CommonTree)parent.getParent()).getChildren();
@@ -116,13 +116,13 @@ public static CommonTree hasIPutAndIGet(CommonTree t) {
 
 	public static int[] isValidLocation(CommonTree t){
 		//		if(t.getType()==159) {
-//						System.out.println(t.toStringTree());
-//						System.out.println(t.getType());
+		//						System.out.println(t.toStringTree());
+		//						System.out.println(t.getType());
 		//			System.out.println(t.getChild(2));
 		//			System.out.println(t.getChild(3));
 		//			System.out.println(t.getChild(2).toStringTree().equals("Ljava/net/URI;") && t.getChild(3).toStringTree().equals("<init>") );
 		//		}
-						
+
 		if(t.getType()==smaliParser.I_STATEMENT_FORMAT35c_METHOD) {
 			ArrayList<Integer> resp = new ArrayList<Integer>();
 			if(t.getFirstChildWithType(smaliParser.I_REGISTER_LIST).getChildCount()==3 
@@ -164,11 +164,11 @@ public static int[] isValidLocation(CommonTree t){
 			} else if(isNullOutputStream(t)) {
 				resp.add(37);
 			} 
-			
+
 			if(t.getChild(1).getChildCount()>1) {
 				resp.add(22);
 			}
-			
+
 			if(resp.size()>0) {
 				int[] ret = new int[resp.size()];
 				for (int i=0; i < ret.length; i++)
@@ -177,15 +177,25 @@ public static int[] isValidLocation(CommonTree t){
 				}
 				return ret;				
 			}
-			
+
 		} else if(t.getType()==191) {
 			if(t.getText().equals("putExtra")){ //InvalidKeyIntentPutExtra && NullValueIntentPutExtra
 				return new int[]{4, 7}; 
-			} else if(t.getText().equals("findViewById") && hasIPutAndIGet(t)!=null) {
-				return new int[]{26, 29};
-			} else if (t.getText().equals("findViewById")) {
-				return new int[]{27, 31};	
-			}
+			} else if(t.getText().equals("findViewById")) {
+				ArrayList<Integer> resp = new ArrayList<Integer>();
+				resp.add(27);
+				resp.add(31);
+				if (hasIPutAndIGet(t)!=null) {
+					resp.add(26);
+					resp.add(29);
+				}
+				int[] ret = new int[resp.size()];
+				for (int i=0; i < ret.length; i++)
+				{
+					ret[i] = resp.get(i).intValue();
+				}
+				return ret;				
+			} 
 		} else if(t.getType()==161) {
 			if(t.getChild(2).toStringTree().equals("Landroid/bluetooth/BluetoothAdapter;")
 					&& t.getChild(3).toStringTree().equals("isEnabled")
@@ -266,7 +276,7 @@ private static boolean isOnCreateMethod(CommonTree t) {
 		}
 		return resp;
 	}
-	
+
 	private static boolean isOnClickMethod(CommonTree t) {
 		boolean resp = t.getChild(0).toString().equals("onClick");
 		if(resp) {

src/uniandes/tsdl/mutapk/operators/gui/android/InvalidIDFindView.java

@@ -19,36 +19,54 @@ public class InvalidIDFindView implements MutationOperator {
 
 	@Override
 	public boolean performMutation(MutationLocation location, BufferedWriter writer, int mutantIndex) throws Exception {
-		
+
 		ASTMutationLocation mLocation = (ASTMutationLocation) location;
 		CommonTree parent = (CommonTree) mLocation.getTree().getParent();
+		boolean isParam = false;
+		String constVarName = "";
+		int linee = -1;
 		CommonTree uncle = ASTHelper.getFirstBackUncleNamedOfType(smaliParser.I_STATEMENT_FORMAT31i, "const", mLocation.getTree());
-		String constVarName = uncle.getChild(1).getText();
-		
+		if (uncle == null) {
+			uncle = ASTHelper.getFirstBackUncleNamedOfType(smaliParser.I_STATEMENT_FORMAT21ih, "const/high16", mLocation.getTree());
+			if (uncle == null && parent.getChild(1).getChild(1).getText().startsWith("p")) {
+				isParam=true;
+				constVarName = parent.getChild(1).getChild(1).getText();
+				linee = parent.getLine();
+			}
+		}
+
+		if (!isParam) {
+			constVarName = uncle.getChild(1).getText();
+			linee = uncle.getLine();
+		} 
+
+
 		List<String> newLines = new ArrayList<String>();
 		List<String> lines = FileHelper.readLines(location.getFilePath());
 
 		//Add lines before the MutationLocation
-		for(int i=0; i < uncle.getLine()-1; i++){
+		for(int i=0; i < linee-1; i++){
 			newLines.add(lines.get(i));
 		}
-		
+
 		//Apply mutation
 		newLines.add("");
 		newLines.add("    const "+constVarName+", 0x"+HexadecimalGenerator.generateRandomHexa());
 		newLines.add("");
-		
-		for(int i=uncle.getLine(); i < lines.size() ; i++){
+		if(isParam) {
+			newLines.add(lines.get(linee-1));
+		}
+
+		for(int i=linee; i < lines.size() ; i++){
 			newLines.add(lines.get(i));
 		}
 
 		FileHelper.writeLines(location.getFilePath(), newLines);
 		Helper.mutationSuccess(mutantIndex);
-		Helper.writeBasicLogInfo(mutantIndex, location.getFilePath(), location.getType().getName(), new int[] {uncle.getLine()}, writer);
+		Helper.writeBasicLogInfo(mutantIndex, location.getFilePath(), location.getType().getName(), new int[] {linee}, writer);
 		writer.write("	For mutant "+mutantIndex+" the id of the element retrieved at line "+location.getStartLine()+" has been set to a random value");
 		writer.newLine();
 		writer.flush();
 		return true;
 	}
-
 }