oli

Author: dfriveros11

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

@@ -1,7 +1,7 @@
 package edu.uniandes.tsdl.mutapk.hashfunction.sha3;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * University of Los Andes
@@ -18,7 +18,7 @@ public final class ApkHashOrder {
 	private static volatile ApkHashOrder instance;
 
 	private int id = 0;
-	private Set<ApkHashSeparator> apkHashesSeparator = new HashSet<ApkHashSeparator>();
+	private Map<ApkHashSeparator, ApkHashSeparator> apkHashesSeparator = new HashMap<ApkHashSeparator, ApkHashSeparator>();
 
 	/**
 	 * Enforce private constructor
@@ -37,18 +37,17 @@ public static ApkHashOrder getInstance() {
 	}
 
 	public synchronized ApkHashSeparator setApkHashSeparator(ApkHashSeparator nuevoApkHashSeparator) {
-		boolean isDuplicate = apkHashesSeparator.contains(nuevoApkHashSeparator);
+		boolean isDuplicate = apkHashesSeparator.containsKey(nuevoApkHashSeparator);
 		if(isDuplicate) {
-			for(ApkHashSeparator apk : apkHashesSeparator) {
-				if(apk.equals(nuevoApkHashSeparator)) {
-					return apk;
-				}
+			ApkHashSeparator duplicate = apkHashesSeparator.get(nuevoApkHashSeparator);
+			if(duplicate != null && nuevoApkHashSeparator.equals(duplicate)) {
+				return duplicate;
 			}
-		}else {
-			nuevoApkHashSeparator.setId(id);
-			apkHashesSeparator.add(nuevoApkHashSeparator);
-			id++;
 		}
+		nuevoApkHashSeparator.setId(id);
+		apkHashesSeparator.put(nuevoApkHashSeparator, nuevoApkHashSeparator);
+		id++;
+
 		return null;
 	}
 

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

@@ -59,6 +59,9 @@ public int getMutanteId() {
 
 	@Override
 	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
 		if(o == null){
 			return false;
 		}

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

@@ -148,6 +148,9 @@ public ApkHashSeparator generateApkHashSeparator(File manifest, File smali, File
 		String hashManifest = Sha3.sha512FileSeparte(manifest);
 		String hashSmaliConSeperado = Sha3.sha512FileSeparte(smali);
 		String hashResourceConSeperado = Sha3.sha512FileSeparte(resource);
+		System.out.println("ESTE ES: " + hashManifest);
+		System.out.println("ESTE ES: " + hashSmaliConSeperado);
+		System.out.println("ESTE ES: " + hashResourceConSeperado);
 		ApkHashSeparator apkHashSeparator = new ApkHashSeparator.Builder(hashManifest, hashSmaliConSeperado, hashResourceConSeperado, mutanteId).build();
 		return apkHashSeparator;
 	}

src/test/java/edu/uniandes/tsdl/mutapk/hashfunction/sha3/ApkHashSeparatorTest.java

@@ -0,0 +1,14 @@
+package edu.uniandes.tsdl.mutapk.hashfunction.sha3;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ApkHashSeparatorTest {
+
+	@Test
+	public void testEquals() {
+		fail("Not yet implemented");
+	}
+
+}