fixed tests!

Cornul11 · Jul 5, 2023 · 343bb95 · 343bb95
1 parent 016185f
commit 343bb95
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,13 +19,10 @@ services:
     ports:
       - "3306:3306"
     volumes:
-#      - ./my-custom.cnf:/etc/mysql/mariadb.conf.d/my-custom.cnf
+      #      - ./my-custom.cnf:/etc/mysql/mariadb.conf.d/my-custom.cnf
       - ${MARIADB_DATA_LOCATION}:/var/lib/mysql
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-
-volumes:
-  mariadb_data:
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
diff --git a/src/main/java/nl/tudelft/cornul11/thesis/corpus/commandline/CommandExecutor.java b/src/main/java/nl/tudelft/cornul11/thesis/corpus/commandline/CommandExecutor.java
@@ -8,7 +8,6 @@
 import nl.tudelft.cornul11.thesis.corpus.jarfile.JarFrequencyAnalyzer;
 import nl.tudelft.cornul11.thesis.corpus.service.VulnerabilityAnalyzer;
 import nl.tudelft.cornul11.thesis.corpus.util.ConfigurationLoader;
-import nl.tudelft.cornul11.thesis.database.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/nl/tudelft/cornul11/thesis/corpus/extractor/bytecode/BytecodeDetails.java b/src/main/java/nl/tudelft/cornul11/thesis/corpus/extractor/bytecode/BytecodeDetails.java
@@ -60,6 +60,10 @@ public List<AnnotationDetails> getAnnotations() {
         return annotations;
     }
 
+    public int getAccess() {
+        return access;
+    }
+
     public static class Builder {
         private int access;
         private String name;

diff --git a/src/main/java/nl/tudelft/cornul11/thesis/corpus/extractor/bytecode/BytecodeUtils.java b/src/main/java/nl/tudelft/cornul11/thesis/corpus/extractor/bytecode/BytecodeUtils.java
@@ -23,6 +23,7 @@ public static long getSignatureHash(BytecodeDetails bytecodeDetails) {
         LongHashFunction cityHashFunction = LongHashFunction.xx3();
         StringBuilder classSignature = new StringBuilder();
 
+        classSignature.append(bytecodeDetails.getAccess());
         classSignature.append(bytecodeDetails.getName());
         classSignature.append(bytecodeDetails.getExtendsType());