#7266 eliminate some Sampler dependencies in Vaadin 6.7 tests etc.

svn changeset:20059/svn branch:6.7

diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/au.gif b/WebContent/VAADIN/themes/tests-tickets/icons/au.gif
new file mode 100755 (executable)
index 0000000..5269c6a
Binary files /dev/null and b/WebContent/VAADIN/themes/tests-tickets/icons/au.gif differ

diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/fi.gif b/WebContent/VAADIN/themes/tests-tickets/icons/fi.gif
new file mode 100755 (executable)
index 0000000..8d3a191
Binary files /dev/null and b/WebContent/VAADIN/themes/tests-tickets/icons/fi.gif differ

diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/hu.gif b/WebContent/VAADIN/themes/tests-tickets/icons/hu.gif
new file mode 100755 (executable)
index 0000000..6142d86
Binary files /dev/null and b/WebContent/VAADIN/themes/tests-tickets/icons/hu.gif differ

diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/se.gif b/WebContent/VAADIN/themes/tests-tickets/icons/se.gif
new file mode 100755 (executable)
index 0000000..80f6285
Binary files /dev/null and b/WebContent/VAADIN/themes/tests-tickets/icons/se.gif differ

diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index e508df1d28556a91e5ad60caae934370e570a6dc..4657968591d975bd88f87beaeeff85331c5d7b6a 100644 (file)
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -74,7 +74,7 @@
                </init-param>
                <!--
                        As an example, we will use an optimized widget set. See
-                       SamplerWidgetSet.gwt.xml
+                       OptimizedWidgetSet.gwt.xml
                -->
                <init-param>
                        <param-name>widgetset</param-name>
@@ -93,7 +93,7 @@
                <init-param>
                <!--
                        As an example, we will use an optimized widget set. See
-                       SamplerWidgetSet.gwt.xml
+                       OptimizedWidgetSet.gwt.xml
                -->
                        <param-name>widgetset</param-name>
                        <param-value>com.vaadin.demo.gwt.OptimizedWidgetSet</param-value>

diff --git a/tests/src/com/vaadin/tests/TestIFrames.java b/tests/src/com/vaadin/tests/TestIFrames.java
index dea306b1bf9e8308d67dd8f310277eab224df062..ea93398206aab0ff2425d7eae51ac7219af7bf0f 100644 (file)
--- a/tests/src/com/vaadin/tests/TestIFrames.java
+++ b/tests/src/com/vaadin/tests/TestIFrames.java
@@ -19,7 +19,7 @@ public class TestIFrames extends CustomComponent {
 
     public void createNewView() {
         main.removeAllComponents();
-        main.addComponent(createEmbedded("../sampler/"));
+        main.addComponent(createEmbedded("http://demo.vaadin.com/sampler/"));
         main.addComponent(createEmbedded("../colorpicker"));
         // main.addComponent(createEmbedded("../TestForNativeWindowing"));
         main.addComponent(createEmbedded("http://demo.vaadin.com/timeline"));

diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
index 69c19946a231a8c0dc3397373ced38f524bcdd62..0dc0d092edbb2949c80cba9d1f152c9cbd6e266d 100644 (file)
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
+++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
@@ -20,6 +20,8 @@ public class ComboBoxItemIcon extends TestBase {
 
     @Override
     protected void setup() {
+        setTheme("tests-tickets");
+
         {
             ComboBox cb = new ComboBox();
             cb.addContainerProperty("icon", Resource.class, null);
@@ -27,10 +29,10 @@ public class ComboBoxItemIcon extends TestBase {
 
             Item item = cb.addItem("FI");
             item.getItemProperty("icon").setValue(
-                    new ThemeResource("../sampler/flags/fi.gif"));
+                    new ThemeResource("icons/fi.gif"));
             item = cb.addItem("SE");
             item.getItemProperty("icon").setValue(
-                    new ThemeResource("../sampler/flags/se.gif"));
+                    new ThemeResource("icons/se.gif"));
 
             addComponent(cb);
         }
@@ -41,13 +43,13 @@ public class ComboBoxItemIcon extends TestBase {
 
             Item item = cb.addItem("Finland");
             item.getItemProperty("icon").setValue(
-                    new ThemeResource("../sampler/flags/fi.gif"));
+                    new ThemeResource("icons/fi.gif"));
             item = cb.addItem("Australia");
             item.getItemProperty("icon").setValue(
-                    new ThemeResource("../sampler/flags/au.gif"));
+                    new ThemeResource("icons/au.gif"));
             item = cb.addItem("Hungary");
             item.getItemProperty("icon").setValue(
-                    new ThemeResource("../sampler/flags/hu.gif"));
+                    new ThemeResource("icons/hu.gif"));
 
             cb.setValue("Hungary");
             addComponent(cb);

diff --git a/tests/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java b/tests/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java
index d12d6947f38d69f0a5c3448208e409ef98463cd4..e25b2d6760fd6eff11bbc20b05cb1ae292a38002 100644 (file)
--- a/tests/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java
+++ b/tests/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java
@@ -2,13 +2,25 @@ package com.vaadin.tests.components.tree;
 
 import java.util.Iterator;
 
-import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.terminal.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Tree;
 
 public class TreeHorizontalResize extends TestBase {
 
+    // copied from Sampler to eliminate dependency
+    public static final Object hw_PROPERTY_NAME = "name";
+    public static final Object hw_PROPERTY_ICON = "icon";
+    private static final String[][] hardware = { //
+            { "Desktops", "Dell OptiPlex GX240", "Dell OptiPlex GX260",
+                    "Dell OptiPlex GX280" },
+            { "Monitors", "Benq T190HD", "Benq T220HD", "Benq T240HD" },
+            { "Laptops", "IBM ThinkPad T40", "IBM ThinkPad T43",
+                    "IBM ThinkPad T60" } };
+
     @Override
     protected void setup() {
         Panel treePanel = new Panel();
@@ -18,8 +30,8 @@ public class TreeHorizontalResize extends TestBase {
         addComponent(treePanel);
 
         Tree tree = new Tree();
-        tree.setContainerDataSource(ExampleUtil.getHardwareContainer());
-        tree.setItemCaptionPropertyId(ExampleUtil.hw_PROPERTY_NAME);
+        tree.setContainerDataSource(getHardwareContainer());
+        tree.setItemCaptionPropertyId(hw_PROPERTY_NAME);
         for (Iterator<?> it = tree.rootItemIds().iterator(); it.hasNext();) {
             tree.expandItemsRecursively(it.next());
         }
@@ -36,4 +48,40 @@ public class TreeHorizontalResize extends TestBase {
         return 6230;
     }
 
+    public static HierarchicalContainer getHardwareContainer() {
+        Item item = null;
+        int itemId = 0; // Increasing numbering for itemId:s
+
+        // Create new container
+        HierarchicalContainer hwContainer = new HierarchicalContainer();
+        // Create containerproperty for name
+        hwContainer.addContainerProperty(hw_PROPERTY_NAME, String.class, null);
+        // Create containerproperty for icon
+        hwContainer.addContainerProperty(hw_PROPERTY_ICON, ThemeResource.class,
+                new ThemeResource("../runo/icons/16/document.png"));
+        for (int i = 0; i < hardware.length; i++) {
+            // Add new item
+            item = hwContainer.addItem(itemId);
+            // Add name property for item
+            item.getItemProperty(hw_PROPERTY_NAME).setValue(hardware[i][0]);
+            // Allow children
+            hwContainer.setChildrenAllowed(itemId, true);
+            itemId++;
+            for (int j = 1; j < hardware[i].length; j++) {
+                if (j == 1) {
+                    item.getItemProperty(hw_PROPERTY_ICON).setValue(
+                            new ThemeResource("../runo/icons/16/folder.png"));
+                }
+                // Add child items
+                item = hwContainer.addItem(itemId);
+                item.getItemProperty(hw_PROPERTY_NAME).setValue(hardware[i][j]);
+                hwContainer.setParent(itemId, itemId - j);
+                hwContainer.setChildrenAllowed(itemId, false);
+
+                itemId++;
+            }
+        }
+        return hwContainer;
+    }
+
 }