From f4dd107919715cf18c92709de1909315de92934a Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 19 Dec 2012 14:46:33 +0200
Subject: [PATCH] Fixed test

AbstractField.setPropertyDataSource throws SourceException and not ConversionException

Change-Id: I286f32f87b4020e976a8f1e4e023eca11df1cdfa
---
 .../components/table/SetDataSourceWithPropertyIds.html | 10 +++++-----
 .../components/table/SetDataSourceWithPropertyIds.java |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.html b/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.html
index 67964d9fb2..6975ef84d4 100644
--- 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 dbdd810440..f6eb893528 100644
--- 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");
         }
     }
 
-- 
2.39.5