TEST refs #31 : tests for Main

JustificationFactory · Jul 27, 2016 · 8e3b069 · 8e3b069
1 parent e24ecd9
commit 8e3b069
Show file tree

Hide file tree

Showing 28 changed files with 321 additions and 318 deletions.
diff --git a/avek-gui/sandbox/src/main/java/sandbox/SubjectJsonGen.java b/avek-gui/sandbox/src/main/java/sandbox/SubjectJsonGen.java
@@ -3,7 +3,7 @@
 import fr.axonic.avek.gui.model.json.Jsonifier;
 import fr.axonic.avek.gui.model.sample.ExampleState;
 import fr.axonic.avek.gui.model.sample.ExampleStateBool;
-import fr.axonic.avek.gui.model.structure.ExperimentationResults;
+import fr.axonic.avek.gui.model.structure.ExperimentationResultsMap;
 import fr.axonic.avek.model.MonitoredSystem;
 import fr.axonic.avek.model.base.ADate;
 import fr.axonic.avek.model.base.ANumber;
@@ -62,7 +62,7 @@ private static String generateSubject() {
 	}
 
 	public static String generateParameters() throws VerificationException {
-		ExperimentationResults expRes = new ExperimentationResults();
+		ExperimentationResultsMap expRes = new ExperimentationResultsMap();
 
 		{	ARangedEnum<ExampleState> aEnum = new ARangedEnum<>(ExampleState.VERY_LOW);
 			aEnum.setRange(Arrays.asList(ExampleState.values()));

diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/Main.java b/avek-gui/src/main/java/fr/axonic/avek/gui/Main.java
@@ -1,8 +1,5 @@
 package fr.axonic.avek.gui;
 
-import fr.axonic.avek.gui.util.ConcurrentTaskManager;
-import fr.axonic.avek.gui.util.Util;
-import fr.axonic.avek.gui.view.GeneralizedView;
 import fr.axonic.avek.gui.view.MainFrame;
 import javafx.application.Application;
 import javafx.scene.Scene;
@@ -14,39 +11,28 @@
 public class Main extends Application {
 	private final static Logger logger = Logger.getLogger(Main.class);
 
+	private MainFrame mainFrame;
+
 	public static void main(String[] args) {
 		launch(args);
 	}
 
+
 	@Override
 	public void start(Stage primaryStage) throws IOException {
-		ConcurrentTaskManager ctm = new ConcurrentTaskManager();
-
 		logger.debug("Loading MainFrame...");
 
 		primaryStage.setTitle("#AVEK analyzer");
 
-		MainFrame mainFrame = new MainFrame();
+		mainFrame = new MainFrame();
 		Scene s = new Scene(mainFrame, 800, 600);
 		primaryStage.setScene(s);
 
 		primaryStage.show();
 		logger.debug("MainFrame created.");
-
-
-		ctm.runLaterOnThread(() -> {
-			try {
-				GeneralizedView generalizedView = new GeneralizedView();
-				Thread.sleep(2000);
-				ctm.runLaterOnPlatform(() -> mainFrame.setView(generalizedView));
-				Thread.sleep(2000);
-				ctm.runLaterOnPlatform(() -> generalizedView.setMonitoredSystem(Util.getFileContent("files/subjectFile.json")));
-				Thread.sleep(2000);
-				ctm.runLaterOnPlatform(() -> generalizedView.setExperimentParameters(Util.getFileContent("files/parametersFile.json")));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		});
 	}
 
+	MainFrame getMainFrame() {
+		return mainFrame;
+	}
 }
diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/components/results/JellyBean.java b/avek-gui/src/main/java/fr/axonic/avek/gui/components/results/JellyBean.java
@@ -31,6 +31,7 @@ public class JellyBean extends HBox {
 	private Object expEffect;
 	private JellyBeansSelector mainController;
 
+	// should be public
 	public JellyBean() {
 		FXMLLoader fxmlLoader = new FXMLLoader(FXML);
 		fxmlLoader.setRoot(this);

diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/components/results/JellyBeansSelector.java b/avek-gui/src/main/java/fr/axonic/avek/gui/components/results/JellyBeansSelector.java
@@ -1,8 +1,8 @@
 package fr.axonic.avek.gui.components.results;
 
 import fr.axonic.avek.gui.model.json.Jsonifier;
-import fr.axonic.avek.gui.model.structure.ExpEffect;
-import fr.axonic.avek.gui.model.structure.ExperimentationResults;
+import fr.axonic.avek.gui.model.structure.ExperimentationResult;
+import fr.axonic.avek.gui.model.structure.ExperimentationResultsMap;
 import fr.axonic.avek.gui.util.Util;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -38,7 +38,7 @@ public class JellyBeansSelector extends VBox {
 	@FXML
 	private FlowPane jellyBeansPane;
 	@FXML
-	private ComboBox<ExpEffect> comboBoxJellyBean;
+	private ComboBox<ExperimentationResult> comboBoxJellyBean;
 
 	private final Set<String> addedEffects;
 
@@ -65,7 +65,7 @@ public JellyBeansSelector() {
 
 		// Fill experiment sample list
 		String results = Util.getFileContent("files/resultEnum1.json");
-		ExperimentationResults expr = new Jsonifier<>(ExperimentationResults.class).fromJson(results);
+		ExperimentationResultsMap expr = new Jsonifier<>(ExperimentationResultsMap.class).fromJson(results);
 		setJellyBeansChoice(FXCollections.observableArrayList(expr.getList()));
 	}
 
@@ -90,12 +90,12 @@ void onNewExpEffectClicked(ActionEvent event) {
 	 */
 	private void updateJellyBeanChoice() {
 		comboBoxJellyBean.setCellFactory(
-				new Callback<ListView<ExpEffect>, ListCell<ExpEffect>>() {
+				new Callback<ListView<ExperimentationResult>, ListCell<ExperimentationResult>>() {
 					@Override
-					public ListCell<ExpEffect> call(ListView<ExpEffect> param) {
-						return new ListCell<ExpEffect>() {
+					public ListCell<ExperimentationResult> call(ListView<ExperimentationResult> param) {
+						return new ListCell<ExperimentationResult>() {
 							@Override
-							public void updateItem(ExpEffect item, boolean empty) {
+							public void updateItem(ExperimentationResult item, boolean empty) {
 								super.updateItem(item, empty);
 								if (item != null) {
 									setText(item.getName());
@@ -111,7 +111,7 @@ public void updateItem(ExpEffect item, boolean empty) {
 
 	private void addJellyBean() {
 		// Verify if JellyBean already created (this result is already selected)
-		ExpEffect choice = comboBoxJellyBean.getValue();
+		ExperimentationResult choice = comboBoxJellyBean.getValue();
 		if (choice == null) {
 			logger.warn("Choice is null");
 			return;
@@ -135,7 +135,7 @@ void removeJellyBean(JellyBean jbc) {
 		updateJellyBeanChoice();
 	}
 
-	public void setJellyBeansChoice(ObservableList<ExpEffect> items) {
+	void setJellyBeansChoice(ObservableList<ExperimentationResult> items) {
 		this.comboBoxJellyBean.setItems(items);
 	}
 }
diff --git a/...c/avek/gui/model/structure/ExpEffect.java → ...odel/structure/ExperimentationResult.java b/...c/avek/gui/model/structure/ExpEffect.java → ...odel/structure/ExperimentationResult.java
@@ -5,12 +5,12 @@
 /**
  * Created by Nathaël N on 07/07/16.
  */
-public class ExpEffect {
+public class ExperimentationResult {
 	private final ARangedEnum states;
 	private final String name;
 
-	public ExpEffect(String name, ARangedEnum aEnum) {
-		this.states = aEnum;
+	public ExperimentationResult(String name, ARangedEnum states) {
+		this.states = states;
 		this.name = name;
 	}
 

diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/model/structure/ExperimentationResults.java b/avek-gui/src/main/java/fr/axonic/avek/gui/model/structure/ExperimentationResults.java
diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/model/structure/ExperimentationResultsMap.java b/avek-gui/src/main/java/fr/axonic/avek/gui/model/structure/ExperimentationResultsMap.java
@@ -0,0 +1,19 @@
+package fr.axonic.avek.gui.model.structure;
+
+import fr.axonic.avek.model.base.ARangedEnum;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Created by Nathaël N on 12/07/16.
+ */
+public class ExperimentationResultsMap extends HashMap<String, ARangedEnum> {
+
+	public List<ExperimentationResult> getList() {
+		return keySet().stream()
+				.map(s -> new ExperimentationResult(s, get(s)))
+				.collect(Collectors.toList());
+	}
+}
diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/model/structure/UploadedFile.java b/avek-gui/src/main/java/fr/axonic/avek/gui/model/structure/UploadedFile.java
@@ -162,8 +162,6 @@ public double getPct() {
 	public boolean equals(Object obj) {
 		if (obj instanceof UploadedFile)
 			return origin.equals(((UploadedFile) obj).origin);
-		if (obj instanceof File)
-			return origin.equals(obj) || uploaded.equals(obj);
 		return super.equals(obj);
 	}
 

diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/util/ConcurrentTaskManager.java b/avek-gui/src/main/java/fr/axonic/avek/gui/util/ConcurrentTaskManager.java
@@ -33,7 +33,7 @@ private <V> void run(Callable<V> c, boolean onPlatform) {
 			try {
 				c.call();
 			} catch (Exception e) {
-				e.printStackTrace();
+				logger.error("Exception thrown during task call", e);
 			}
 			return;
 		}

diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/util/Util.java b/avek-gui/src/main/java/fr/axonic/avek/gui/util/Util.java
@@ -27,12 +27,4 @@ public static String getFileContent(String path) {
 		}
 		return res;
 	}
-
-	public static void disableGraphics() {
-		System.setProperty("testfx.robot", "glass");
-		System.setProperty("prism.order", "sw");
-		System.setProperty("testfx.headless", "true");
-		System.setProperty("java.awt.headless", "true");
-		System.setProperty("prism.text", "t2k");
-	}
 }
diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/view/EstablishEffectView.java b/avek-gui/src/main/java/fr/axonic/avek/gui/view/EstablishEffectView.java
@@ -41,11 +41,11 @@ void onClicStrategyButton(ActionEvent event) {
 	 *
 	 * @param monitoredSystemJson the MonitoredSystem as a Json String
 	 */
-	void setMonitoredSystem(String monitoredSystemJson) {
+	public void setMonitoredSystem(String monitoredSystemJson) {
 		monitoredSystemPane.setMonitoredSystem(MonitoredSystem.fromJson(monitoredSystemJson));
 	}
 
-	void setExperimentParameters(String experimentParametersJson) {
+	public void setExperimentParameters(String experimentParametersJson) {
 		AList<AEntity> list = Jsonifier.toAListofAListAndAVar(experimentParametersJson);
 
 		for (AEntity ae : list.getEntities())

diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/view/StrategySelectionView.java b/avek-gui/src/main/java/fr/axonic/avek/gui/view/StrategySelectionView.java
@@ -1,26 +1,12 @@
 package fr.axonic.avek.gui.view;
 
-import fr.axonic.avek.gui.components.MonitoredSystemPane;
-import fr.axonic.avek.gui.components.parameters.GeneralizedParametersPane;
-import fr.axonic.avek.gui.components.results.JellyBeansSelector;
-import fr.axonic.avek.gui.model.json.Jsonifier;
-import fr.axonic.avek.gui.model.structure.ExpEffect;
-import fr.axonic.avek.model.MonitoredSystem;
-import fr.axonic.avek.model.base.engine.AEntity;
-import fr.axonic.avek.model.base.engine.AList;
 import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.util.Callback;
 import org.apache.log4j.Logger;
 
-import java.io.IOException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;

diff --git a/avek-gui/src/main/java/fr/axonic/avek/gui/view/TreatView.java b/avek-gui/src/main/java/fr/axonic/avek/gui/view/TreatView.java
@@ -38,11 +38,11 @@ void onClicStrategyButton(ActionEvent event) {
 	 *
 	 * @param monitoredSystemJson the MonitoredSystem as a Json String
 	 */
-	void setMonitoredSystem(String monitoredSystemJson) {
+	public void setMonitoredSystem(String monitoredSystemJson) {
 		monitoredSystemPane.setMonitoredSystem(MonitoredSystem.fromJson(monitoredSystemJson));
 	}
 
-	void setExperimentParameters(String experimentParametersJson) {
+	public void setExperimentParameters(String experimentParametersJson) {
 		AList<AEntity> list = Jsonifier.toAListofAListAndAVar(experimentParametersJson);
 
 		for (AEntity ae : list.getEntities())

diff --git a/avek-gui/src/main/resources/files/parametersFile.json b/avek-gui/src/main/resources/files/parametersFile.json
@@ -30,7 +30,7 @@
           "label": "SubNumber"
         },
         {
-          "value": "Jul 25, 2016 9:50:31 AM",
+          "value": "Jul 27, 2016 11:21:54 AM",
           "format": {
             "formatType": "DATE"
           },