aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2011-12-15 12:27:17 +0200
committerArtur Signell <artur@vaadin.com>2011-12-15 12:32:54 +0200
commita1f4db52ebeac5e7440e812fb29a63588ab2a0df (patch)
tree29ecebc2b43500cbb2a178bc64638228428175f5
parentdd55c95717e7e7e7ffccb6844dda23970ce5a83f (diff)
downloadvaadin-framework-a1f4db52ebeac5e7440e812fb29a63588ab2a0df.tar.gz
vaadin-framework-a1f4db52ebeac5e7440e812fb29a63588ab2a0df.zip
Removed extra IntegerValidator for a field with an Integer property data
source. Corrected assertion in the test as converter throws the exception and not an IntegerValidator anymore
-rw-r--r--tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html4
-rw-r--r--tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java2
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html
index 29ad93c6c6..b033a4c9e0 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html
@@ -45,12 +45,12 @@
<tr>
<td>assertText</td>
<td>vaadin=runcomvaadintestscomponentsdatefieldCommitInvalid::PID_SLog_row_2</td>
- <td>4. Commit failed : Not an integer</td>
+ <td>4. Commit failed : Could not convert '42f' to java.lang.Integer</td>
</tr>
<tr>
<td>assertText</td>
<td>vaadin=runcomvaadintestscomponentsdatefieldCommitInvalid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/domChild[0]/domChild[2]/domChild[0]</td>
- <td>Not an integer</td>
+ <td>Could not convert '42f' to java.lang.Integer</td>
</tr>
<tr>
<td>assertText</td>
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java
index 36ee068af4..1395b4d735 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java
@@ -6,7 +6,6 @@ import java.util.Locale;
import com.vaadin.data.Validator.InvalidValueException;
import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.validator.IntegerValidator;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
@@ -64,7 +63,6 @@ public class CommitInvalid extends TestBase {
*/
integerProperty = new ObjectProperty<Integer>(42);
integerField = new TextField("Another Field", integerProperty);
- integerField.addValidator(new IntegerValidator("Not an integer"));
integerField.setDebugId("_IF");
form.addField("text", integerField);