oli

Author: dfriveros11

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

@@ -1,7 +1,9 @@
 package edu.uniandes.tsdl.mutapk.hashfunction.sha3;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * University of Los Andes
@@ -41,15 +43,16 @@ public synchronized ApkHashSeparator setApkHashSeparator(ApkHashSeparator nuevoA
 		if(isDuplicate) {
 			ApkHashSeparator duplicate = apkHashesSeparator.get(nuevoApkHashSeparator);
 			if(duplicate != null && nuevoApkHashSeparator.equals(duplicate)) {
-				System.out.println("ES IGUAL: " + nuevoApkHashSeparator.equals(duplicate));
-				System.out.println("ES IGUAL Nuevo: " + nuevoApkHashSeparator.getMutanteId());
-				System.out.println("ES IGUAL Nuevo Manifest: " + nuevoApkHashSeparator.getMutanteId() + " " + nuevoApkHashSeparator.getHashManifest());
-				System.out.println("ES IGUAL Nuevo Smali: " + nuevoApkHashSeparator.getMutanteId() + " " + nuevoApkHashSeparator.getHashSmali());
-				System.out.println("ES IGUAL Nuevo Resource: " + nuevoApkHashSeparator.getMutanteId() + " " + nuevoApkHashSeparator.getHashResource());
-				System.out.println("ES IGUAL Nuevo: " + nuevoApkHashSeparator.getMutanteId() + " Viejo " + duplicate.getMutanteId());
-				System.out.println("ES IGUAL Nuevo Manifest: "  + nuevoApkHashSeparator.getMutanteId() + " Viejo " + duplicate.getMutanteId() + " " + nuevoApkHashSeparator.getHashManifest());
-				System.out.println("ES IGUAL Nuevo Smali: " + nuevoApkHashSeparator.getMutanteId() + " Viejo " + duplicate.getMutanteId() + " " + nuevoApkHashSeparator.getHashSmali());
-				System.out.println("ES IGUAL Nuevo Resource: " + nuevoApkHashSeparator.getMutanteId() + " Viejo " +  duplicate.getMutanteId() + " " + nuevoApkHashSeparator.getHashResource());
+//				System.out.println("ES IGUAL: " + nuevoApkHashSeparator.equals(duplicate));
+//				System.out.println("ES IGUAL Nuevo: " + nuevoApkHashSeparator.getMutanteId());
+//				System.out.println("ES IGUAL Nuevo Manifest: " + nuevoApkHashSeparator.getMutanteId() + " " + nuevoApkHashSeparator.getHashManifest());
+//				System.out.println("ES IGUAL Nuevo Smali: " + nuevoApkHashSeparator.getMutanteId() + " " + nuevoApkHashSeparator.getHashSmali());
+//				System.out.println("ES IGUAL Nuevo Resource: " + nuevoApkHashSeparator.getMutanteId() + " " + nuevoApkHashSeparator.getHashResource());
+//				System.out.println("ES IGUAL Nuevo: " + nuevoApkHashSeparator.getMutanteId() + " Viejo " + duplicate.getMutanteId());
+//				System.out.println("ES IGUAL Nuevo Manifest: "  + nuevoApkHashSeparator.getMutanteId() + " Viejo " + duplicate.getMutanteId() + " " + nuevoApkHashSeparator.getHashManifest());
+//				System.out.println("ES IGUAL Nuevo Smali: " + nuevoApkHashSeparator.getMutanteId() + " Viejo " + duplicate.getMutanteId() + " " + nuevoApkHashSeparator.getHashSmali());
+//				System.out.println("ES IGUAL Nuevo Resource: " + nuevoApkHashSeparator.getMutanteId() + " Viejo " +  duplicate.getMutanteId() + " " + nuevoApkHashSeparator.getHashResource());
+				System.out.println("Nuevo HashCode: " + nuevoApkHashSeparator.hashCode() +  "Viejo HashCode: " +  duplicate.hashCode());
 				return duplicate;
 			}
 		}

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

@@ -86,7 +86,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		return hashManifest + "|" + hashResource + "|" + hashSmali;
+		return hashManifest + "||" + hashResource + "||" + hashSmali;
 	}
 
 }

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

@@ -0,0 +1,46 @@
+package edu.uniandes.tsdl.mutapk.hashfunction.sha3;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.junit.Test;
+
+public class Sha3Test {
+
+	
+	String apkAbsolutePath = "C:\\Users\\PERSONAL\\git\\MutAPK\\test\\temp";
+	File manifest = new File(apkAbsolutePath + File.separator + "AndroidManifest.xml");
+	File smali = new File(apkAbsolutePath + File.separator + "smali");
+	File resource = new File(apkAbsolutePath + File.separator + "res");
+	
+	@Test
+	public void equalHashTest() throws FileNotFoundException, IOException {
+		String hashManifest = Sha3.sha512FileSeparte(manifest);
+		String hashSmali = Sha3.sha512FileSeparte(smali);
+		String hashResource = Sha3.sha512FileSeparte(resource);
+		
+		String hashManifestCompare = "";
+		String hashSmaliCompare = "";
+		String hashResourceCompare = "";
+		
+		for (int i = 0; i < 10; i++) {
+			hashManifestCompare = Sha3.sha512FileSeparte(manifest);
+			hashSmaliCompare =  Sha3.sha512FileSeparte(smali);
+			hashResourceCompare = Sha3.sha512FileSeparte(resource);
+			
+			if(!hashManifest.equals(hashManifestCompare)) {
+				fail("They should be always equals");
+			}
+			if(!hashSmali.equals(hashSmaliCompare)) {
+				fail("They should be always equals");
+			}
+			if(!hashResource.equals(hashResourceCompare)) {
+				fail("They should be always equals");
+			}
+		}
+	}
+
+}