Changed Log default behavior to number log rows to avoid extra code in most test...

svn changeset:14836/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java b/tests/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
index 7c0af3d9ab376fd4a53d8d7730fff8182b951a8d..b4ced4622ca117c03f88e1c2a08fe113e428c3e9 100644 (file)
--- a/tests/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
+++ b/tests/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
@@ -16,7 +16,6 @@ public class ShortcutAddAndRemove extends TestBase {
     @Override\r
     protected void setup() {\r
         log = new Log(4);\r
-        log.setNumberLogRows(true);\r
 \r
         final Button logButton = new Button("Log a row (enter shortcut)");\r
         logButton.setClickShortcut(KeyCode.ENTER);\r

diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
index 05c1056095f356ea837b54f25b3476fadd4b939b..fa7ee7f8b42285e96d1099dbbde05a3cc732f855 100644 (file)
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
+++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
@@ -34,7 +34,6 @@ public class DateFieldEmptyValid extends TestBase {
     protected void setup() {\r
         addComponent(new Label("<br/><br/>", Label.CONTENT_XHTML));\r
         log = new Log(5);\r
-        log.setNumberLogRows(true);\r
         addComponent(log);\r
         df = new MyDateField();\r
         df.setRequired(true);\r

diff --git a/tests/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java b/tests/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java
index 4a2e03e5a68e07c3b7edbfb55fe2ceccea3ff36d..624d0746e9ef72dfadc4545347c3525bac6d5ab0 100644 (file)
--- a/tests/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java
+++ b/tests/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java
@@ -14,7 +14,6 @@ public class FormWithEnterShortCut extends TestBase {
 \r
     @Override\r
     protected void setup() {\r
-        log.setNumberLogRows(true);\r
 \r
         final Form form = new Form();\r
         final Field tf = new TextField("Search");\r

diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java b/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java
index cf4bd493f10a4b0e247c59e6c1ee3e548c880dbd..f9f56ddbfed531913931552f428c080c492c7ea6 100644 (file)
--- a/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java
+++ b/tests/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java
@@ -35,6 +35,7 @@ public class MenuBarNavigation extends TestBase implements Command {
         addComponent(mb);\r
 \r
         log = new Log(5);\r
+        log.setNumberLogRows(false);\r
         addComponent(log);\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java b/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java
index 1cc0c93ed76fde980ff30323c1a5dbcd660e3781..f8da70c55b39921b5adf7569e9dadc5befc48c5e 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java
@@ -22,7 +22,6 @@ public class ItemClickEvents extends TestBase {
 
     @Override
     public void setup() {
-        log.setNumberLogRows(true);
         log.setDebugId("log");
 
         HorizontalLayout ol = createHorizontalLayout(table);

diff --git a/tests/src/com/vaadin/tests/components/table/TableSingleSelect.java b/tests/src/com/vaadin/tests/components/table/TableSingleSelect.java
index 9a21e37928039ca8c082c301e3613a9b3993c9cd..edde284848f0a6b4061b24a903626fa2eef5678d 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/TableSingleSelect.java
+++ b/tests/src/com/vaadin/tests/components/table/TableSingleSelect.java
@@ -13,7 +13,6 @@ public class TableSingleSelect extends TestBase {
 \r
     @Override\r
     protected void setup() {\r
-        log.setNumberLogRows(true);\r
         log.setDebugId("eventlog");\r
 \r
         Table t = new Table();\r

diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java b/tests/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
index 98f3e546f5124a77be5efa54ac142b9284890965..e2f5c45b72797c431159834ed480c97839df41f7 100644 (file)
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
+++ b/tests/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
@@ -12,7 +12,7 @@ import com.vaadin.ui.TextField;
 
 public class TextFieldFocusAndBlurListeners extends TestBase implements
         FocusListener, BlurListener, ValueChangeListener {
-    private Log log = new Log(5);
+    private Log log = new Log(5).setNumberLogRows(false);
 
     @Override
     protected String getDescription() {

diff --git a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java
index 7251f9793fe0de214538eed7428a43dcf6907413..4748111fd678f06848f05275af559dc878435948 100644 (file)
--- a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java
+++ b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.java
@@ -62,7 +62,6 @@ public class WindowClickEvents extends TestBase {
 
         getMainWindow().addWindow(centered);
         log = new Log(5);
-        log.setNumberLogRows(true);
         addComponent(log);
         getMainWindow().addListener(new ClickListener() {
 

diff --git a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index 309c52cd2209e0bc9ab7b334353000da49b383c3..c6891e9d68dd8e1468c69925d77e6bce54a150d3 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
@@ -18,7 +18,7 @@ import com.vaadin.ui.Window;
 
 public class TestLayoutClickListeners extends AbstractTestCase {
 
-    private Log log = new Log(5);
+    private Log log = new Log(5).setNumberLogRows(false);
 
     @Override
     public void init() {

diff --git a/tests/src/com/vaadin/tests/util/Log.java b/tests/src/com/vaadin/tests/util/Log.java
index 3f5d67948922e98a221c26a28626efd865cc214b..cebbff48cbe74e328a8833ec7ab78c3a57407c01 100644 (file)
--- a/tests/src/com/vaadin/tests/util/Log.java
+++ b/tests/src/com/vaadin/tests/util/Log.java
@@ -24,14 +24,15 @@ public class Log extends VerticalLayout {
     /**\r
      * Clears the rows and reset the row number to zero.\r
      */\r
-    public void clear() {\r
+    public Log clear() {\r
         for (Label l : eventLabels) {\r
             l.setValue(" ");\r
         }\r
         nextLogNr = 0;\r
+        return this;\r
     }\r
 \r
-    public void log(String event) {\r
+    public Log log(String event) {\r
         int nr = eventLabels.size();\r
         for (int i = nr - 1; i > 0; i--) {\r
             eventLabels.get(i).setValue(eventLabels.get(i - 1).getValue());\r
@@ -43,6 +44,7 @@ public class Log extends VerticalLayout {
         }\r
         eventLabels.get(0).setValue(msg);\r
         System.out.println(event);\r
+        return this;\r
     }\r
 \r
     private Label createEventLabel() {\r
@@ -51,8 +53,9 @@ public class Log extends VerticalLayout {
         return l;\r
     }\r
 \r
-    public void setNumberLogRows(boolean numberLogRows) {\r
+    public Log setNumberLogRows(boolean numberLogRows) {\r
         this.numberLogRows = numberLogRows;\r
+        return this;\r
     }\r
 \r
 }\r