Moved enums to avoid running them as tests

Change-Id: I52cbd9582345a3c0d49caf2ad265a659bf3fe0f1

diff --git a/server/tests/src/com/vaadin/tests/data/bean/AnotherTestEnum.java b/server/tests/src/com/vaadin/tests/data/bean/AnotherTestEnum.java
new file mode 100644 (file)
index 0000000..fc8f22a
--- /dev/null
+++ b/server/tests/src/com/vaadin/tests/data/bean/AnotherTestEnum.java
@@ -0,0 +1,16 @@
+package com.vaadin.tests.data.bean;
+
+public enum AnotherTestEnum {
+    ONE("ONE"), TWO("TWO");
+
+    private String id;
+
+    private AnotherTestEnum(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return id;
+    }
+}

diff --git a/server/tests/src/com/vaadin/tests/data/bean/TestEnum.java b/server/tests/src/com/vaadin/tests/data/bean/TestEnum.java
new file mode 100644 (file)
index 0000000..bf6f721
--- /dev/null
+++ b/server/tests/src/com/vaadin/tests/data/bean/TestEnum.java
@@ -0,0 +1,16 @@
+package com.vaadin.tests.data.bean;
+
+public enum TestEnum {
+    ONE("1"), TWO("2");
+
+    private String id;
+
+    private TestEnum(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return id;
+    }
+}

diff --git a/server/tests/src/com/vaadin/tests/data/converter/AnotherTestEnum.java b/server/tests/src/com/vaadin/tests/data/converter/AnotherTestEnum.java
deleted file mode 100644 (file)
index 33a6a87..0000000
--- a/server/tests/src/com/vaadin/tests/data/converter/AnotherTestEnum.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.vaadin.tests.data.converter;
-
-public enum AnotherTestEnum {
-    ONE("ONE"), TWO("TWO");
-
-    private String id;
-
-    private AnotherTestEnum(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public String toString() {
-        return id;
-    }
-}

diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.java
index baa81ce65658e99acfeb928c6520cb10774d9b07..c267e012e820b40b04d49cfc4c993efbc07399a3 100644 (file)
--- a/server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.java
@@ -25,6 +25,8 @@ import org.junit.Test;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.ReverseConverter;
+import com.vaadin.tests.data.bean.AnotherTestEnum;
+import com.vaadin.tests.data.bean.TestEnum;
 import com.vaadin.ui.TextField;
 
 public class TestAnyEnumToStringConverter {

diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestEnum.java b/server/tests/src/com/vaadin/tests/data/converter/TestEnum.java
deleted file mode 100644 (file)
index a4b709a..0000000
--- a/server/tests/src/com/vaadin/tests/data/converter/TestEnum.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.vaadin.tests.data.converter;
-
-public enum TestEnum {
-    ONE("1"), TWO("2");
-
-    private String id;
-
-    private TestEnum(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public String toString() {
-        return id;
-    }
-}

diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.java
index ef8c57f7f1f52decfa619d986e8706e7534224f8..93dbe96b56904129b747b9f74214b71b619e9694 100644 (file)
--- a/server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.java
@@ -25,6 +25,8 @@ import org.junit.Test;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.ReverseConverter;
+import com.vaadin.tests.data.bean.AnotherTestEnum;
+import com.vaadin.tests.data.bean.TestEnum;
 import com.vaadin.ui.TextField;
 
 public class TestSpecificEnumToStringConverter {