summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZheSun88 <zhe@vaadin.com>2019-08-02 15:35:44 +0300
committerZhe Sun <31067185+ZheSun88@users.noreply.github.com>2019-08-05 11:11:36 +0300
commited218e90868fbcc65bbc6b3fa5ef0a37c5719473 (patch)
treeab2b8e506aa775fc79cddfcdff01d46d871a666b
parentdfc7b9e2b00e5a54c445128fead824c3f272d5de (diff)
downloadvaadin-framework-ed218e90868fbcc65bbc6b3fa5ef0a37c5719473.tar.gz
vaadin-framework-ed218e90868fbcc65bbc6b3fa5ef0a37c5719473.zip
Docs fixes and enlarge tolerance
-rw-r--r--documentation/components/components-overview.asciidoc2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java8
2 files changed, 5 insertions, 5 deletions
diff --git a/documentation/components/components-overview.asciidoc b/documentation/components/components-overview.asciidoc
index 5d0ccdbaca..f4d259306a 100644
--- a/documentation/components/components-overview.asciidoc
+++ b/documentation/components/components-overview.asciidoc
@@ -63,7 +63,7 @@ abstract class.
((("[classname]#AbstractListing#")))
There are three more specific types of components.
-<<components-fields#components.fields,"Field Components">>.
+Field Components:: allow user to edit a value in the UI. All extend [classname]#AbstractField#. Field components are described in detail in <<components-fields#components.fields,"Field Components">>.
Selection Component:: show a list of data that the user can select from. All extend [classname]#AbstractListing#. Selection components are described in detail in
<<components-selection#components.selection,"Selection Components">>.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java
index 1cf2ea42df..540a9bbd29 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java
@@ -18,7 +18,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
@TestCategory("grid")
public abstract class AbstractGridColumnAutoWidthTest extends MultiBrowserTest {
- public static final int TOTAL_MARGIN_PX = 21;
+ public static final int TOTAL_MARGIN_PX = 26;
+ private static final int tolerance = 10;
@Before
public void before() {
@@ -35,7 +36,7 @@ public abstract class AbstractGridColumnAutoWidthTest extends MultiBrowserTest {
assertLessThan("header should've been narrower than body", headerWidth,
bodyWidth);
assertEquals("column should've been roughly as wide as the body",
- bodyWidth, colWidth, 5);
+ bodyWidth, colWidth, tolerance);
}
@Test
@@ -48,8 +49,7 @@ public abstract class AbstractGridColumnAutoWidthTest extends MultiBrowserTest {
assertGreater("header should've been wider than body", headerWidth,
bodyWidth);
assertEquals("column should've been roughly as wide as the header",
- headerWidth, colWidth, 5);
-
+ headerWidth, colWidth, tolerance);
}
@Test