#58 test csv input to setting, plus renaming

HPI-Information-Systems · May 25, 2014 · 896052e · 896052e
1 parent 6b3aea4
commit 896052e
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/...end/src/main/java/de/uni_potsdam/hpi/metanome/frontend/client/parameter/CsvFileInput.java b/...end/src/main/java/de/uni_potsdam/hpi/metanome/frontend/client/parameter/CsvFileInput.java
@@ -117,7 +117,7 @@ public CsvFileInput(ConfigurationSettingCsvFile csvSetting, boolean optional) {
         this.separatorTextbox.setValue("" + csvSetting.getSeparatorChar());
         this.quoteTextbox.setValue("" + csvSetting.getQuoteChar());
         this.escapeTextbox.setValue("" + csvSetting.getEscapeChar());
-        this.skiplinesIntegerbox.setValue(csvSetting.getLine());
+        this.skiplinesIntegerbox.setValue(csvSetting.getSkipLines());
         this.strictQuotesCheckbox.setValue(csvSetting.isStrictQuotes());
         this.ignoreLeadingWhiteSpaceCheckbox.setValue(csvSetting.isIgnoreLeadingWhiteSpace());
         this.headerCheckbox.setValue(csvSetting.hasHeader());
@@ -238,9 +238,9 @@ protected ConfigurationSettingCsvFile setCurrentValues(ConfigurationSettingCsvFi
             configSetting.setHeader(this.headerCheckbox.getValue());
             configSetting.setSkipDifferingLines(this.skipDifferingLinesCheckbox.getValue());
             if (this.skiplinesIntegerbox.getValue() != null)
-                configSetting.setLine(this.skiplinesIntegerbox.getValue());
+                configSetting.setSkipLines(this.skiplinesIntegerbox.getValue());
             else
-                configSetting.setLine(0);
+                configSetting.setSkipLines(0);
         }
 
         return configSetting;

diff --git a/...t/java/de/uni_potsdam/hpi/metanome/frontend/client/parameter/GwtTestCsvFileParameter.java b/...t/java/de/uni_potsdam/hpi/metanome/frontend/client/parameter/GwtTestCsvFileParameter.java
@@ -134,7 +134,45 @@ public void testAdvancedDefaultEntries() {
 		assertEquals(false, widget.skipDifferingLinesCheckbox.getValue().booleanValue());
 	}
 
+	@Test 
+	public void testRetrieveAdvancedValues() throws InputValidationException {
+		boolean boolValue = true;
+		String charValue = "t";
+		int intValue = 2;
+		ConfigurationSpecificationCsvFile configSpec = new ConfigurationSpecificationCsvFile("spec_id");
+		InputParameterCsvFileWidget widget = new InputParameterCsvFileWidget(configSpec);
+		CsvFileInput input = widget.inputWidgets.get(0);
+		String filename = "someCSVfile";
+		input.listbox.insertItem(filename, 1);
+
+		input.listbox.setSelectedIndex(1);
+		input.advancedCheckbox.setValue(true, true);
+		input.escapeTextbox.setValue(charValue);	
+		input.skiplinesIntegerbox.setValue(intValue);
+		input.separatorTextbox.setValue(charValue);
+		input.quoteTextbox.setValue(charValue);
+		input.strictQuotesCheckbox.setValue(boolValue);
+		input.ignoreLeadingWhiteSpaceCheckbox.setValue(boolValue);
+		input.headerCheckbox.setValue(boolValue);
+		input.skipDifferingLinesCheckbox.setValue(boolValue);	
+
+		ConfigurationSettingCsvFile setting = widget.getUpdatedSpecification().getSettings()[0];
+
+		assertEquals(setting.getFileName(), filename);		
+		assertEquals(setting.isAdvanced(), true);
+		assertEquals(setting.getEscapeChar(), charValue.charAt(0));
+		assertEquals(setting.getSkipLines(), intValue);
+		assertEquals(setting.getSeparatorChar(), charValue.charAt(0));
+		assertEquals(setting.getQuoteChar(), charValue.charAt(0));
+		assertEquals(setting.isStrictQuotes(), boolValue);
+		assertEquals(setting.isIgnoreLeadingWhiteSpace(), boolValue);
+		assertEquals(setting.hasHeader(), boolValue);
+		assertEquals(setting.isSkipDifferingLines(), boolValue);
+
+
+	}
 
+
 	@Override
 	public String getModuleName() {
 		return "de.uni_potsdam.hpi.metanome.frontend.Metanome";

diff --git a/...src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/parameter/GwtTestParameter.java b/...src/test/java/de/uni_potsdam/hpi/metanome/frontend/client/parameter/GwtTestParameter.java
@@ -218,7 +218,7 @@ public void testCsvFileWidget() throws InputValidationException {
         assertEquals(characterString.charAt(0), csvSpec.getSeparatorChar());
         assertEquals(characterString.charAt(0), csvSpec.getQuoteChar());
         assertEquals(characterString.charAt(0), csvSpec.getEscapeChar());
-        assertEquals(line, csvSpec.getLine());
+        assertEquals(line, csvSpec.getSkipLines());
         assertEquals(boolTrue, csvSpec.isStrictQuotes());
         assertEquals(boolTrue, csvSpec.isIgnoreLeadingWhiteSpace());
     }