Don't use deprecated Assert class

Change-Id: I0dbef06d0fa319628f6fa528f5ab3adfd5752c11

diff --git a/server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java b/server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
index cc1de6560fbcc11662c2ddc0735f4ede969dd8cc..a5fee5175e694e3624624b1d82afd60d0bf027d1 100644 (file)
--- a/server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
+++ b/server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
@@ -17,8 +17,7 @@ package com.vaadin.data;
 
 import java.util.Date;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/server/tests/src/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java b/server/tests/src/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java
index a01c2dea8ff29d3c95fbf458c5702925727b1d27..3333cd77444b7d40572abc3d9420946b8eced1bf 100644 (file)
--- a/server/tests/src/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java
+++ b/server/tests/src/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java
@@ -15,8 +15,7 @@
  */
 package com.vaadin.data.fieldgroup;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class BeanFieldGroupTest {

diff --git a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.java b/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.java
index 951fc20c42188a9310a06ed2c988bb2267806647..07e36b93f91cffa899581523da9858800140b98c 100644 (file)
--- a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.java
+++ b/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.java
@@ -17,8 +17,7 @@ package com.vaadin.data.fieldgroup;
 
 import java.util.Date;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/server/tests/src/com/vaadin/data/util/AbstractContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractContainerTest.java
index 81c90ba07bc3af3b86ec0b895adac10c2d02448a..a443499a8921caecef93885a3c62fbd11bbbe6dc 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/AbstractContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractContainerTest.java
@@ -3,9 +3,10 @@ package com.vaadin.data.util;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.vaadin.data.Container;
 import com.vaadin.data.Container.Filterable;
 import com.vaadin.data.Container.ItemSetChangeEvent;

diff --git a/server/tests/src/com/vaadin/data/util/BeanContainerTest.java b/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
index a6c3bb0b8bd3406adaf1a3da30a81c008916c3c4..4e0e98ec43436bdc50839e0c04063a315342c958 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;

diff --git a/server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java b/server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java
index 346e931f6178d69726061ebb1810ebcd942e5a88..4f4e35258f66921db06df26dc56250562f260ff9 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java
@@ -7,8 +7,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class BeanItemContainerSortTest {

diff --git a/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java b/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
index c7d992dbeb456e19015e71e46cfea64aedd5a552..b58d962d960452aefdeb2f76a635c7330b236048 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
@@ -8,7 +8,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;

diff --git a/server/tests/src/com/vaadin/data/util/BeanItemTest.java b/server/tests/src/com/vaadin/data/util/BeanItemTest.java
index e1ad75796ce25597f2d6ac950abc3c342a8c0b14..b458856826331a7b2cfa7403d4459ded1df91674 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/BeanItemTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemTest.java
@@ -9,9 +9,10 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 /**
  * Test BeanItem specific features.
  * 

diff --git a/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java b/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java
index 35335edd232f90c74b6cb3c8a6289526475cb965..1c49017bf1603a4472a9f6d2f40cfcdece34b0bc 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java
+++ b/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java
@@ -6,9 +6,10 @@ import java.util.Collections;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 public class PerformanceTestIndexedContainer extends TestCase {
 
     private static final int REPEATS = 10;

diff --git a/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java b/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java
index 12ded84fe229e8aebe0e4f333d8bffa4be799ca8..68861536a9f38eab18e8e91e4670304b093ba329 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java
+++ b/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java
@@ -7,9 +7,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.vaadin.data.Property;
 import com.vaadin.data.util.NestedMethodPropertyTest.Person;
 

diff --git a/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java b/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java
index a3169332ec3f04643244e11cd787a3ef64e86f2a..ff83db4437f0fec683205af63116fc7fad6bf80f 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java
+++ b/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java
@@ -2,10 +2,10 @@ package com.vaadin.data.util;
 
 import java.util.Iterator;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.easymock.EasyMock;
+import org.junit.Assert;
 
 import com.vaadin.data.Item.PropertySetChangeEvent;
 import com.vaadin.data.Item.PropertySetChangeListener;

diff --git a/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java b/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
index 09e5a26c155269b45922f459d564dfb5d1be4d3d..eacee7e30165f8fccf6def3b2fbae9a860e537b7 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
+++ b/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
@@ -2,7 +2,7 @@ package com.vaadin.data.util;
 
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.vaadin.data.Item;
 

diff --git a/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
index fdd5b8a6451eeeaad57a22f193ee3868d692848c..e5bc622e39f36a8a028f3d67cb80ff0009bd3a3a 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.data.util.filter;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;

diff --git a/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
index b7ccd68429e795033f0587932a0ab4ce32914cc5..732a541c89ec05e2bd99bdf835bfef799be8c04a 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
@@ -3,7 +3,7 @@ package com.vaadin.data.util.filter;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;

diff --git a/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
index 6f90273de10f8c09fa6f10684df954c9075bc3e0..d3e959e069d0c096d299f8ec17ad4b670caebd57 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.data.util.filter;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;

diff --git a/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java
index b0c96b6f9ccd549ef5a8a38f7a1de31658521496..0fcbd26b8eeda2f1a16421b32150df52dc41a65a 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.data.util.filter;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.util.ObjectProperty;

diff --git a/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
index c3b666e6f704de328c73ef78f896f10173b8263b..966ffd3a6ea1ac8c720efd255dbb31a3f08645ad 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.data.util.filter;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;

diff --git a/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
index bc63d57752584ab9fa4ea671e4dd78d1e6cb5cd6..eb7dff60150ea6be5978490fbf83672cb465a1f7 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.data.util.filter;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 public class SimpleStringFilterTest extends
         AbstractFilterTest<SimpleStringFilter> {

diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
index 63716bb33b9e3148c3eee52bdef8a89acd643f36..248dc62d93251ec83663e04cef7dce8513c66cde 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
@@ -1,7 +1,6 @@
 package com.vaadin.data.util.sqlcontainer;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class ReadOnlyRowIdTest {

diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java
index 0187f9068e8e47b89dfb9a04509309606837c7b8..a575d649f1d71b8b7a640142780701697ab41abe 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java
@@ -1,7 +1,6 @@
 package com.vaadin.data.util.sqlcontainer;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class UtilTest {

diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
index 65a995120e6b1d56c751396ac80c4f0a314c8aa8..1463a27217fbbdc44b65568d921349c826cc8adb 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
@@ -7,9 +7,8 @@ import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
-import junit.framework.Assert;
-
 import org.easymock.EasyMock;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class J2EEConnectionPoolTest {

diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
index 541ab8da5b0fc284f75ed43da1942fd490405186..99ad420229c4e347fe7fde803603d6d8aa0524d4 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
@@ -3,9 +3,8 @@ package com.vaadin.data.util.sqlcontainer.connection;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import junit.framework.Assert;
-
 import org.easymock.EasyMock;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
index da4cfe4522f2c3ed8c383f2217d63570686ff466..16171f67bcee6d10d7331a7fdd9d05cebd888088 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
@@ -1,8 +1,7 @@
 package com.vaadin.data.util.sqlcontainer.filters;
 
-import junit.framework.Assert;
-
 import org.easymock.EasyMock;
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.data.Item;

diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
index f635b23ebd2f0c2eb51e5ed8046e23b84bd643e1..596f28cf5e06ea69d25d9e76c03d20edc8217baa 100644 (file)
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
@@ -2,9 +2,8 @@ package com.vaadin.data.util.sqlcontainer.query;
 
 import java.util.ArrayList;
 
-import junit.framework.Assert;
-
 import org.easymock.EasyMock;
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.data.Container.Filter;

diff --git a/server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.java b/server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.java
index a5c683a119d8136b6bbb985bf678ad4657909222..65698d2c44ba923d9a12aaac0d0ff78b3b535e19 100644 (file)
--- a/server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.java
+++ b/server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.java
@@ -24,9 +24,8 @@ import java.util.Properties;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
-import junit.framework.Assert;
-
 import org.easymock.EasyMock;
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.annotations.VaadinServletConfiguration;

diff --git a/server/tests/src/com/vaadin/server/VaadinSessionTest.java b/server/tests/src/com/vaadin/server/VaadinSessionTest.java
index d39da211f46005bce1e93deb5c4abb4a08095886..b710ee483f6c86cc482b67f259b235cc6eb1d514 100644 (file)
--- a/server/tests/src/com/vaadin/server/VaadinSessionTest.java
+++ b/server/tests/src/com/vaadin/server/VaadinSessionTest.java
@@ -23,9 +23,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionBindingEvent;
 
-import junit.framework.Assert;
-
 import org.easymock.EasyMock;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToLongConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestStringToLongConverter.java
index 3210703445cc4061ce1ba78bf19a6dedd2505e7f..0e95975c171dbc46ca1aa74a0ef8556dc864978d 100644 (file)
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToLongConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestStringToLongConverter.java
@@ -2,9 +2,10 @@ package com.vaadin.tests.data.converter;
 
 import java.util.Locale;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToLongConverter;

diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java
index 85116dd152a5eb92859cc53efc071560fd0082cb..beb32e7dba8cc5d55a18f9aa506d12aed75001ca 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.server.component.abstractfield;
 
 import java.util.Locale;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.data.util.MethodProperty;

diff --git a/server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignment.java b/server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignment.java
index 2faa65d1f2464202799962a71a6e71d71df36efc..244f1f9e45dfe9c605fc6aad1cd9e23eda8547de 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignment.java
+++ b/server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignment.java
@@ -1,7 +1,6 @@
 package com.vaadin.tests.server.component.gridlayout;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignment.java b/server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignment.java
index 701373aba0b5d170f6d379711d8c1954d2fcf6f7..9497a13c0a2922c51edf00c85d93a9f35926bd74 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignment.java
+++ b/server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignment.java
@@ -1,7 +1,6 @@
 package com.vaadin.tests.server.component.orderedlayout;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java b/server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java
index d1dd87d923d95cc241ea53cc16f756294f0e80bb..f568da1392206984af0020b63fad88776db44025 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java
@@ -1,8 +1,9 @@
 package com.vaadin.tests.server.component.slider;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.vaadin.ui.Slider;
 import com.vaadin.ui.Slider.ValueOutOfBoundsException;
 
@@ -11,9 +12,9 @@ public class SliderTest extends TestCase {
     public void testOutOfBounds() {
         Slider s = new Slider(0, 10);
         s.setValue(0.0);
-        Assert.assertEquals(0.0, s.getValue());
+        Assert.assertEquals(0.0, s.getValue().doubleValue(), 0.001);
         s.setValue(10.0);
-        Assert.assertEquals(10.0, s.getValue());
+        Assert.assertEquals(10.0, s.getValue().doubleValue(), 0.001);
         try {
             s.setValue(20.0);
             fail("Should throw out of bounds exception");

diff --git a/server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCauses.java b/server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCauses.java
index 7a7b488bc095f43beb1cb135b3efd2dc207f62f7..beb5da088566c34e7cb2dccd4d8dc6d08a4db866 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCauses.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCauses.java
@@ -16,8 +16,7 @@
 
 package com.vaadin.tests.server.component.table;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.ui.Table;

diff --git a/server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java b/server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java
index de838e339c74ac5a327fdf6f286b09f8c4eed6d1..7c47b94df4b7d5359a46ef12c760b206c56990ea 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java
+++ b/server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java
@@ -3,9 +3,8 @@ package com.vaadin.tests.server.components;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
-
 import org.easymock.EasyMock;
+import org.junit.Assert;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.util.ObjectProperty;

diff --git a/server/tests/src/com/vaadin/tests/util/TestUtil.java b/server/tests/src/com/vaadin/tests/util/TestUtil.java
index e84f9dd8b954eff9994579170dd5ed5e9622b986..88ed017f915f3468f348203eb879834bf1c65ce6 100644 (file)
--- a/server/tests/src/com/vaadin/tests/util/TestUtil.java
+++ b/server/tests/src/com/vaadin/tests/util/TestUtil.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.util;
 
 import java.util.Iterator;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 public class TestUtil {
     public static void assertArrays(Object[] actualObjects,

diff --git a/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java b/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java
index ff615e3d91b5f98dcdef436a1a916e39552589a8..fa69fc46da9403c12437d359075bc0051f7dd017 100644 (file)
--- a/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java
+++ b/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java
@@ -3,8 +3,7 @@ package com.vaadin.ui;
 import java.text.NumberFormat;
 import java.util.Locale;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;