From: Automerge <automerge@vaadin.com>
Date: Wed, 15 Feb 2012 15:19:14 +0000 (+0000)
Subject: [merge from 6.7] Set explicit resolution to make screenshot merging easier
X-Git-Tag: 7.0.0.alpha2~444^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3c2de952974b3e0e82de7951d814fd6312b434af;p=vaadin-framework.git

[merge from 6.7] Set explicit resolution to make screenshot merging easier

svn changeset:23037/svn branch:6.8
---

diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
index 2b006fbfca..474df7abcb 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
@@ -66,6 +66,9 @@ public class GridLayoutTests extends AbstractLayoutTests {
         glo.replaceComponent(row1, row1 = new DateField());
         glo.replaceComponent(row2, row2 = new DateField());
         glo.replaceComponent(row3, row3 = new DateField());
+        ((DateField) row1).setResolution(DateField.RESOLUTION_SEC);
+        ((DateField) row2).setResolution(DateField.RESOLUTION_SEC);
+        ((DateField) row2).setResolution(DateField.RESOLUTION_SEC);
         glo.setComponentAlignment(col2, alignments[6]);
         glo.setComponentAlignment(col3, alignments[7]);
         glo.setComponentAlignment(col1, alignments[8]);