tests updated

svn changeset:3759/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/robustness/Robustness.java b/src/com/itmill/toolkit/tests/robustness/Robustness.java
index 74f58f315d8920517217eb497f2c6db2b330d471..075e3f2db40bd2ef1d8608ce81ae5f106bc524cb 100644 (file)
--- a/src/com/itmill/toolkit/tests/robustness/Robustness.java
+++ b/src/com/itmill/toolkit/tests/robustness/Robustness.java
@@ -17,13 +17,13 @@ public abstract class Robustness extends com.itmill.toolkit.Application
 
     final Window main = new Window("Robustness tests by featurebrowser");
 
-    final Button close = new Button("Close application");
+    Button close = new Button("Close application");
 
-    final Button remove = new Button("Remove all components");
+    Button remove = new Button("Remove all components");
 
-    final Button create = new Button("Create");
+    Button create = new Button("Create");
 
-    final Label label = new Label();
+    Label label = new Label();
 
     ComponentContainer stressLayout;
 
@@ -59,7 +59,14 @@ public abstract class Robustness extends com.itmill.toolkit.Application
         if (event.getButton() == create)
             create();
         else if (event.getButton() == remove) {
-            main.removeComponent(stressLayout);
+            main.removeAllComponents();
+            close.removeListener(this);
+            remove.removeListener(this);
+            create.removeListener(this);
+            close = null;
+            remove = null;
+            create = null;
+            label = null;
             stressLayout = null;
             System.out.println("main.getLayout()=" + main.getLayout());
             System.out.println(Log.getMemoryStatistics());

diff --git a/src/com/itmill/toolkit/tests/robustness/RobustnessComplex.java b/src/com/itmill/toolkit/tests/robustness/RobustnessComplex.java
index 013632a6e8ac318471bb5c4d6fc627cdc5541a50..dffaeed09d664a88eb085f40849f9b6a107679c7 100644 (file)
--- a/src/com/itmill/toolkit/tests/robustness/RobustnessComplex.java
+++ b/src/com/itmill/toolkit/tests/robustness/RobustnessComplex.java
@@ -27,7 +27,7 @@ public class RobustnessComplex extends Robustness implements
         stressLayout.addComponent(label);
 
         // fill with random components
-        randomComponents.fillLayout(stressLayout, 20);
+        randomComponents.fillLayout(stressLayout, 25);
 
         // add new component container to main layout
         main.addComponent(stressLayout);

diff --git a/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java b/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java
index 9052274a80a22e67419303c143bf038793b25fd2..755e6c4225632cabc819973724a7fe966aff6c65 100644 (file)
--- a/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java
+++ b/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java
@@ -8,9 +8,6 @@ import com.itmill.toolkit.ui.OrderedLayout;
 public class RobustnessSimple extends Robustness implements
         Button.ClickListener {
 
-    /**
-     * Create single orderedlayout with a label containing 1Mb of data
-     */
     public void create() {
         count++;
 
@@ -22,6 +19,7 @@ public class RobustnessSimple extends Robustness implements
         // create new stress layout
         stressLayout = new OrderedLayout();
 
+        // CASE single orderedlayout with a label containing 1Mb of data
         // fill with random components
         Label label = new Label("Label " + Log.getMemoryStatistics(),
                 Label.CONTENT_PREFORMATTED);
@@ -29,6 +27,17 @@ public class RobustnessSimple extends Robustness implements
         label.setData(data);
         stressLayout.addComponent(label);
 
+        // CASE simple button example
+        // stressLayout.addComponent(new ButtonExample());
+
+        // CASE #1392, this "leaks" in a way that we cannot release opened
+        // windows
+        // in any way (Window.open method)
+        // stressLayout.addComponent(new WindowingExample());
+
+        // CASE TableExample
+        // stressLayout.addComponent(new TableExample());
+
         // add new component container to main layout
         main.addComponent(stressLayout);
 

diff --git a/src/com/itmill/toolkit/tests/util/RandomComponents.java b/src/com/itmill/toolkit/tests/util/RandomComponents.java
index aed0da9d26942527f8442c24fd3394926f834616..b6928978e44ac4b79ca6582811ea365c0ce419ff 100644 (file)
--- a/src/com/itmill/toolkit/tests/util/RandomComponents.java
+++ b/src/com/itmill/toolkit/tests/util/RandomComponents.java
@@ -17,7 +17,6 @@ import com.itmill.toolkit.demo.featurebrowser.TableExample;
 import com.itmill.toolkit.demo.featurebrowser.TreeExample;
 import com.itmill.toolkit.demo.featurebrowser.ValueInputExample;
 import com.itmill.toolkit.demo.featurebrowser.WindowingExample;
-import com.itmill.toolkit.terminal.ExternalResource;
 import com.itmill.toolkit.terminal.ThemeResource;
 import com.itmill.toolkit.tests.StressComponentsInTable;
 import com.itmill.toolkit.ui.AbstractComponent;
@@ -27,7 +26,6 @@ import com.itmill.toolkit.ui.DateField;
 import com.itmill.toolkit.ui.Embedded;
 import com.itmill.toolkit.ui.GridLayout;
 import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
 import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.Panel;
 import com.itmill.toolkit.ui.Select;
@@ -56,6 +54,7 @@ public class RandomComponents {
         ComponentContainer result = null;
         final int randint = seededRandom.nextInt(5);
         switch (randint) {
+
         case 0:
             result = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL);
             ((OrderedLayout) result).setCaption("OrderedLayout_horizontal_"
@@ -154,8 +153,11 @@ public class RandomComponents {
             break;
         case 4:
             // Link
-            result = new Link("", new ExternalResource("http://www.itmill.com"));
-            result.setCaption("Link component " + caption);
+            // result = new Link("", new
+            // ExternalResource("http://www.itmill.com"));
+            // result.setCaption("Link component " + caption);
+            result = new OrderedLayout();
+            ((OrderedLayout) result).addComponent(new LabelExample());
             break;
         case 5:
             // Link
@@ -206,6 +208,7 @@ public class RandomComponents {
             // TODO: this application leaks memory
             // ((OrderedLayout) result).addComponent(new
             // JavaScriptAPIExample());
+
             ((OrderedLayout) result).addComponent(new LabelExample());
             break;
         case 13:
@@ -231,19 +234,19 @@ public class RandomComponents {
             break;
         case 18:
             result = new OrderedLayout();
-            ((OrderedLayout) result).addComponent(new TableExample());
+            ((OrderedLayout) result).addComponent(new ValueInputExample());
             break;
         case 19:
             result = new OrderedLayout();
-            ((OrderedLayout) result).addComponent(new TreeExample());
+            ((OrderedLayout) result).addComponent(new WindowingExample());
             break;
         case 20:
             result = new OrderedLayout();
-            ((OrderedLayout) result).addComponent(new ValueInputExample());
+            ((OrderedLayout) result).addComponent(new TreeExample());
             break;
         case 21:
             result = new OrderedLayout();
-            ((OrderedLayout) result).addComponent(new WindowingExample());
+            ((OrderedLayout) result).addComponent(new TableExample());
             break;
         case 22:
             result = new OrderedLayout();