From bfda0d0494133d504690e54a7ea52d584e5b65be Mon Sep 17 00:00:00 2001 From: Tanja Bergmann Date: Wed, 20 Aug 2014 16:04:05 +0200 Subject: [PATCH] Fixed bug in TestHelper Implementation. --- .../hpi/metanome/results_db/Input.java | 4 +++- .../client/input_fields/SqlIteratorInput.java | 2 +- .../client/TestDatabaseHelperService.java | 6 ++--- .../TestDatabaseHelperServiceAsync.java | 6 ++--- .../client/TestDatabaseHelperServiceImpl.java | 9 ++++---- .../metanome/frontend/client/TestHelper.java | 8 ++++--- .../datasources/GwtTestDataSourcePage.java | 23 +++++++++++-------- .../datasources/GwtTestTableInputField.java | 4 ++-- .../parameter/GwtTestParameterTable.java | 11 ++++----- 9 files changed, 40 insertions(+), 33 deletions(-) diff --git a/backend/src/main/java/de/uni_potsdam/hpi/metanome/results_db/Input.java b/backend/src/main/java/de/uni_potsdam/hpi/metanome/results_db/Input.java index 3a389a148..5b365dce0 100644 --- a/backend/src/main/java/de/uni_potsdam/hpi/metanome/results_db/Input.java +++ b/backend/src/main/java/de/uni_potsdam/hpi/metanome/results_db/Input.java @@ -18,6 +18,7 @@ import com.google.common.annotations.GwtIncompatible; +import java.io.Serializable; import java.util.List; import javax.persistence.Entity; @@ -33,8 +34,9 @@ */ @Entity @Inheritance(strategy = InheritanceType.JOINED) -public class Input { +public class Input implements Serializable { + private static final long serialVersionUID = 7392272000742912206L; protected long id; /** diff --git a/frontend/src/main/java/de/uni_potsdam/hpi/metanome/frontend/client/input_fields/SqlIteratorInput.java b/frontend/src/main/java/de/uni_potsdam/hpi/metanome/frontend/client/input_fields/SqlIteratorInput.java index 1eac55d8f..ab713b449 100644 --- a/frontend/src/main/java/de/uni_potsdam/hpi/metanome/frontend/client/input_fields/SqlIteratorInput.java +++ b/frontend/src/main/java/de/uni_potsdam/hpi/metanome/frontend/client/input_fields/SqlIteratorInput.java @@ -76,7 +76,7 @@ public void onSuccess(List result) { if (result != null && result.size() > 0) { for (DatabaseConnection db : result) { - String identifier = db.getId() + ": " + db.getUrl(); // TODO add system + String identifier = db.getUrl(); // TODO add system dbConnectionNames.add(identifier); databaseConnections.put(identifier, db); diff --git a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperService.java b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperService.java index 9d61820cd..3d3f269d3 100644 --- a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperService.java +++ b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperService.java @@ -22,7 +22,7 @@ import de.uni_potsdam.hpi.metanome.results_db.Algorithm; import de.uni_potsdam.hpi.metanome.results_db.DatabaseConnection; import de.uni_potsdam.hpi.metanome.results_db.FileInput; -import de.uni_potsdam.hpi.metanome.results_db.TableInput; +import de.uni_potsdam.hpi.metanome.results_db.Input; import java.util.List; @@ -44,8 +44,8 @@ public interface TestDatabaseHelperService extends RemoteService { List getAllDatabaseConnections(); - List getAllTableInputs(); + List getAllTableInputs(); - List getAllFileInputs(); + List getAllFileInputs(); } diff --git a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperServiceAsync.java b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperServiceAsync.java index a6b9287ac..101f1f051 100644 --- a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperServiceAsync.java +++ b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperServiceAsync.java @@ -21,7 +21,7 @@ import de.uni_potsdam.hpi.metanome.results_db.Algorithm; import de.uni_potsdam.hpi.metanome.results_db.DatabaseConnection; import de.uni_potsdam.hpi.metanome.results_db.FileInput; -import de.uni_potsdam.hpi.metanome.results_db.TableInput; +import de.uni_potsdam.hpi.metanome.results_db.Input; import java.util.List; @@ -40,9 +40,9 @@ public interface TestDatabaseHelperServiceAsync { void getAllDatabaseConnections(AsyncCallback> async); - void getAllTableInputs(AsyncCallback> async); + void getAllTableInputs(AsyncCallback> async); - void getAllFileInputs(AsyncCallback> async); + void getAllFileInputs(AsyncCallback> async); void storeFileInput(FileInput input, AsyncCallback async); } diff --git a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperServiceImpl.java b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperServiceImpl.java index 40e54873f..ed84ec66f 100644 --- a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperServiceImpl.java +++ b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestDatabaseHelperServiceImpl.java @@ -23,6 +23,7 @@ import de.uni_potsdam.hpi.metanome.results_db.EntityStorageException; import de.uni_potsdam.hpi.metanome.results_db.FileInput; import de.uni_potsdam.hpi.metanome.results_db.HibernateUtil; +import de.uni_potsdam.hpi.metanome.results_db.Input; import de.uni_potsdam.hpi.metanome.results_db.TableInput; import java.util.List; @@ -93,9 +94,9 @@ public List getAllDatabaseConnections() { } @Override - public List getAllTableInputs() { + public List getAllTableInputs() { try { - TableInput.retrieveAll(); + return TableInput.retrieveAll(); } catch (EntityStorageException e) { e.printStackTrace(); } @@ -103,9 +104,9 @@ public List getAllTableInputs() { } @Override - public List getAllFileInputs() { + public List getAllFileInputs() { try { - FileInput.retrieveAll(); + return FileInput.retrieveAll(); } catch (EntityStorageException e) { e.printStackTrace(); } diff --git a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestHelper.java b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestHelper.java index 12720d27a..1cd6ecf47 100644 --- a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestHelper.java +++ b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/TestHelper.java @@ -23,7 +23,7 @@ import de.uni_potsdam.hpi.metanome.results_db.Algorithm; import de.uni_potsdam.hpi.metanome.results_db.DatabaseConnection; import de.uni_potsdam.hpi.metanome.results_db.FileInput; -import de.uni_potsdam.hpi.metanome.results_db.TableInput; +import de.uni_potsdam.hpi.metanome.results_db.Input; import java.util.List; @@ -113,6 +113,7 @@ public void onFailure(Throwable caught) { @Override public void onSuccess(Long result) { database_connection_blocked[0] = false; + System.out.println("Database Connection saved!"); } }); @@ -142,6 +143,7 @@ public void onFailure(Throwable caught) { @Override public void onSuccess(Long result) { file_input_blocked[0] = false; + System.out.println("File Input saved!"); } }); @@ -168,7 +170,7 @@ public static void getAllDatabaseConnections(AsyncCallback> callback) { + public static void getAllFileInputs(AsyncCallback> callback) { testDatabaseHelperService.getAllFileInputs(callback); } @@ -176,7 +178,7 @@ public static void getAllFileInputs(AsyncCallback> callback) { * Get all table inputs synchronously. * @param callback the async callback */ - public static void getAllTableInputs(AsyncCallback> callback) { + public static void getAllTableInputs(AsyncCallback> callback) { testDatabaseHelperService.getAllTableInputs(callback); } } diff --git a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/datasources/GwtTestDataSourcePage.java b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/datasources/GwtTestDataSourcePage.java index 645d7f240..3111a0154 100644 --- a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/datasources/GwtTestDataSourcePage.java +++ b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/datasources/GwtTestDataSourcePage.java @@ -28,6 +28,7 @@ import de.uni_potsdam.hpi.metanome.results_db.DatabaseConnection; import de.uni_potsdam.hpi.metanome.results_db.EntityStorageException; import de.uni_potsdam.hpi.metanome.results_db.FileInput; +import de.uni_potsdam.hpi.metanome.results_db.Input; import de.uni_potsdam.hpi.metanome.results_db.TableInput; import java.util.List; @@ -103,7 +104,7 @@ public void run() { public void run() { // Check result TestHelper.getAllTableInputs( - new AsyncCallback>() { + new AsyncCallback>() { @Override public void onFailure(Throwable throwable) { fail(); @@ -112,8 +113,11 @@ public void onFailure(Throwable throwable) { } @Override - public void onSuccess(List con) { - assertTrue(con.contains(expectedInput[0])); + public void onSuccess(List con) { + TableInput actualInput = (TableInput) con.get(0); + assertEquals(expectedInput[0].getDatabaseConnection(), actualInput.getDatabaseConnection()); + assertEquals(expectedInput[0].getTableName(), actualInput.getTableName()); + // Cleanup TestHelper.resetDatabaseSync(); finishTest(); @@ -122,10 +126,10 @@ public void onSuccess(List con) { } }; - executeTimer.schedule(1000); - checkTimer.schedule(2000); + executeTimer.schedule(2000); + checkTimer.schedule(4000); - delayTestFinish(3000); + delayTestFinish(6000); } /** @@ -158,7 +162,7 @@ public void testStoreFileInput() throws EntityStorageException, InputValidationE @Override public void run() { TestHelper.getAllFileInputs( - new AsyncCallback>() { + new AsyncCallback>() { @Override public void onFailure(Throwable throwable) { fail(); @@ -167,9 +171,8 @@ public void onFailure(Throwable throwable) { } @Override - public void onSuccess(List con) { - FileInput input = con.get(0); - + public void onSuccess(List con) { + FileInput input = (FileInput) con.get(0); assertEquals(expectedInput.getFileName(), input.getFileName()); // Cleanup diff --git a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/datasources/GwtTestTableInputField.java b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/datasources/GwtTestTableInputField.java index 5402a9bd8..4f3c59456 100644 --- a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/datasources/GwtTestTableInputField.java +++ b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/datasources/GwtTestTableInputField.java @@ -65,9 +65,9 @@ public void run() { // Waiting four seconds for asynchronous calls to finish. // Validate, if expected and actual objects are equal - timer.schedule(1000); + timer.schedule(2000); - delayTestFinish(2000); + delayTestFinish(4000); } /** diff --git a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/parameter/GwtTestParameterTable.java b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/parameter/GwtTestParameterTable.java index 110d03805..c15cc1712 100644 --- a/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/parameter/GwtTestParameterTable.java +++ b/frontend/src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/parameter/GwtTestParameterTable.java @@ -207,12 +207,12 @@ public void run() { // Waiting for asynchronous calls to finish. executeTimer.schedule(2000); - delayTestFinish(3000); + delayTestFinish(4000); } private void setCsvFile(InputParameterCsvFileWidget widget) { for (CsvFileInput csvFileInput : widget.inputWidgets) { - csvFileInput.listbox.setSelectedValue("1: name"); + csvFileInput.listbox.setSelectedValue("name"); } } @@ -224,7 +224,7 @@ private void enterNumber(InputParameterIntegerWidget widget) { private void setDatabaseConnection(InputParameterSqlIteratorWidget widget) { for (SqlIteratorInput sqlIteratorInput : widget.inputWidgets) { - sqlIteratorInput.listbox.setSelectedValue("1: url"); + sqlIteratorInput.listbox.setSelectedValue("url"); } } @@ -378,7 +378,6 @@ public void run() { try { for (ConfigurationSpecification dataSource : pt.getConfigurationSpecificationDataSourcesWithValues()){ for (Object setting : dataSource.getSettings()) { - System.out.println(((ConfigurationSettingDataSource) setting).getValueAsString() + " vs " + primaryDataSource.getValueAsString()); if(((ConfigurationSettingDataSource) setting).getValueAsString().equals(primaryDataSource.getValueAsString())) foundDataSource = true; } @@ -401,9 +400,9 @@ public void run() { } }; // Waiting for asynchronous calls to finish. - executeTimer.schedule(1000); + executeTimer.schedule(2000); - delayTestFinish(2000); + delayTestFinish(4000); }