layout.xml - new tests

integration-tests/sample-site/src/main/webapp/sanity/comparators/layout/height_detection.jsp

@@ -0,0 +1,29 @@
+<%--
+
+    AET
+
+    Copyright (C) 2013 Cognifide Limited
+
+    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.
+
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ include file="/includes/header.jsp" %>
+<%
+String timestamp = Long.toString(System.currentTimeMillis());
+%>
+<%@ include file="/includes/bodyContent.jsp" %>
+<div class="space" />
+    <%@ include file="dynamic_content.jsp" %>
+</div>
+<%@ include file="/includes/footer.jsp" %>

integration-tests/test-suite/partials/layout.xml

@@ -67,7 +67,7 @@
 	<test name="F-comparator-Layout-Hide-space">
 		<collect>
 			<open />
-            <resolution width="1500" />
+			<resolution width="1500" />
 			<sleep duration="3000" />
 			<hide xpath="//*[@class='space']" />
 			<screen />
@@ -84,7 +84,7 @@
 			<open />
 			<sleep duration="3000" />
 			<hide xpath="//*[@class='space']" leaveBlankSpace="false" />
-            <resolution width="1500" />
+			<resolution width="1500" />
 			<screen />
 		</collect>
 		<compare>
@@ -152,5 +152,35 @@
 			<url href="comparators/layout/success.jsp" />
 		</urls>
 	</test>
+
+	<test name="F-comparator-Layout-Auto-Height-Detection-with-dynamic-content-at-bottom">
+		<collect>
+			<open />
+			<resolution width="767" />
+			<sleep duration="3000" />
+			<screen />
+		</collect>
+		<compare>
+			<screen comparator="layout" />
+		</compare>
+		<urls>
+			<url href="comparators/layout/height_detection.jsp" />
+		</urls>
+	</test>
+
+	<test name="S-comparator-Layout-Fixed-Height">
+		<collect>
+			<open />
+			<resolution width="767" height="400"/>
+			<sleep duration="3000" />
+			<screen />
+		</collect>
+		<compare>
+			<screen comparator="layout" />
+		</compare>
+		<urls>
+			<url href="comparators/layout/height_detection.jsp" />
+		</urls>
+	</test>
 	<!-- Layout-Comparator END -->
 </suite>