From 5e9209421ce92e16531299c8c4be5fdd412bb513 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Thu, 10 Sep 2015 14:09:32 +0300 Subject: Parse readonly values for AbstractFields correctly #18850 Change-Id: I6f7d8731d185fe1c88e861435a401d887b2defbe --- .../checkbox/CheckboxDeclarativeTest.java | 10 ++++++ .../combobox/ComboBoxDeclarativeTest.java | 16 +++++++++ .../datefield/DateFieldDeclarativeTest.java | 12 +++++++ .../nativeselect/NativeSelectDeclarativeTest.java | 16 +++++++++ .../PasswordFieldDeclarativeTest.java | 40 ++++++++++++++++++++++ .../progressbar/ProgressBarDeclarativeTest.java | 12 +++++++ .../richtextarea/RichTextAreaDeclarativeTest.java | 11 ++++++ .../component/slider/SliderDeclarativeTest.java | 15 ++++++++ .../textarea/TextAreaDeclarativeTest.java | 11 ++++++ .../textfield/TextFieldDeclarativeTest.java | 10 ++++++ 10 files changed, 153 insertions(+) create mode 100644 server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java (limited to 'server/tests') diff --git a/server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java index e0f0b7c3e9..6206617cd8 100644 --- a/server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java @@ -44,4 +44,14 @@ public class CheckboxDeclarativeTest extends DeclarativeTestBase { testRead(design, checkBox); testWrite(design, checkBox); } + + @Test + public void testReadOnlyValue() { + String design = ""; + CheckBox checkBox = new CheckBox(); + checkBox.setValue(true); + checkBox.setReadOnly(true); + testRead(design, checkBox); + testWrite(design, checkBox); + } } diff --git a/server/tests/src/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java index e9d66b478b..d49d2b79e2 100644 --- a/server/tests/src/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java @@ -57,6 +57,22 @@ public class ComboBoxDeclarativeTest extends DeclarativeTestBase { testWrite(getBasicDesign(), getBasicExpected()); } + @Test + public void testReadOnlyValue() { + String design = ""; + + ComboBox comboBox = new ComboBox(); + comboBox.addItems("foo", "bar"); + comboBox.setValue("foo"); + comboBox.setReadOnly(true); + + testRead(design, comboBox); + + // Selects items are not written out by default + String design2 = ""; + testWrite(design2, comboBox); + } + private String getBasicDesign() { return ""; } diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java index 4087f1ad11..f5ae6871a2 100644 --- a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java @@ -87,4 +87,16 @@ public class DateFieldDeclarativeTest extends DeclarativeTestBase { "2020-01-01 00:00:00+0200"), getYearResolutionExpected()); } + + @Test + public void testReadOnlyValue() { + String design = ""; + DateField df = new DateField(); + df.setResolution(Resolution.YEAR); + df.setValue(new Date(2020 - 1900, 1 - 1, 1)); + df.setReadOnly(true); + + testRead(design, df); + testWrite(design, df); + } } diff --git a/server/tests/src/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java index 8f1b995cc6..140335e136 100644 --- a/server/tests/src/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java @@ -50,4 +50,20 @@ public class NativeSelectDeclarativeTest extends testWrite(stripOptionTags(getBasicDesign()), getBasicExpected()); } + @Test + public void testReadOnlyValue() { + String design = ""; + + NativeSelect ns = new NativeSelect(); + ns.addItems("foo", "bar"); + ns.setValue("foo"); + ns.setReadOnly(true); + + testRead(design, ns); + + // Selects items are not written out by default + String design2 = ""; + testWrite(design2, ns); + } + } \ No newline at end of file diff --git a/server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java new file mode 100644 index 0000000000..6934d2011c --- /dev/null +++ b/server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java @@ -0,0 +1,40 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.server.component.passwordfield; + +import org.junit.Test; + +import com.vaadin.tests.design.DeclarativeTestBase; +import com.vaadin.ui.PasswordField; + +/** + * + * @since + * @author Vaadin Ltd + */ +public class PasswordFieldDeclarativeTest extends + DeclarativeTestBase { + + @Test + public void testReadOnlyValue() { + String design = ""; + PasswordField tf = new PasswordField(); + tf.setValue("test value"); + tf.setReadOnly(true); + testRead(design, tf); + testWrite(design, tf); + } +} diff --git a/server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java index bed19644ff..82b8acd8ab 100644 --- a/server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java @@ -60,4 +60,16 @@ public class ProgressBarDeclarativeTest extends testWrite("", new ProgressBar()); } + @Test + public void testReadOnlyValue() { + String design = ""; + ProgressBar progressBar = new ProgressBar(); + progressBar.setIndeterminate(true); + progressBar.setValue(0.5f); + progressBar.setReadOnly(true); + + testRead(design, progressBar); + testWrite(design, progressBar); + } + } \ No newline at end of file diff --git a/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java index 0d614b7b9a..315a5be6b6 100644 --- a/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java @@ -56,4 +56,15 @@ public class RichTextAreaDeclarativeTest extends public void testWriteEmpty() { testWrite("", new RichTextArea()); } + + @Test + public void testReadOnlyValue() { + String design = "Hello World!"; + RichTextArea ta = new RichTextArea(); + ta.setValue("Hello World!"); + ta.setReadOnly(true); + + testRead(design, ta); + testWrite(design, ta); + } } diff --git a/server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java index 9ef28afb82..0c2ac6bed9 100644 --- a/server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java @@ -63,4 +63,19 @@ public class SliderDeclarativeTest extends DeclarativeTestBase { testRead(design, expected); testWrite(design, expected); } + + @Test + public void testReadOnlyValue() { + String design = ""; + + Slider expected = new Slider(); + expected.setMin(10.0); + expected.setMax(20.0); + expected.setResolution(1); + expected.setValue(12.3); + expected.setReadOnly(true); + + testRead(design, expected); + testWrite(design, expected); + } } diff --git a/server/tests/src/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java index bed8851204..f70f1fde98 100644 --- a/server/tests/src/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java @@ -58,6 +58,17 @@ public class TextAreaDeclarativeTest extends DeclarativeTestBase