Refactored robustness/leak tests.s.

svn changeset:3733/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/robustness/Robustness.java b/src/com/itmill/toolkit/tests/robustness/Robustness.java
new file mode 100644 (file)
index 0000000..41af72f
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/robustness/Robustness.java
@@ -0,0 +1,60 @@
+package com.itmill.toolkit.tests.robustness;
+
+import com.itmill.toolkit.tests.util.Log;
+import com.itmill.toolkit.tests.util.RandomComponents;
+import com.itmill.toolkit.ui.Button;
+import com.itmill.toolkit.ui.ComponentContainer;
+import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.Window;
+import com.itmill.toolkit.ui.Button.ClickEvent;
+
+public abstract class Robustness extends com.itmill.toolkit.Application
+        implements Button.ClickListener {
+
+    static int totalCount = 0;
+
+    int count = 0;
+
+    final Window main = new Window("Robustness tests by featurebrowser");
+
+    final Button close = new Button("Close application");
+
+    final Button create = new Button("Create");
+
+    final Label label = new Label();
+
+    ComponentContainer stressLayout;
+
+    RandomComponents randomComponents = new RandomComponents();
+
+    public void init() {
+        createNewView();
+    }
+
+    public void createNewView() {
+        setMainWindow(main);
+        main.removeAllComponents();
+
+        main.addComponent(label);
+        main.addComponent(close);
+        main.addComponent(create);
+        close.addListener(this);
+        create.addListener(this);
+
+        create.setDebugId("createButton");
+    }
+
+    public void buttonClick(ClickEvent event) {
+        if (event.getButton() == create)
+            create();
+        else if (event.getButton() == close) {
+            System.out.println("Before close, memory statistics:");
+            System.out.println(Log.getMemoryStatistics());
+            close();
+            System.out.println("After close, memory statistics:");
+            System.out.println(Log.getMemoryStatistics());
+        }
+    }
+
+    public abstract void create();
+}

diff --git a/src/com/itmill/toolkit/tests/robustness/RobustnessComplex.java b/src/com/itmill/toolkit/tests/robustness/RobustnessComplex.java
index 94cb3e0c0b7bec621075fca275161bb86ed35618..013632a6e8ac318471bb5c4d6fc627cdc5541a50 100644 (file)
--- a/src/com/itmill/toolkit/tests/robustness/RobustnessComplex.java
+++ b/src/com/itmill/toolkit/tests/robustness/RobustnessComplex.java
@@ -1,51 +1,12 @@
 package com.itmill.toolkit.tests.robustness;
 
 import com.itmill.toolkit.tests.util.Log;
-import com.itmill.toolkit.tests.util.RandomComponents;
 import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComponentContainer;
 import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
 
-public class RobustnessComplex extends com.itmill.toolkit.Application implements
+public class RobustnessComplex extends Robustness implements
         Button.ClickListener {
 
-    static int totalCount = 0;
-
-    int count = 0;
-
-    final Window main = new Window("Robustness tests by featurebrowser");
-
-    final Button button = new Button("Create");
-
-    final Label label = new Label();
-
-    ComponentContainer stressLayout;
-
-    RandomComponents randomComponents = new RandomComponents();
-
-    public void init() {
-        createNewView();
-    }
-
-    public void createNewView() {
-        setMainWindow(main);
-        main.removeAllComponents();
-
-        main.addComponent(label);
-        main.addComponent(button);
-        button.addListener(this);
-
-        button.setDebugId("createButton");
-
-        create();
-    }
-
-    public void buttonClick(ClickEvent event) {
-        create();
-    }
-
     /**
      * Create complex layouts with components and listeners.
      */

diff --git a/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java b/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java
index c80f14516c3270ef6a758629e68b1eee1b4bad8d..9052274a80a22e67419303c143bf038793b25fd2 100644 (file)
--- a/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java
+++ b/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java
@@ -2,50 +2,14 @@ package com.itmill.toolkit.tests.robustness;
 
 import com.itmill.toolkit.tests.util.Log;
 import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComponentContainer;
 import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
 
-public class RobustnessSimple extends com.itmill.toolkit.Application implements
+public class RobustnessSimple extends Robustness implements
         Button.ClickListener {
 
-    static int totalCount = 0;
-
-    int count = 0;
-
-    final Window main = new Window("Robustness tests by featurebrowser");
-
-    final Button button = new Button("Create");
-
-    final Label label = new Label();
-
-    ComponentContainer stressLayout;
-
-    public void init() {
-        createNewView();
-    }
-
-    public void createNewView() {
-        setMainWindow(main);
-        main.removeAllComponents();
-
-        main.addComponent(label);
-        main.addComponent(button);
-        button.addListener(this);
-
-        button.setDebugId("createButton");
-
-        create();
-    }
-
-    public void buttonClick(ClickEvent event) {
-        create();
-    }
-
     /**
-     * Create single orderedlayout with 100 labels.
+     * Create single orderedlayout with a label containing 1Mb of data
      */
     public void create() {
         count++;