Fix bugs in tests.

HPI-Information-Systems · Apr 13, 2015 · 04a937c · 04a937c
1 parent f876406
commit 04a937c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/backend/src/test/java/de/metanome/backend/resources/AlgorithmExecutionResourceTest.java b/backend/src/test/java/de/metanome/backend/resources/AlgorithmExecutionResourceTest.java
@@ -151,6 +151,9 @@ public void testGetPrinterResults() throws Exception {
     // Check result
     assertFalse(results.isEmpty());
     assertTrue(results.contains(expectedUcc));
+
+    // Clean Up
+    AlgorithmExecutionCache.getResultPrinter(expectedExecutionIdentifier).close();
   }
 
 }
diff --git a/frontend/src/main/java/de/metanome/frontend/client/algorithms/AlgorithmEditForm.java b/frontend/src/main/java/de/metanome/frontend/client/algorithms/AlgorithmEditForm.java
@@ -16,6 +16,7 @@
 
 package de.metanome.frontend.client.algorithms;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.Button;
@@ -118,7 +119,7 @@ public void updateFileListBox() {
     MethodCallback<List<Algorithm>> databaseCallback = getDatabaseCallback();
 
 
-    AlgorithmRestService restService = com.google.gwt.core.client.GWT.create(AlgorithmRestService.class);
+    AlgorithmRestService restService = GWT.create(AlgorithmRestService.class);
     restService.listAvailableAlgorithmFiles(storageCallback);
     restService.listAlgorithms(databaseCallback);
   }

diff --git a/frontend/src/main/java/de/metanome/frontend/client/algorithms/AlgorithmsPage.java b/frontend/src/main/java/de/metanome/frontend/client/algorithms/AlgorithmsPage.java
@@ -16,6 +16,7 @@
 
 package de.metanome.frontend.client.algorithms;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.Button;
@@ -55,7 +56,7 @@ public class AlgorithmsPage extends FlowPanel implements TabContent {
   protected AlgorithmEditForm editForm;
 
   public AlgorithmsPage(BasePage parent) {
-    this.restService = com.google.gwt.core.client.GWT.create(AlgorithmRestService.class);
+    this.restService = GWT.create(AlgorithmRestService.class);
 
     this.basePage = parent;
 

diff --git a/frontend/src/main/java/de/metanome/frontend/client/input_fields/DatabaseConnectionInput.java b/frontend/src/main/java/de/metanome/frontend/client/input_fields/DatabaseConnectionInput.java
@@ -16,6 +16,8 @@
 
 package de.metanome.frontend.client.input_fields;
 
+import com.google.gwt.core.client.GWT;
+
 import de.metanome.algorithm_integration.AlgorithmConfigurationException;
 import de.metanome.algorithm_integration.configuration.ConfigurationSettingDataSource;
 import de.metanome.algorithm_integration.configuration.ConfigurationSettingDatabaseConnection;
@@ -84,8 +86,7 @@ public void onSuccess(Method method, List<DatabaseConnection> databaseConnection
       };
 
     DatabaseConnectionRestService
-        databaseConnectionService =
-        com.google.gwt.core.client.GWT.create(DatabaseConnectionRestService.class);
+        databaseConnectionService = GWT.create(DatabaseConnectionRestService.class);
     databaseConnectionService.listDatabaseConnections(callback);
 
   }

diff --git a/frontend/src/test/java/de/metanome/frontend/client/results/GwtTestResultsPage.java b/frontend/src/test/java/de/metanome/frontend/client/results/GwtTestResultsPage.java
@@ -22,6 +22,8 @@
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.TabLayoutPanel;
 
+import de.metanome.backend.results_db.Algorithm;
+import de.metanome.backend.results_db.Execution;
 import de.metanome.frontend.client.BasePage;
 import de.metanome.frontend.client.TabWrapper;
 import de.metanome.frontend.client.TestHelper;
@@ -112,6 +114,9 @@ public void testUpdateOnSuccess() {
     // Set up
     TestHelper.resetDatabaseSync();
 
+    Algorithm algorithm = new Algorithm("example_basic_statistic.jar");
+    Execution execution = new Execution(algorithm);
+
     BasePage parent = new BasePage();
     ResultsPage page = new ResultsPage(parent);
     page.setMessageReceiver(new TabWrapper());
@@ -121,12 +126,12 @@ public void testUpdateOnSuccess() {
 
     // Expected Values
     // Execute
-    page.updateOnSuccess(null, (long) 4543);
+    page.updateOnSuccess(execution, (long) 4543);
 
     // Check
     assertEquals(2, page.getWidgetCount());
     assertTrue(page.getWidget(1) instanceof TabLayoutPanel);
-    assertEquals(2, ((TabLayoutPanel) page.getWidget(1)).getWidgetCount());
+    assertEquals(1, ((TabLayoutPanel) page.getWidget(1)).getWidgetCount());
 
     // Cleanup
     TestHelper.resetDatabaseSync();