diff options
| author | Artur Signell <artur@vaadin.com> | 2012-11-28 18:18:43 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-11-28 18:24:54 +0200 |
| commit | cbd900b1ea15d3fa059a38b30096f8cdd2f7590d (patch) | |
| tree | 9c1c7e7ce9635cd2bd4cb62078fb059df3655040 /uitest | |
| parent | 57e82eff5ba7409b3a36f0a03448ee6e3c755d97 (diff) | |
| download | vaadin-framework-cbd900b1ea15d3fa059a38b30096f8cdd2f7590d.tar.gz vaadin-framework-cbd900b1ea15d3fa059a38b30096f8cdd2f7590d.zip | |
Fixed Table to actually use converter from factory (#10408)
Change-Id: I02dce8628def6ed926e79fff5762169a129f2426
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html | 42 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java | 91 |
2 files changed, 133 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html b/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html new file mode 100644 index 0000000000..d7f1ac22c7 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.html @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://arturwin.office.itmill.com:8888/" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.server.component.table.TableWithCustomConverterFactory?debug&restartApplication</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsservercomponenttableTableWithCustomConverterFactory::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td> + <td>Second column is 1</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsservercomponenttableTableWithCustomConverterFactory::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td> + <td>Integer: 1</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsservercomponenttableTableWithCustomConverterFactory::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td> + <td>Second column is 4589</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsservercomponenttableTableWithCustomConverterFactory::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[0]</td> + <td>Integer: 4589</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java b/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java new file mode 100644 index 0000000000..60be786e8b --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java @@ -0,0 +1,91 @@ +/* + * Copyright 2012 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.components.table; + +import java.util.Locale; + +import com.vaadin.data.util.converter.Converter; +import com.vaadin.data.util.converter.DefaultConverterFactory; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Table; + +public class TableWithCustomConverterFactory extends AbstractTestUI { + + public static class MyIntegerConverter implements + Converter<String, Integer> { + + @Override + public Integer convertToModel(String value, Locale locale) + throws com.vaadin.data.util.converter.Converter.ConversionException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String convertToPresentation(Integer value, Locale locale) + throws com.vaadin.data.util.converter.Converter.ConversionException { + return "Integer: " + value; + } + + @Override + public Class<Integer> getModelType() { + return Integer.class; + } + + @Override + public Class<String> getPresentationType() { + return String.class; + } + + } + + public static class MyConverterFactory extends DefaultConverterFactory { + @Override + protected Converter<String, ?> createStringConverter(Class<?> sourceType) { + if (Integer.class.isAssignableFrom(sourceType)) { + return new MyIntegerConverter(); + } else { + return super.createStringConverter(sourceType); + } + } + } + + @Override + protected void setup(VaadinRequest request) { + getSession().setConverterFactory(new MyConverterFactory()); + Table t = new Table(); + t.addContainerProperty("String column", String.class, ""); + t.addContainerProperty("Integer column", Integer.class, ""); + t.addItem(new Object[] { "Second column is 1", 1 }, "item1"); + t.addItem(new Object[] { "Second column is 4589", 4589 }, "item2"); + + addComponent(t); + } + + @Override + protected String getTestDescription() { + // TODO Auto-generated method stub + return null; + } + + @Override + protected Integer getTicketNumber() { + // TODO Auto-generated method stub + return null; + } + +} |