Allowing multiple test execution before shutting down executors

Author: lucaneg

src/main/java/it/unipr/EVMLiSA.java

@@ -164,6 +164,13 @@ public static boolean isInPaperMode() {
 	public static void setPaperMode() {
 		PAPER_MODE = true;
 	}
+
+	/**
+	 * Disables the paper mode (i.e., statistics contains jump classifications as in the reference paper).
+	 */
+	public static void disablePaperMode() {
+		PAPER_MODE = false;
+	}
 
 	/**
 	 * Executes the analysis workflow.
@@ -235,9 +242,19 @@ else if (cmd.hasOption("bytecode")) {
 	 * @param filePath the path to the file containing contract addresses
 	 */
 	public static void analyzeSetOfContracts(Path filePath) {
+		analyzeSetOfContracts(filePath, true);
+	}
+
+	/**
+	 * Analyzes a set of smart contracts from a given file.
+	 *
+	 * @param filePath the path to the file containing contract addresses
+	 * @param shutdown  whether to shut down the executor after the analysis
+	 */
+	public static void analyzeSetOfContracts(Path filePath, boolean shutdown) {
 		log.info("Building contracts.");
 		List<SmartContract> contracts = buildContractsFromFile(filePath);
-		analyzeSetOfContracts(contracts);
+		analyzeSetOfContracts(contracts, shutdown);
 	}
 
 	/**
@@ -246,6 +263,16 @@ public static void analyzeSetOfContracts(Path filePath) {
 	 * @param contracts the list of {@link SmartContract} to be analyzed
 	 */
 	public static void analyzeSetOfContracts(List<SmartContract> contracts) {
+		analyzeSetOfContracts(contracts, true);
+	}
+
+	/**
+	 * Analyzes a set of smart contracts from a list of {@link SmartContract}.
+	 *
+	 * @param contracts the list of {@link SmartContract} to be analyzed
+	 * @param shutdown  whether to shut down the executor after the analysis
+	 */
+	public static void analyzeSetOfContracts(List<SmartContract> contracts, boolean shutdown) {
 		log.info("Analyzing {} contracts.", contracts.size());
 
 		List<Future<?>> futures = new ArrayList<>();
@@ -272,7 +299,9 @@ public static void analyzeSetOfContracts(List<SmartContract> contracts) {
 			System.err.println(JSONManager.throwNewError("Failed to save results in " + outputDir));
 			System.exit(1);
 		}
-		EVMLiSAExecutor.shutdown();
+
+		if (shutdown)
+			EVMLiSAExecutor.shutdown();
 	}
 
 	/**

src/test/java/it/unipr/analysis/cron/EVMBytecodeGroundTruth.java

@@ -1,6 +1,7 @@
 package it.unipr.analysis.cron;
 
 import it.unipr.EVMLiSA;
+import it.unipr.utils.EVMLiSAExecutor;
 import it.unipr.utils.JSONManager;
 import it.unipr.utils.PaperStatisticsObject;
 import it.unipr.utils.StandardStatisticsObject;
@@ -15,6 +16,7 @@
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.junit.AfterClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -30,6 +32,11 @@ public class EVMBytecodeGroundTruth {
 	private final Path RUN_RESULTS = WORKING_DIRECTORY_PATH.resolve("set-of-contracts").resolve("results.json");
 	private Path GROUND_TRUTH_FILE_PATH;
 
+	@AfterClass
+	public static void cleanUp() {
+		EVMLiSAExecutor.shutdown();
+	}
+
 	private void setupAndRun() {
 		if (EVMLiSA.isInPaperMode())
 			GROUND_TRUTH_FILE_PATH = WORKING_DIRECTORY_PATH.resolve("ground-truth-data-paper-mode.json");
@@ -38,19 +45,21 @@ private void setupAndRun() {
 		EVMLiSA.setWorkingDirectory(WORKING_DIRECTORY_PATH);
 		EVMLiSA.setCores(Runtime.getRuntime().availableProcessors() / 4 * 3);
 		EVMLiSA.setTestMode();
-		EVMLiSA.analyzeSetOfContracts(SMARTCONTRACTS_FULLPATH);
+		EVMLiSA.analyzeSetOfContracts(SMARTCONTRACTS_FULLPATH, false);
 	}
 
 	@Test
 	@Ignore
 	public void regenerateGroundTruth() throws Exception {
+		EVMLiSA.disablePaperMode();
 		setupAndRun();
 
 		Files.copy(RUN_RESULTS, GROUND_TRUTH_FILE_PATH, StandardCopyOption.REPLACE_EXISTING);
 	}
 
 	@Test
 	public void testGroundTruth() throws Exception {
+		EVMLiSA.disablePaperMode();
 		setupAndRun();
 
 		boolean changed = false;