From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 24 Oct 2008 05:51:07 +0000 (+0000)
Subject: Updated #1878 test case
X-Git-Tag: 6.7.0.beta1~3949
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1e559511d00f8bccedb5a65f9b925bba95c5cf4b;p=vaadin-framework.git

Updated #1878 test case

svn changeset:5700/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1878.java b/src/com/itmill/toolkit/tests/tickets/Ticket1878.java
index 00a46753c8..a5f394d68b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1878.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1878.java
@@ -29,12 +29,10 @@ public class Ticket1878 extends Application {
 
     private Layout orderedLayout;
     private Layout gridLayout;
-    private Layout expandLayout;
     private Layout formLayout;
     private GridLayout mainLayout;
     private Button switchToGridButton;
     private Button switchToOrderedButton;
-    private Button switchToExpandButton;
     private Button switchToFormsButton;
 
     public void init() {
@@ -46,7 +44,6 @@ public class Ticket1878 extends Application {
         w.setLayout(mainLayout);
         orderedLayout = createOL();
         gridLayout = createGL();
-        expandLayout = createEL();
         formLayout = createForms();
 
         switchToGridButton = new Button("Switch to GridLayout",
@@ -66,14 +63,6 @@ public class Ticket1878 extends Application {
 
                 });
         switchToOrderedButton.setEnabled(false);
-        switchToExpandButton = new Button("Switch to ExpandLayout",
-                new ClickListener() {
-
-                    public void buttonClick(ClickEvent event) {
-                        changeLayout(switchToExpandButton, expandLayout);
-                    }
-
-                });
 
         switchToFormsButton = new Button("Switch to Form", new ClickListener() {
 
@@ -87,7 +76,6 @@ public class Ticket1878 extends Application {
                 OrderedLayout.ORIENTATION_HORIZONTAL);
         buttonLayout.addComponent(switchToOrderedButton);
         buttonLayout.addComponent(switchToGridButton);
-        buttonLayout.addComponent(switchToExpandButton);
         buttonLayout.addComponent(switchToFormsButton);
 
         mainLayout.addComponent(buttonLayout);
@@ -148,34 +136,6 @@ public class Ticket1878 extends Application {
         return layout;
     }
 
-    private static Layout createEL() {
-        GridLayout layout = new GridLayout(1, 5);
-
-        GridLayout l1 = new GridLayout(1, 3);
-        createLayout(l1, new ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL),
-                "1000px", "150px", "100px", null, true);
-        createLayout(l1, new ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL),
-                "1000px", "150px", "50px", null, false);
-
-        GridLayout l2 = new GridLayout(6, 1);
-        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),
-                "200px", "500px", true);
-        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),
-                "200px", "500px", "100%", null, true);
-        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),
-                "150px", "500px", true);
-        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),
-                "150px", "500px", "100%", null, true);
-        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),
-                "100px", "500px", true);
-        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL),
-                "100px", "500px", "100%", null, true);
-        layout.addComponent(l1);
-        layout.addComponent(l2);
-
-        return layout;
-    }
-
     public class FormObject {
         private String stringValue = "abc";
         private int intValue = 1;
@@ -283,7 +243,6 @@ public class Ticket1878 extends Application {
     protected void changeLayout(Button b, Layout newLayout) {
         switchToOrderedButton.setEnabled(true);
         switchToGridButton.setEnabled(true);
-        switchToExpandButton.setEnabled(true);
         switchToFormsButton.setEnabled(true);
 
         b.setEnabled(false);