From ae36cb345a7f4f568520afee297b74f723fb9495 Mon Sep 17 00:00:00 2001 From: skyleaworlder Date: Mon, 17 Jun 2024 17:18:54 +0800 Subject: [PATCH] fix: build failed, due to missing dependencies, so I remove related tests --- pom.xml | 36 +++-- shell/src/test/java/visualization/Main.java | 43 ------ .../ObjectGraphConstructionVisualizer.java | 5 - .../java/visualization/StartVisualizer.java | 11 -- .../controller/GraphImageController.java | 70 ---------- .../controller/MainController.java | 132 ------------------ .../controller/TestCaseController.java | 69 --------- .../controller/ToolBarController.java | 55 -------- .../java/visualization/utils/Constants.java | 14 -- .../java/visualization/view/GraphImage.FXML | 12 -- .../test/java/visualization/view/Main.fxml | 22 --- .../java/visualization/view/TestCase.FXML | 22 --- .../test/java/visualization/view/ToolBar.FXML | 15 -- 13 files changed, 21 insertions(+), 485 deletions(-) delete mode 100644 shell/src/test/java/visualization/Main.java delete mode 100644 shell/src/test/java/visualization/ObjectGraphConstructionVisualizer.java delete mode 100644 shell/src/test/java/visualization/StartVisualizer.java delete mode 100644 shell/src/test/java/visualization/controller/GraphImageController.java delete mode 100644 shell/src/test/java/visualization/controller/MainController.java delete mode 100644 shell/src/test/java/visualization/controller/TestCaseController.java delete mode 100644 shell/src/test/java/visualization/controller/ToolBarController.java delete mode 100644 shell/src/test/java/visualization/utils/Constants.java delete mode 100644 shell/src/test/java/visualization/view/GraphImage.FXML delete mode 100644 shell/src/test/java/visualization/view/Main.fxml delete mode 100644 shell/src/test/java/visualization/view/TestCase.FXML delete mode 100644 shell/src/test/java/visualization/view/ToolBar.FXML diff --git a/pom.xml b/pom.xml index 132cd23ee8..634f0cdf75 100644 --- a/pom.xml +++ b/pom.xml @@ -129,11 +129,11 @@ true - ${java.home}/../lib/tools.jar + /home/jump/Desktop/Projects/evosuite-plus-plus/libs/tools.jar - ${java.home}/../lib/tools.jar + /home/jump/Desktop/Projects/evosuite-plus-plus/libs/tools.jar @@ -295,7 +295,8 @@ tools 1.0.0 system - ${toolsjar} + + /home/jump/Desktop/Projects/evosuite-plus-plus/libs/tools.jar @@ -386,24 +387,29 @@ jgrapht 0.8.3 - - + + - + org.jgrapht + jgrapht-core + 0.9.0 + + - - + org.jgrapht + jgrapht-ext + 0.9.0 + + - - - - + com.panayotis + JavaPlot + 0.4.0 + com.thoughtworks.xstream diff --git a/shell/src/test/java/visualization/Main.java b/shell/src/test/java/visualization/Main.java deleted file mode 100644 index 74ddfea51f..0000000000 --- a/shell/src/test/java/visualization/Main.java +++ /dev/null @@ -1,43 +0,0 @@ -package visualization; - -import java.io.IOException; - -import javafx.application.Application; -import javafx.fxml.FXMLLoader; -import javafx.scene.Parent; -import javafx.scene.Scene; -import javafx.stage.Stage; - -import visualization.controller.MainController; -import visualization.utils.Constants; - -public class Main extends Application { - - @Override - public void start(Stage stage) throws Exception { - try { - // Load FXML and pass stage to MainController - FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource(Constants.MAIN_FXML)); - Parent root = (Parent) fxmlLoader.load(); - MainController mainController = (MainController) fxmlLoader.getController(); - mainController.setStage(stage); - - // Display stage - Scene scene = new Scene(root); - stage.setScene(scene); - stage.setTitle("Object Graph Construction Visualizer"); - stage.show(); - - // Start by opening file selector - mainController.openFileSelector(); - - } catch (IOException e) { - System.out.println("Cannot find Main.fxml: " + Constants.MAIN_FXML); - e.printStackTrace(); - } - } - - public static void main(String args[]) { - launch(args); - } -} diff --git a/shell/src/test/java/visualization/ObjectGraphConstructionVisualizer.java b/shell/src/test/java/visualization/ObjectGraphConstructionVisualizer.java deleted file mode 100644 index cc3b64ec2b..0000000000 --- a/shell/src/test/java/visualization/ObjectGraphConstructionVisualizer.java +++ /dev/null @@ -1,5 +0,0 @@ -package visualization; - -public class ObjectGraphConstructionVisualizer { - //TODO for aaron -} diff --git a/shell/src/test/java/visualization/StartVisualizer.java b/shell/src/test/java/visualization/StartVisualizer.java deleted file mode 100644 index 8775a7695a..0000000000 --- a/shell/src/test/java/visualization/StartVisualizer.java +++ /dev/null @@ -1,11 +0,0 @@ -package visualization; - -import org.junit.Test; - -public class StartVisualizer { - @Test - public void startVisualizer() { - String[] args = {}; - Main.main(args); - } -} diff --git a/shell/src/test/java/visualization/controller/GraphImageController.java b/shell/src/test/java/visualization/controller/GraphImageController.java deleted file mode 100644 index e6d23cd895..0000000000 --- a/shell/src/test/java/visualization/controller/GraphImageController.java +++ /dev/null @@ -1,70 +0,0 @@ -package visualization.controller; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; - -import javafx.beans.InvalidationListener; -import javafx.beans.Observable; -import javafx.beans.property.DoubleProperty; -import javafx.beans.property.SimpleDoubleProperty; -import javafx.event.EventHandler; -import javafx.fxml.FXML; -import javafx.geometry.Bounds; -import javafx.scene.Node; -import javafx.scene.control.ScrollPane; -import javafx.scene.image.Image; -import javafx.scene.image.ImageView; -import javafx.scene.input.ScrollEvent; - -public class GraphImageController { - @FXML - private ScrollPane scrollPane; - - @FXML - private ImageView imageView; - - private File graphFile; - - final DoubleProperty zoomProperty = new SimpleDoubleProperty(200); - - @FXML - public void initialize() { - System.out.println("GraphImage initializing"); - - zoomProperty.addListener(new InvalidationListener() { - @Override - public void invalidated(Observable arg0) { - imageView.setFitWidth(zoomProperty.get() * 4); - imageView.setFitHeight(zoomProperty.get() * 3); - } - }); - - scrollPane.addEventFilter(ScrollEvent.ANY, new EventHandler() { - @Override - public void handle(ScrollEvent event) { - if (event.getDeltaY() > 0) { - zoomProperty.set(zoomProperty.get() * 1.1); - } else if (event.getDeltaY() < 0) { - zoomProperty.set(zoomProperty.get() / 1.1); - } - } - }); - - } - - public void setGraphImage(File file) { - if (file.equals(graphFile)) { - return; - } - - try { - Image image = new Image(new FileInputStream(file)); - imageView.setImage(image); - graphFile = file; - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } -} diff --git a/shell/src/test/java/visualization/controller/MainController.java b/shell/src/test/java/visualization/controller/MainController.java deleted file mode 100644 index 595559b548..0000000000 --- a/shell/src/test/java/visualization/controller/MainController.java +++ /dev/null @@ -1,132 +0,0 @@ -package visualization.controller; - -import javafx.fxml.FXML; -import javafx.stage.Stage; -import visualization.utils.Constants; - -import java.io.File; -import java.util.Arrays; -import java.util.List; - -public class MainController { - - @FXML - private ToolBarController toolBarController; - - @FXML - private TestCaseController testCaseController; - - @FXML - private GraphImageController graphImageController; - - public Stage stage; - - private String fName; - private String branchName; - - private File testFolder; - private List testFiles; - private List graphFiles; -// private File leftTestFile; -// private File rightTestFile; - private File graphImageFile; - - private int leftTestFileIndex; - - @FXML - public void initialize() { - System.out.println("Application started"); - toolBarController.init(this); -// fName = "/Users/xucaiyi/Documents/EvoObj-EvoSuite-comparison-testrun/TestGenerationResult/test/I110 Branch 43 IFNONNULL L103"; -// String leftTestCaseName = "40-CreditAuthInfo#equals#74.txt"; -// String rightTestCaseName = "41-CreditAuthInfo#equals#117.txt"; -// loadFiles(fName + "\\" + leftTestCaseName, fName + "\\" + rightTestCaseName, ""); - } - - public void openFileSelector() { - toolBarController.openFileSelector(); - } - - public void setStage(Stage stage) { - this.stage = stage; - } - - public Stage getStage() { - return stage; - } - - /** - * Initialize and load all three files, given the chosen left test case file - * - * @param leftTestFile - */ - public void initializeFiles(File leftTestFile) { - - // Initialize branch name and folder - testFolder = leftTestFile.getParentFile(); - branchName = testFolder.getName(); - - // Initialize test files - File[] testFilesArr = testFolder.listFiles((dir, name) -> name.matches(Constants.TEST_FILE_REGEX)); - testFiles = Arrays.asList(testFilesArr); - - // sort files by starting ID - testFiles.sort((left, right) -> { - int leftID = Integer.parseInt(left.getName().split("-")[0]); - int rightID = Integer.parseInt(right.getName().split("-")[0]); - return leftID - rightID; - }); - - // Initialize graph image files - File[] graphFilesArr = testFolder - .listFiles((dir, name) -> name.matches(branchName + Constants.GRAPH_IMAGE_SUFFIX)); - graphFiles = Arrays.asList(graphFilesArr); - graphImageFile = graphFiles.size() == 1 ? graphFiles.get(0) : new File(""); - - // Initialize index of left test case file - leftTestFileIndex = testFiles.indexOf(leftTestFile); - - // Load and display test cases and graph image - loadFiles(); - } - - public void loadPrevious() { - leftTestFileIndex -= 1; - loadFiles(); - } - - public void loadNext() { - leftTestFileIndex += 1; - loadFiles(); - } - - private void loadFiles() { - checkButtonsToDisable(); - - File leftTestFile = testFiles.get(leftTestFileIndex); - File rightTestFile = testFiles.size() > 1 ? testFiles.get(leftTestFileIndex + 1) : new File(""); - File graphFile = graphImageFile; - - testCaseController.setLeftTestCase(leftTestFile); - testCaseController.setRightTestCase(rightTestFile); - graphImageController.setGraphImage(graphFile); - } - - private void checkButtonsToDisable() { - if (testFiles.size() <= 2) { - // 2 or less test files, disable both button - toolBarController.setPreviousDisabled(true); - toolBarController.setNextDisabled(true); - } else if (leftTestFileIndex == 0) { - // Reached first test case - toolBarController.setPreviousDisabled(true); - } else if (leftTestFileIndex == testFiles.size() - 2) { - // Reached last test case - toolBarController.setNextDisabled(true); - } else { - // Enable buttons - toolBarController.setPreviousDisabled(false); - toolBarController.setNextDisabled(false); - } - } -} diff --git a/shell/src/test/java/visualization/controller/TestCaseController.java b/shell/src/test/java/visualization/controller/TestCaseController.java deleted file mode 100644 index fb78750f55..0000000000 --- a/shell/src/test/java/visualization/controller/TestCaseController.java +++ /dev/null @@ -1,69 +0,0 @@ -package visualization.controller; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; - -import javafx.fxml.FXML; -import javafx.scene.control.Label; -import javafx.scene.control.TextArea; -import javafx.scene.control.TextField; - -public class TestCaseController { - @FXML - private TextArea leftTextArea; - - @FXML - private TextArea rightTextArea; - - @FXML - private Label leftLabel; - - @FXML - private Label rightLabel; - - @FXML - private void initialize() { - System.out.println("TestCase initializing"); - } - - private String getTestCaseContent(File file) { - BufferedReader reader; - try { - reader = new BufferedReader(new FileReader(file)); - StringBuilder stringBuilder = new StringBuilder(); - String line = null; - String ls = System.getProperty("line.separator"); - while ((line = reader.readLine()) != null) { - stringBuilder.append(line); - stringBuilder.append(ls); - } - stringBuilder.deleteCharAt(stringBuilder.length() - 1); - reader.close(); - - return stringBuilder.toString(); - } catch (FileNotFoundException e) { - System.out.println("Test case file not found: " + file.getPath()); - e.printStackTrace(); - } catch (IOException e) { - System.out.println("Error reading test case"); - e.printStackTrace(); - } - - return ""; - } - - public void setLeftTestCase(File file) { - String content = getTestCaseContent(file); - leftTextArea.setText(content); - leftLabel.setText(file.getName().replace("-", ". ").replace(".txt", "")); - } - - public void setRightTestCase(File file) { - String content = getTestCaseContent(file); - rightTextArea.setText(content); - rightLabel.setText(file.getName().replace("-", ". ").replace(".txt", "")); - } -} diff --git a/shell/src/test/java/visualization/controller/ToolBarController.java b/shell/src/test/java/visualization/controller/ToolBarController.java deleted file mode 100644 index 8cf560ad61..0000000000 --- a/shell/src/test/java/visualization/controller/ToolBarController.java +++ /dev/null @@ -1,55 +0,0 @@ -package visualization.controller; - -import java.io.File; - -import javafx.fxml.FXML; -import javafx.scene.control.Button; -import javafx.stage.FileChooser; - -public class ToolBarController { - @FXML - private Button prevButton; - - @FXML - private Button nextButton; - - private MainController main; - - @FXML - public void initialize() { - System.out.println("Toolbar initializing"); - } - - public void init(MainController mainController) { - main = mainController; - } - - public void openFileSelector() { - FileChooser fileChooser = new FileChooser(); - File leftTestFile = fileChooser.showOpenDialog(main.getStage()); - - if (leftTestFile == null) { - setPreviousDisabled(true); - setNextDisabled(true); - return; - } - - main.initializeFiles(leftTestFile); - } - - public void handlePrevious() { - main.loadPrevious(); - } - - public void handleNext() { - main.loadNext(); - } - - public void setPreviousDisabled(boolean flag) { - prevButton.setDisable(flag); - } - - public void setNextDisabled(boolean flag) { - nextButton.setDisable(flag); - } -} diff --git a/shell/src/test/java/visualization/utils/Constants.java b/shell/src/test/java/visualization/utils/Constants.java deleted file mode 100644 index 90e31ff53f..0000000000 --- a/shell/src/test/java/visualization/utils/Constants.java +++ /dev/null @@ -1,14 +0,0 @@ -package visualization.utils; - -public class Constants { - public static final String MAIN_FXML = "/visualization/view/Main.fxml"; - - // Not using this due to initial file: 0-initial.txt -// public static final String TEST_FILE_REGEX = "\\d+\\-.+#.+#\\d+\\.txt"; - - public static final String TEST_FILE_REGEX = "\\d+\\-.+\\.txt"; - - public static final String GRAPH_IMAGE_SUFFIX = ".png"; - - public static final String FIRST_TEST_FILE = "0-initial.txt"; -} diff --git a/shell/src/test/java/visualization/view/GraphImage.FXML b/shell/src/test/java/visualization/view/GraphImage.FXML deleted file mode 100644 index b22ad331d2..0000000000 --- a/shell/src/test/java/visualization/view/GraphImage.FXML +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/shell/src/test/java/visualization/view/Main.fxml b/shell/src/test/java/visualization/view/Main.fxml deleted file mode 100644 index 0ff67afd8b..0000000000 --- a/shell/src/test/java/visualization/view/Main.fxml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - -
- - - - - - -
- diff --git a/shell/src/test/java/visualization/view/TestCase.FXML b/shell/src/test/java/visualization/view/TestCase.FXML deleted file mode 100644 index 3aaa0a3b53..0000000000 --- a/shell/src/test/java/visualization/view/TestCase.FXML +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - -