From 69def2f010a5efce0d89c94cccc81dcc91c79ffb Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 8 Dec 2008 11:59:09 +0000
Subject: [PATCH] Separated test cases, added double components

svn changeset:6115/svn branch:trunk
---
 .../toolkit/tests/tickets/Ticket2287.java     | 20 +++------
 .../toolkit/tests/tickets/Ticket2297.java     | 41 +++++++++++++++++++
 2 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 src/com/itmill/toolkit/tests/tickets/Ticket2297.java

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2287.java b/src/com/itmill/toolkit/tests/tickets/Ticket2287.java
index 76eb590724..7eddbc983e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2287.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2287.java
@@ -1,10 +1,7 @@
 package com.itmill.toolkit.tests.tickets;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.net.URL;
 
-import com.itmill.toolkit.ui.CustomLayout;
 import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.Window;
 
@@ -25,16 +22,11 @@ public class Ticket2287 extends Ticket2292 {
                 + "/icon.png\" />");
         main.addComponent(l);
 
-        try {
-            CustomLayout cl = new CustomLayout(
-                    new ByteArrayInputStream(
-                            ("This is an empty CustomLayout with as slow image. <img src=\""
-                                    + url.toString() + "/icon.png\" />")
-                                    .getBytes()));
-            main.addComponent(cl);
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
+        l = new Label();
+        l.setContentMode(Label.CONTENT_XHTML);
+        l.setValue("This is a label with as slow image. <img src=\"" + url
+                + "/icon.png\" />");
+        main.addComponent(l);
+
     }
 }
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2297.java b/src/com/itmill/toolkit/tests/tickets/Ticket2297.java
new file mode 100644
index 0000000000..48584a9a30
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2297.java
@@ -0,0 +1,41 @@
+package com.itmill.toolkit.tests.tickets;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URL;
+
+import com.itmill.toolkit.ui.CustomLayout;
+import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.Window;
+
+public class Ticket2297 extends Ticket2292 {
+
+    public void init() {
+        final Window main = new Window(getClass().getName().substring(
+                getClass().getName().lastIndexOf(".") + 1));
+        setMainWindow(main);
+        URL url = getURL();
+        main
+                .addComponent(new Label(
+                        "Icon is built by servlet with a slow method, so it will show the bug (components not firing requestLayout)."));
+
+        try {
+            CustomLayout cl = new CustomLayout(
+                    new ByteArrayInputStream(
+                            ("This is an empty CustomLayout with as slow image. <img src=\""
+                                    + url.toString() + "/icon.png\" />")
+                                    .getBytes()));
+            main.addComponent(cl);
+
+            cl = new CustomLayout(
+                    new ByteArrayInputStream(
+                            ("This is an empty CustomLayout with as slow image. <img src=\""
+                                    + url.toString() + "/icon.png\" />")
+                                    .getBytes()));
+            main.addComponent(cl);
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file
-- 
2.39.5