2 files changed, 32 insertions, 26 deletions
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupTests.java b/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupTests.java
new file mode 100644
index 0000000000..c4a3d73652
--- /dev/null
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupTests.java
@@ -0,0 +1,32 @@
+package com.vaadin.tests.server.component.abstractselect;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collection;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.vaadin.ui.OptionGroup;
+
+public class OptionGroupTests {
+
+    private OptionGroup optionGroup;
+
+    @Before
+    public void setup() {
+        optionGroup = new OptionGroup();
+    }
+
+    @Test
+    public void itemsAreAdded() {
+        optionGroup.addItems("foo", "bar");
+
+        Collection<?> itemIds = optionGroup.getItemIds();
+
+        assertEquals(2, itemIds.size());
+        assertTrue(itemIds.contains("foo"));
+        assertTrue(itemIds.contains("bar"));
+    }
+}
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestVarargsItemAddition.java b/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestVarargsItemAddition.java
deleted file mode 100644
index 5575b8fd3d..0000000000
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestVarargsItemAddition.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.vaadin.tests.server.component.abstractselect;
-
-import java.util.Collection;
-
-import junit.framework.TestCase;
-
-import org.junit.Assert;
-
-import com.vaadin.ui.OptionGroup;
-
-public class TestVarargsItemAddition extends TestCase {
-
-    public void itemAddition() throws Exception {
-
-        OptionGroup optionGroup = new OptionGroup();
-
-        optionGroup.addItems("foo", "bar", "car");
-
-        Collection<?> itemIds = optionGroup.getItemIds();
-        Assert.assertEquals(3, itemIds.size());
-        Assert.assertTrue(itemIds.contains("foo"));
-        Assert.assertTrue(itemIds.contains("bar"));
-        Assert.assertTrue(itemIds.contains("car"));
-
-    }
-}