aboutsummaryrefslogtreecommitdiffstats
path: root/server/tests
diff options
context:
space:
mode:
authorAnna Koskinen <anna@vaadin.com>2013-01-02 16:57:52 +0200
committerAnna Koskinen <anna@vaadin.com>2013-01-02 16:57:52 +0200
commit8044cec886000ea03d4de54191f5521d73ebf6b4 (patch)
tree9511c1fc5ba82eb9dd4c23a1a8682821dd346b36 /server/tests
parent3f4c7a849dc219b3d458248bb812fa827ba2c898 (diff)
downloadvaadin-framework-8044cec886000ea03d4de54191f5521d73ebf6b4.tar.gz
vaadin-framework-8044cec886000ea03d4de54191f5521d73ebf6b4.zip
Merge of (#6476) to Vaadin 7.
Table.setVisibleColumns should throw exception from duplicate property ids. Change-Id: I1465a99bd0c6241c3b31d88f5480fee99bbdc0ad
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java b/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java
index be312044db..ee3eefba05 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java
@@ -54,15 +54,10 @@ public class TableVisibleColumns {
try {
t.setVisibleColumns(new Object[] { "Property 0", "Property 1",
"Property 2", "Property 1" });
- // FIXME: Multiple properties in the Object array should be detected
- // (#6476)
- // junit.framework.Assert.fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
// OK, expected
}
- // FIXME: Multiple properties in the Object array should be detected
- // (#6476)
- // assertArrayEquals(defaultColumns3, t.getVisibleColumns());
+ assertArrayEquals(defaultColumns3, t.getVisibleColumns());
}
@Test