summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java16
-rw-r--r--tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml2
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java b/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java
index 44a6a3b66d..e98be99cbc 100644
--- a/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java
@@ -31,8 +31,8 @@ public class TestClassesSerializable extends TestCase {
"com\\.vaadin\\.demo\\..*", //
"com\\.vaadin\\.external\\.org\\.apache\\.commons\\.fileupload\\..*", //
"com\\.vaadin\\.launcher\\..*", //
- "com\\.vaadin\\.terminal\\.gwt\\.client\\..*", //
- "com\\.vaadin\\.terminal\\.gwt\\.widgetsetutils\\..*", //
+ "com\\.vaadin\\.client\\..*", //
+ "com\\.vaadin\\.server\\.widgetsetutils\\..*", //
"com\\.vaadin\\.tests\\..*", // exclude automated tests
"com\\.vaadin\\.tools\\..*", //
"com\\.vaadin\\.ui\\.themes\\..*", //
@@ -40,15 +40,15 @@ public class TestClassesSerializable extends TestCase {
"com\\.vaadin\\.event\\.FieldEvents", //
"com\\.vaadin\\.event\\.LayoutEvents", //
"com\\.vaadin\\.event\\.MouseEvents", //
- "com\\.vaadin\\.terminal\\.gwt\\.server\\.AbstractApplicationPortlet", //
- "com\\.vaadin\\.terminal\\.gwt\\.server\\.ApplicationPortlet2", //
- "com\\.vaadin\\.terminal\\.gwt\\.server\\.Constants", //
+ "com\\.vaadin\\.server\\.AbstractApplicationPortlet", //
+ "com\\.vaadin\\.server\\.ApplicationPortlet2", //
+ "com\\.vaadin\\.server\\.Constants", //
"com\\.vaadin\\.util\\.SerializerHelper", // fully static
// class level filtering, also affecting nested classes and
// interfaces
- "com\\.vaadin\\.terminal\\.gwt\\.server\\.AbstractCommunicationManager.*", //
- "com\\.vaadin\\.terminal\\.gwt\\.server\\.CommunicationManager.*", //
- "com\\.vaadin\\.terminal\\.gwt\\.server\\.PortletCommunicationManager.*", //
+ "com\\.vaadin\\.server\\.AbstractCommunicationManager.*", //
+ "com\\.vaadin\\.server\\.CommunicationManager.*", //
+ "com\\.vaadin\\.server\\.PortletCommunicationManager.*", //
};
/**
diff --git a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml b/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
index bd91d05b02..c127d3bb21 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
+++ b/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
@@ -2,5 +2,5 @@
<!-- WS Compiler: manually edited -->
<!-- Inherit the DefaultWidgetSet -->
- <inherits name="com.vaadin.terminal.gwt.DefaultWidgetSet" />
+ <inherits name="com.vaadin.DefaultWidgetSet" />
</module>