Move test component out of main source folder

diff --git a/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldExtensionConnector.java b/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldExtensionConnector.java
index ff444fece56d08609627b94debf4f3d266db6439..7185397f9451e287fd2c0e4f08c8a76c741c8c21 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldExtensionConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldExtensionConnector.java
@@ -10,7 +10,7 @@ import com.vaadin.terminal.gwt.client.VConsole;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.ui.AbstractConnector;
 import com.vaadin.terminal.gwt.client.ui.Connect;
-import com.vaadin.ui.HelloWorldExtension;
+import com.vaadin.tests.extensions.HelloWorldExtension;
 
 @Connect(HelloWorldExtension.class)
 public class HelloWorldExtensionConnector extends AbstractConnector {

diff --git a/src/com/vaadin/ui/HelloWorldExtension.java b/src/com/vaadin/ui/HelloWorldExtension.java
deleted file mode 100644 (file)
index e705954..0000000
--- a/src/com/vaadin/ui/HelloWorldExtension.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-package com.vaadin.ui;
-
-import com.vaadin.terminal.AbstractExtension;
-import com.vaadin.terminal.gwt.client.ui.helloworldfeature.GreetAgainRpc;
-import com.vaadin.terminal.gwt.client.ui.helloworldfeature.HelloWorldRpc;
-import com.vaadin.terminal.gwt.client.ui.helloworldfeature.HelloWorldState;
-
-public class HelloWorldExtension extends AbstractExtension {
-
-    public HelloWorldExtension() {
-        registerRpc(new HelloWorldRpc() {
-            public void onMessageSent(String message) {
-                Notification.show(message);
-            }
-        });
-    }
-
-    @Override
-    public HelloWorldState getState() {
-        return (HelloWorldState) super.getState();
-    }
-
-    public void setGreeting(String greeting) {
-        getState().setGreeting(greeting);
-        requestRepaint();
-    }
-
-    public String getGreeting() {
-        return getState().getGreeting();
-    }
-
-    public void greetAgain() {
-        getRpcProxy(GreetAgainRpc.class).greetAgain();
-    }
-}

diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java
new file mode 100644 (file)
index 0000000..d0f0994
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java
@@ -0,0 +1,39 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.tests.extensions;
+
+import com.vaadin.terminal.AbstractExtension;
+import com.vaadin.terminal.gwt.client.ui.helloworldfeature.GreetAgainRpc;
+import com.vaadin.terminal.gwt.client.ui.helloworldfeature.HelloWorldRpc;
+import com.vaadin.terminal.gwt.client.ui.helloworldfeature.HelloWorldState;
+import com.vaadin.ui.Notification;
+
+public class HelloWorldExtension extends AbstractExtension {
+
+    public HelloWorldExtension() {
+        registerRpc(new HelloWorldRpc() {
+            public void onMessageSent(String message) {
+                Notification.show(message);
+            }
+        });
+    }
+
+    @Override
+    public HelloWorldState getState() {
+        return (HelloWorldState) super.getState();
+    }
+
+    public void setGreeting(String greeting) {
+        getState().setGreeting(greeting);
+        requestRepaint();
+    }
+
+    public String getGreeting() {
+        return getState().getGreeting();
+    }
+
+    public void greetAgain() {
+        getRpcProxy(GreetAgainRpc.class).greetAgain();
+    }
+}

diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
index b56e05b2a096b63854ce547c8970253f23d817e7..167167319877c3ee28b02d5bb1f9d0765d95388e 100644 (file)
--- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
+++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
@@ -7,7 +7,6 @@ import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestRoot;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.HelloWorldExtension;
 
 public class HelloWorldExtensionTest extends AbstractTestRoot {