diff options
author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-02-10 09:39:50 +0200 |
---|---|---|
committer | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-02-10 09:39:51 +0200 |
commit | ca911b69ee3bae0ca1f0ecc4002595ee81cb6b70 (patch) | |
tree | 742f083732699df2550dc71f533ff9a217841d5e /server/tests | |
parent | ad5e882b4dda5458ff16ce9c2321407a1d255ec6 (diff) | |
parent | e5dee6a7417e4466ad35bd9150174f86204bca3e (diff) | |
download | vaadin-framework-ca911b69ee3bae0ca1f0ecc4002595ee81cb6b70.tar.gz vaadin-framework-ca911b69ee3bae0ca1f0ecc4002595ee81cb6b70.zip |
Merge changes from origin/7.1
c551507 Selected option is updated when item caption changes in Select (#9250)
3595685 Converted TestUIWidgetset test to TB3 and fixed wrong text in assertion.
89d860c Convinience methods for getting mouse and keyboard in test.
d00397f Converted TB2 test to TB3 and fixed text assertion.
857de0f Renamed test according to conventions and fixed assertion text.
b9a6a48 Update textbox when Select item caption changes (#9250)
1687889 Retain focus while changing DOM in OrderedLayout (#12967)
f93c870 Remove unselected rows from selection on client side (#13008)
1d1ccf4 Fix Firefox and Vaadin 7 scroll distance (#11353)
62ac53a Ensure widgetset compile messages go to stdout (#7516)
171d02a Remove references to read/write through modes (#13184)
3f09c10 Better-looking CSS for Vaadin API Javadocs (#13219)
f0a4ea9 Do not throw NPE for equals(null) (#8910)
3897025 Add deprecated expand ratio methods to FormLayout (#12876)
b89dba9 Exclude a possible bin directory when building (#13258)
69983d0 Re-adjusted the rendering order of TabSheet tabs to prevent an NPE in isClipped (#12343)
e5dee6a Use Calendar as sender for action handlers (#13191)
Change-Id: I581ec7517aaa19a2e46b48e31cdefdd3db2c05c5
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java new file mode 100644 index 0000000000..c8faa71e66 --- /dev/null +++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java @@ -0,0 +1,44 @@ +/* + * Copyright 2000-2013 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.data.util.sqlcontainer.filters; + +import org.junit.Assert; +import org.junit.Test; + +import com.vaadin.data.util.filter.Compare; + +public class CompareTest { + + @Test + public void testEquals() { + Compare c1 = new Compare.Equal("prop1", "val1"); + Compare c2 = new Compare.Equal("prop1", "val1"); + Assert.assertTrue(c1.equals(c2)); + } + + @Test + public void testDifferentTypeEquals() { + Compare c1 = new Compare.Equal("prop1", "val1"); + Compare c2 = new Compare.Greater("prop1", "val1"); + Assert.assertFalse(c1.equals(c2)); + } + + @Test + public void testEqualsNull() { + Compare c1 = new Compare.Equal("prop1", "val1"); + Assert.assertFalse(c1.equals(null)); + } +} |