From 399b4cb789f4d898e84dfb386b8ad45af5cee7d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Tue, 26 Jun 2012 15:25:28 +0300 Subject: [PATCH] Move test extension out of main source folder --- .../com/vaadin/tests/extensions/HelloWorldExtension.java | 6 +++--- .../vaadin/tests/extensions/HelloWorldExtensionTest.java | 2 ++ .../widgetset/client}/helloworldfeature/GreetAgainRpc.java | 2 +- .../helloworldfeature/HelloWorldExtensionConnector.java | 6 +++--- .../widgetset/client}/helloworldfeature/HelloWorldRpc.java | 2 +- .../client}/helloworldfeature/HelloWorldState.java | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) rename {src/com/vaadin/terminal/gwt/client/ui => tests/testbench/com/vaadin/tests/widgetset/client}/helloworldfeature/GreetAgainRpc.java (75%) rename {src/com/vaadin/terminal/gwt/client/ui => tests/testbench/com/vaadin/tests/widgetset/client}/helloworldfeature/HelloWorldExtensionConnector.java (85%) rename {src/com/vaadin/terminal/gwt/client/ui => tests/testbench/com/vaadin/tests/widgetset/client}/helloworldfeature/HelloWorldRpc.java (77%) rename {src/com/vaadin/terminal/gwt/client/ui => tests/testbench/com/vaadin/tests/widgetset/client}/helloworldfeature/HelloWorldState.java (85%) diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java index d0f0994af3..23b892be66 100644 --- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java +++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java @@ -4,9 +4,9 @@ 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.tests.widgetset.client.helloworldfeature.GreetAgainRpc; +import com.vaadin.tests.widgetset.client.helloworldfeature.HelloWorldRpc; +import com.vaadin.tests.widgetset.client.helloworldfeature.HelloWorldState; import com.vaadin.ui.Notification; public class HelloWorldExtension extends AbstractExtension { diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java index 1671673198..8625ffd955 100644 --- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java @@ -3,11 +3,13 @@ */ package com.vaadin.tests.extensions; +import com.vaadin.annotations.Widgetset; import com.vaadin.terminal.WrappedRequest; import com.vaadin.tests.components.AbstractTestRoot; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +@Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") public class HelloWorldExtensionTest extends AbstractTestRoot { @Override diff --git a/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/GreetAgainRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java similarity index 75% rename from src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/GreetAgainRpc.java rename to tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java index 0bfb8f3c32..cbfb1260e4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/GreetAgainRpc.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java @@ -1,7 +1,7 @@ /* @VaadinApache2LicenseForJavaFiles@ */ -package com.vaadin.terminal.gwt.client.ui.helloworldfeature; +package com.vaadin.tests.widgetset.client.helloworldfeature; import com.vaadin.terminal.gwt.client.communication.ClientRpc; diff --git a/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldExtensionConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java similarity index 85% rename from src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldExtensionConnector.java rename to tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java index 7185397f94..d2066c53c8 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldExtensionConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java @@ -1,19 +1,19 @@ /* @VaadinApache2LicenseForJavaFiles@ */ -package com.vaadin.terminal.gwt.client.ui.helloworldfeature; +package com.vaadin.tests.widgetset.client.helloworldfeature; import com.google.gwt.user.client.Window; import com.vaadin.terminal.gwt.client.ServerConnector; import com.vaadin.terminal.gwt.client.Util; 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.extensions.AbstractExtensionConnector; import com.vaadin.terminal.gwt.client.ui.Connect; import com.vaadin.tests.extensions.HelloWorldExtension; @Connect(HelloWorldExtension.class) -public class HelloWorldExtensionConnector extends AbstractConnector { +public class HelloWorldExtensionConnector extends AbstractExtensionConnector { HelloWorldRpc rpc = RpcProxy.create(HelloWorldRpc.class, this); @Override diff --git a/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java similarity index 77% rename from src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldRpc.java rename to tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java index 0289713390..a7a3b091bf 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldRpc.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java @@ -1,7 +1,7 @@ /* @VaadinApache2LicenseForJavaFiles@ */ -package com.vaadin.terminal.gwt.client.ui.helloworldfeature; +package com.vaadin.tests.widgetset.client.helloworldfeature; import com.vaadin.terminal.gwt.client.communication.ServerRpc; diff --git a/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldState.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java similarity index 85% rename from src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldState.java rename to tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java index 9524a5e9aa..f26824c781 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/helloworldfeature/HelloWorldState.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java @@ -1,7 +1,7 @@ /* @VaadinApache2LicenseForJavaFiles@ */ -package com.vaadin.terminal.gwt.client.ui.helloworldfeature; +package com.vaadin.tests.widgetset.client.helloworldfeature; import com.vaadin.terminal.gwt.client.communication.SharedState; -- 2.39.5