Fixed test

AbstractField.setPropertyDataSource throws SourceException and not ConversionException

Change-Id: I286f32f87b4020e976a8f1e4e023eca11df1cdfa

diff --git a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.html b/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.html
index 67964d9fb212b8d71d8939e97b5c7518bf2ffe7f..6975ef84d479ecedc11ac33eddea72feb91082a1 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.html
+++ b/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.html
@@ -19,7 +19,7 @@
 <tr>
        <td>assertText</td>
        <td>label</td>
-       <td>no ConversionException</td>
+       <td>no Exception</td>
 </tr>
 <tr>
        <td>assertElementPresent</td>
@@ -34,7 +34,7 @@
 <tr>
        <td>assertText</td>
        <td>label</td>
-       <td>no ConversionException</td>
+       <td>no Exception</td>
 </tr>
 <tr>
        <td>assertElementNotPresent</td>
@@ -49,7 +49,7 @@
 <tr>
        <td>assertText</td>
        <td>label</td>
-       <td>ConversionException caught</td>
+       <td>Exception caught</td>
 </tr>
 <tr>
        <td>assertElementPresent</td>
@@ -64,7 +64,7 @@
 <tr>
        <td>assertText</td>
        <td>label</td>
-       <td>no ConversionException</td>
+       <td>no Exception</td>
 </tr>
 <tr>
        <td>assertElementNotPresent</td>
@@ -79,7 +79,7 @@
 <tr>
        <td>assertText</td>
        <td>label</td>
-       <td>ConversionException caught</td>
+       <td>Exception caught</td>
 </tr>
 <tr>
        <td>assertElementPresent</td>

diff --git a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java b/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java
index dbdd810440eccc5346d51575ace0b40c5398a2a1..f6eb8935284346cab797d964e75d2951ee955fd2 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java
+++ b/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java
@@ -4,8 +4,8 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.vaadin.data.Buffered.SourceException;
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.tests.components.AbstractTestUI;
@@ -70,12 +70,12 @@ public class SetDataSourceWithPropertyIds extends AbstractTestUI {
         try {
             table.setContainerDataSource(jobContainer);
             table.setVisibleColumns(new String[] { "jobId" });
-            label.setValue("no ConversionException");
-        } catch (ConversionException e) {
+            label.setValue("no Exception");
+        } catch (SourceException e) {
             ArrayList<String> propertyIds = new ArrayList<String>();
             propertyIds.add("jobId");
             table.setContainerDataSource(jobContainer, propertyIds);
-            label.setValue("ConversionException caught");
+            label.setValue("Exception caught");
         }
     }