prueba

Author: dfriveros11

src/main/java/edu/uniandes/tsdl/mutapk/MutAPK.java

@@ -257,7 +257,7 @@ public static void runMutAPK(String[] args) throws NumberFormatException, Except
 		File resource = new File(apkAbsolutePath + File.separator + "res");
 
 		// Create ApkHashSeparator
-		ApkHashSeparator apkHashSeparator = mProcessor.generateApkHashSeparator(manifest, smali, resource);
+		ApkHashSeparator apkHashSeparator = mProcessor.generateApkHashSeparator(manifest, smali, resource, 0);
 		// Add the base apkHashSeparator
 		ApkHashOrder.getInstance().setApkHashSeparator(apkHashSeparator);
 

src/main/java/edu/uniandes/tsdl/mutapk/hashfunction/sha3/ApkHashOrder.java

@@ -37,18 +37,17 @@ public static ApkHashOrder getInstance() {
 	}
 
 	public synchronized ApkHashSeparator setApkHashSeparator(ApkHashSeparator nuevoApkHashSeparator) {
-		boolean isInCollection = apkHashesSeparator.containsKey(nuevoApkHashSeparator);
-		ApkHashSeparator apkHashSeparatorDuplicate = null;
-		if (isInCollection) {
-			apkHashSeparatorDuplicate = apkHashesSeparator.get(nuevoApkHashSeparator);
+		ApkHashSeparator apkHashSeparatorDuplicate = apkHashesSeparator.get(nuevoApkHashSeparator);
+		if (apkHashSeparatorDuplicate != null && apkHashSeparatorDuplicate.equals(nuevoApkHashSeparator)) {
+			return apkHashSeparatorDuplicate;
 		} else {
 			nuevoApkHashSeparator.setId(id);
 			apkHashesSeparator.put(nuevoApkHashSeparator, nuevoApkHashSeparator);
 			id++;
+			return null;
 		}
-		return apkHashSeparatorDuplicate;
 	}
-	
+
 	public synchronized int getId() {
 		return id;
 	}

src/main/java/edu/uniandes/tsdl/mutapk/hashfunction/sha3/ApkHashSeparator.java

@@ -5,20 +5,23 @@
 @EqualsAndHashCode
 public class ApkHashSeparator {
 
-	 @EqualsAndHashCode.Exclude  private int id = -1;
+	@EqualsAndHashCode.Exclude private int id = -1;
 	private final String hashManifest;
 	private final String hashSmali;
 	private final String hashResource;
+	@EqualsAndHashCode.Exclude private final int mutanteId; 
 
 	public static class Builder {
 		private final String hashManifest;
 		private final String hashSmali;
 		private final String hashResource;
+		private final int mutanteId; 
 
-		public Builder(String hashManifest, String hashsmali, String hashResource) {
+		public Builder(String hashManifest, String hashsmali, String hashResource, int mutanteId) {
 			this.hashManifest = hashManifest;
 			this.hashSmali = hashsmali;
 			this.hashResource = hashResource;
+			this.mutanteId = mutanteId;
 		}
 
 		public ApkHashSeparator build() {
@@ -30,6 +33,7 @@ private ApkHashSeparator(Builder builder) {
 		this.hashManifest = builder.hashManifest;
 		this.hashSmali = builder.hashSmali;
 		this.hashResource = builder.hashResource;
+		this.mutanteId = builder.mutanteId;
 	}
 
 	public int getId() {
@@ -39,7 +43,7 @@ public int getId() {
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	public String getHashManifest() {
 		return hashManifest;
 	}
@@ -52,47 +56,10 @@ public String getHashResource() {
 		return hashResource;
 	}
 
-//	@Override
-//	public boolean equals(Object o) {
-//		if (o == this) {
-//			return true;
-//		} else if (!(o instanceof ApkHashSeparator)) {
-//			return false;
-//		} else {
-//			ApkHashSeparator apkHashseparator = (ApkHashSeparator) o;
-////			boolean isEqualManifest = hashManifest.equals(apkHashseparator.getHashManifest());
-////			boolean isEqualSmali = isEqual(apkHashseparator.getHashSmali(), hashSmali);
-////			boolean isEqualResource = isEqual(apkHashseparator.getHashResource(), hashResource);
-//			return hashManifest.equals(apkHashseparator.getHashManifest())
-//					&& hashSmali.equals(apkHashseparator.getHashSmali())
-//					&& hashResource.equals(apkHashseparator.getHashResource());
-//		}
-//
-//	}
-//
-////	private boolean isEqual(String hash, String compare) {
-////		if (hash.length() != compare.length()) {
-////			return false;
-////		}
-////		String[] hashes = hash.split("|");
-////		String[] compares = compare.split("|");
-////		for (int i = 0; i < hashes.length; i++) {
-////			if (!compares[i].equals(hashes[i])) {
-////				return false;
-////			}
-////		}
-////		return true;
-////	}
-//
-//	@Override
-//	public int hashCode() {
-//		int result = hashManifest.hashCode();
-//		result = 31 * result + hashSmali.hashCode();
-//		result = 31 * result + hashResource.hashCode();
-//		return result;
-//	}
-	
-	
+	public int getMutanteId() {
+		return mutanteId;
+	}
+
 	@Override
 	public String toString() {
 		return hashManifest + "|" + hashResource + "|" + hashSmali;

src/main/java/edu/uniandes/tsdl/mutapk/processors/MutationsProcessor.java

@@ -98,7 +98,7 @@ private void verifyDuplicateMutants(String extraPath, String apkName, int mutant
 		File manifest = new File(mutantFolder + File.separator + "AndroidManifest.xml");
 		File smali = new File(mutantFolder + File.separator + "smali");
 		File resource = new File(mutantFolder + File.separator + "res");
-		ApkHashSeparator apkHashSeparator = this.generateApkHashSeparator(manifest, smali, resource);
+		ApkHashSeparator apkHashSeparator = this.generateApkHashSeparator(manifest, smali, resource, mutantIndex);
 
 		ApkHashSeparator apkHashSeparatorDuplicate = ApkHashOrder.getInstance()
 				.setApkHashSeparator(apkHashSeparator);
@@ -143,12 +143,12 @@ private void generateMutant(String extraPath, String apkName, int mutantIndex, S
 		wwriter.flush();
 	}
 
-	public ApkHashSeparator generateApkHashSeparator(File manifest, File smali, File resource)
+	public ApkHashSeparator generateApkHashSeparator(File manifest, File smali, File resource, int mutanteId)
 			throws FileNotFoundException, IOException {
 		String hashManifest = Sha3.sha512FileSeparte(manifest);
 		String hashSmaliConSeperado = Sha3.sha512FileSeparte(smali);
 		String hashResourceConSeperado = Sha3.sha512FileSeparte(resource);
-		ApkHashSeparator apkHashSeparator = new ApkHashSeparator.Builder(hashManifest, hashSmaliConSeperado, hashResourceConSeperado).build();
+		ApkHashSeparator apkHashSeparator = new ApkHashSeparator.Builder(hashManifest, hashSmaliConSeperado, hashResourceConSeperado, mutanteId).build();
 		return apkHashSeparator;
 	}
 
@@ -166,7 +166,7 @@ public void processMultithreaded(List<MutationLocation> locations, final String
 		final List<Future<String>> results = new LinkedList<Future<String>>();
 
 		writer.write("ThreadPool: " + Runtime.getRuntime().availableProcessors() + "\n");
-		int mutantIndex = 0;
+		int mutantIndex = 1;
 
 		for (final MutationLocation mutationLocation : locations) {
 			mutantIndex++;