aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src/main/java/com/vaadin/v7
diff options
context:
space:
mode:
authorDenis <denis@vaadin.com>2017-01-02 13:04:26 +0200
committerPekka Hyvönen <pekka@vaadin.com>2017-01-02 13:04:26 +0200
commit6adc887b7f94f5fb6e83c34822358e2240018147 (patch)
treed932f91bb8d57fbab784cb3300ddb9bf849d4744 /uitest/src/main/java/com/vaadin/v7
parent0740ac116e637d81bd7e2415746f020dd25102e6 (diff)
downloadvaadin-framework-6adc887b7f94f5fb6e83c34822358e2240018147.tar.gz
vaadin-framework-6adc887b7f94f5fb6e83c34822358e2240018147.zip
Migrate Grid tests P1. (#8108)
* Migrate Grid tests P1. Fixes vaadin/framework8-issues#586
Diffstat (limited to 'uitest/src/main/java/com/vaadin/v7')
-rw-r--r--uitest/src/main/java/com/vaadin/v7/tests/components/grid/BeanRenderer.java25
-rw-r--r--uitest/src/main/java/com/vaadin/v7/tests/components/grid/CustomRenderer.java91
-rw-r--r--uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInit.java62
-rw-r--r--uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddRow.java49
-rw-r--r--uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridApplyFilterWhenScrolledDown.java62
-rw-r--r--uitest/src/main/java/com/vaadin/v7/tests/components/grid/IntArrayRenderer.java24
-rw-r--r--uitest/src/main/java/com/vaadin/v7/tests/components/grid/RowAwareRenderer.java33
7 files changed, 0 insertions, 346 deletions
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/BeanRenderer.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/BeanRenderer.java
deleted file mode 100644
index c3036e93b4..0000000000
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/BeanRenderer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2000-2016 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.v7.tests.components.grid;
-
-import com.vaadin.tests.widgetset.client.SimpleTestBean;
-import com.vaadin.v7.ui.Grid.AbstractRenderer;
-
-public class BeanRenderer extends AbstractRenderer<SimpleTestBean> {
- public BeanRenderer() {
- super(SimpleTestBean.class, "");
- }
-}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/CustomRenderer.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/CustomRenderer.java
deleted file mode 100644
index 5c7d1deb1b..0000000000
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/CustomRenderer.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2000-2016 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.v7.tests.components.grid;
-
-import com.vaadin.annotations.Widgetset;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractReindeerTestUI;
-import com.vaadin.tests.widgetset.TestingWidgetSet;
-import com.vaadin.tests.widgetset.client.SimpleTestBean;
-import com.vaadin.ui.Label;
-import com.vaadin.v7.data.Item;
-import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.util.IndexedContainer;
-import com.vaadin.v7.ui.Grid;
-import com.vaadin.v7.ui.Grid.SelectionMode;
-
-@Widgetset(TestingWidgetSet.NAME)
-public class CustomRenderer extends AbstractReindeerTestUI {
-
- private static final Object INT_ARRAY_PROPERTY = "int array";
- private static final Object VOID_PROPERTY = "void";
- private static final Object BEAN_PROPERTY = "pojo";
-
- static final Object ITEM_ID = "itemId1";
- static final String DEBUG_LABEL_ID = "debuglabel";
- static final String INIT_DEBUG_LABEL_CAPTION = "Debug label placeholder";
-
- @Override
- protected void setup(VaadinRequest request) {
- IndexedContainer container = new IndexedContainer();
- container.addContainerProperty(INT_ARRAY_PROPERTY, int[].class,
- new int[] {});
- container.addContainerProperty(VOID_PROPERTY, Void.class, null);
- container.addContainerProperty(BEAN_PROPERTY, SimpleTestBean.class,
- null);
-
- Item item = container.addItem(ITEM_ID);
-
- @SuppressWarnings("unchecked")
- Property<int[]> propertyIntArray = item
- .getItemProperty(INT_ARRAY_PROPERTY);
- propertyIntArray.setValue(new int[] { 1, 1, 2, 3, 5, 8, 13 });
-
- @SuppressWarnings("unchecked")
- Property<SimpleTestBean> propertyPojo = item
- .getItemProperty(BEAN_PROPERTY);
- SimpleTestBean bean = new SimpleTestBean();
- bean.setValue(42);
- propertyPojo.setValue(bean);
-
- Label debugLabel = new Label(INIT_DEBUG_LABEL_CAPTION);
- debugLabel.setId(DEBUG_LABEL_ID);
-
- Grid grid = new Grid(container);
-
- grid.getColumn(INT_ARRAY_PROPERTY).setRenderer(new IntArrayRenderer());
- grid.getColumn(VOID_PROPERTY)
- .setRenderer(new RowAwareRenderer(debugLabel));
- grid.getColumn(BEAN_PROPERTY).setRenderer(new BeanRenderer());
-
- grid.setSelectionMode(SelectionMode.NONE);
-
- addComponent(grid);
- addComponent(debugLabel);
- }
-
- @Override
- protected String getTestDescription() {
- return "Verifies that renderers operating on other data than "
- + "just Strings also work ";
- }
-
- @Override
- protected Integer getTicketNumber() {
- return Integer.valueOf(13334);
- }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInit.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInit.java
deleted file mode 100644
index d759bb27ad..0000000000
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInit.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2000-2016 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.v7.tests.components.grid;
-
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractReindeerTestUI;
-import com.vaadin.v7.data.Container.Indexed;
-import com.vaadin.v7.data.util.IndexedContainer;
-import com.vaadin.v7.ui.Grid;
-
-public class GridAddAndRemoveDataOnInit extends AbstractReindeerTestUI {
-
- @Override
- protected void setup(VaadinRequest request) {
- Grid gridAdd = new Grid();
- gridAdd.setHeight("240px");
- gridAdd.setWidth("140px");
- addComponent(gridAdd);
- Indexed dataSource = gridAdd.getContainerDataSource();
- dataSource.addContainerProperty("foo", Integer.class, 0);
- for (int i = 0; i < 10; ++i) {
- Object id = dataSource.addItem();
- dataSource.getItem(id).getItemProperty("foo").setValue(i);
- }
- dataSource = new IndexedContainer();
- dataSource.addContainerProperty("bar", Integer.class, 0);
- for (int i = 0; i < 10; ++i) {
- Object id = dataSource.addItem();
- dataSource.getItem(id).getItemProperty("bar").setValue(i);
- }
- Grid gridRemove = new Grid(dataSource);
- gridRemove.setHeight("150px");
- gridRemove.setWidth("140px");
- addComponent(gridRemove);
- for (int i = 0; i < 5; ++i) {
- dataSource.removeItem(dataSource.getIdByIndex(i));
- }
- }
-
- @Override
- protected String getTestDescription() {
- return "Foo";
- }
-
- @Override
- protected Integer getTicketNumber() {
- return 13334;
- }
-}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddRow.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddRow.java
deleted file mode 100644
index 3ee500d78a..0000000000
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddRow.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2000-2016 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.v7.tests.components.grid;
-
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractReindeerTestUI;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.Grid;
-import com.vaadin.v7.ui.Grid.SelectionMode;
-
-public class GridAddRow extends AbstractReindeerTestUI {
-
- @Override
- protected void setup(VaadinRequest request) {
-
- final Grid grid = new Grid();
- grid.setSelectionMode(SelectionMode.MULTI);
- grid.addColumn("firstName");
- grid.addColumn("age", Integer.class);
-
- grid.addRow("Lorem", Integer.valueOf(1));
- grid.addRow("Ipsum", Integer.valueOf(2));
-
- addComponent(grid);
-
- addComponent(new Button("Add new row", new Button.ClickListener() {
- @Override
- public void buttonClick(ClickEvent event) {
- grid.addRow("Dolor", Integer.valueOf(3));
- }
- }));
-
- }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridApplyFilterWhenScrolledDown.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridApplyFilterWhenScrolledDown.java
deleted file mode 100644
index f2255389c2..0000000000
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridApplyFilterWhenScrolledDown.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.vaadin.v7.tests.components.grid;
-
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.UI;
-import com.vaadin.ui.themes.ValoTheme;
-import com.vaadin.v7.data.Container.Filterable;
-import com.vaadin.v7.data.Item;
-import com.vaadin.v7.data.util.filter.SimpleStringFilter;
-import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
-import com.vaadin.v7.event.FieldEvents.TextChangeListener;
-import com.vaadin.v7.ui.Grid;
-import com.vaadin.v7.ui.Grid.HeaderRow;
-import com.vaadin.v7.ui.TextField;
-
-public class GridApplyFilterWhenScrolledDown extends UI {
-
- private Grid grid = new Grid();
-
- @Override
- protected void init(VaadinRequest vaadinRequest) {
-
- grid.addColumn("Name", String.class);
-
- HeaderRow appendHeaderRow = grid.appendHeaderRow();
- TextField filter = getColumnFilter("Name");
- appendHeaderRow.getCell("Name").setComponent(filter);
-
- for (int i = 0; i < 1000; i++) {
- Item addItem = grid.getContainerDataSource().addItem(i);
- addItem.getItemProperty("Name").setValue("Name " + i);
-
- }
-
- Item addItem = grid.getContainerDataSource().addItem(1000);
- addItem.getItemProperty("Name").setValue("Test");
-
- // grid.scrollToStart();
- setContent(grid);
- }
-
- private TextField getColumnFilter(final Object columnId) {
- TextField filter = new TextField();
- filter.setWidth("100%");
- filter.addStyleName(ValoTheme.TEXTFIELD_TINY);
- filter.addTextChangeListener(new TextChangeListener() {
- SimpleStringFilter filter = null;
-
- @Override
- public void textChange(TextChangeEvent event) {
- Filterable f = (Filterable) grid.getContainerDataSource();
- if (filter != null) {
- f.removeContainerFilter(filter);
- }
- filter = new SimpleStringFilter(columnId, event.getText(), true,
- true);
- f.addContainerFilter(filter);
- }
- });
- return filter;
- }
-
-} \ No newline at end of file
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/IntArrayRenderer.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/IntArrayRenderer.java
deleted file mode 100644
index a50d7dd251..0000000000
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/IntArrayRenderer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2000-2016 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.v7.tests.components.grid;
-
-import com.vaadin.v7.ui.Grid.AbstractRenderer;
-
-public class IntArrayRenderer extends AbstractRenderer<int[]> {
- public IntArrayRenderer() {
- super(int[].class, "");
- }
-}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/RowAwareRenderer.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/RowAwareRenderer.java
deleted file mode 100644
index 288116b630..0000000000
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/RowAwareRenderer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2016 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.v7.tests.components.grid;
-
-import com.vaadin.tests.widgetset.client.v7.grid.RowAwareRendererConnector.RowAwareRendererRpc;
-import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.Grid.AbstractRenderer;
-
-public class RowAwareRenderer extends AbstractRenderer<Void> {
- public RowAwareRenderer(final Label debugLabel) {
- super(Void.class, "");
- registerRpc(new RowAwareRendererRpc() {
- @Override
- public void clicky(String key) {
- Object itemId = getItemId(key);
- debugLabel.setValue("key: " + key + ", itemId: " + itemId);
- }
- });
- }
-}