Use a ClassResource also in portlet 2 tests

svn changeset:21648/svn branch:6.7

diff --git a/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java b/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java
new file mode 100644 (file)
index 0000000..531397b
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java
@@ -0,0 +1,16 @@
+package com.vaadin.tests.integration;
+
+import com.vaadin.Application;
+import com.vaadin.terminal.ClassResource;
+
+public class FlagSeResource extends ClassResource {
+
+    public FlagSeResource(Application application) {
+        super("/"
+                + FlagSeResource.class
+                        .getName()
+                        .replace('.', '/')
+                        .replaceAll(FlagSeResource.class.getSimpleName() + "$",
+                                "") + "/se.gif", application);
+    }
+}

diff --git a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java
index 39c36258f6cfae4a657f0d4e65621db52f40ee2e..6bff7aca1de11f4d68f54db9e085aeb28ff03edd 100644 (file)
--- a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java
+++ b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java
@@ -32,15 +32,7 @@ public class IntegrationTestApplication extends Application {
                 .setValue(new ClassResource("fi.gif", this));
         item.getItemProperty("country").setValue("Finland");
         item = table.addItem("SE");
-        item.getItemProperty("icon").setValue(
-                new ClassResource("/"
-                        + IntegrationTestApplication.class
-                                .getName()
-                                .replace('.', '/')
-                                .replaceAll(
-                                        IntegrationTestApplication.class
-                                                .getSimpleName() + "$", "")
-                        + "/se.gif", this));
+        item.getItemProperty("icon").setValue(new FlagSeResource(this));
         item.getItemProperty("country").setValue("Sweden");
 
         final Label selectedLabel = new Label();

diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java
index 57ee762913072e8a5454259bc12c7bd31cb6323a..9a61edcaabf27a46d22de52c7dae44557557b2af 100644 (file)
--- a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java
+++ b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java
@@ -20,6 +20,7 @@ import com.vaadin.Application;
 import com.vaadin.terminal.ExternalResource;
 import com.vaadin.terminal.gwt.server.PortletApplicationContext2;
 import com.vaadin.terminal.gwt.server.PortletApplicationContext2.PortletListener;
+import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.TextField;
@@ -43,6 +44,9 @@ public class JSR286PortletApplication extends Application {
         main = new Window();
         setMainWindow(main);
 
+        Embedded appResourceTest = new Embedded("Test of ApplicationResources",
+                new FlagSeResource(this));
+        main.addComponent(appResourceTest);
         userInfo.setCaption("User info");
         userInfo.setContentMode(Label.CONTENT_PREFORMATTED);
         main.addComponent(userInfo);