Author: lfryc(a)redhat.com Date: 2010-12-21 13:25:06 -0500 (Tue, 21 Dec 2010) New Revision: 20732 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableSimpleTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/ExtendedDataTable.java Log: fixed ExtendedDataTable.isNoData() method Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableSimpleTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableSimpleTest.java 2010-12-21 18:24:20 UTC (rev 20731) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableSimpleTest.java 2010-12-21 18:25:06 UTC (rev 20732) @@ -71,7 +71,7 @@ } else { expectedRows = Math.min(rows, ELEMENTS_TOTAL) - expectedFirst; } - + if (expectedRows > 0) { expectedColumns = COLUMNS_TOTAL; } else { @@ -83,9 +83,9 @@ public void testRendered() { assertTrue(model.isVisible()); - + attributes.setRendered(false); - + assertFalse(model.isVisible()); assertFalse(model.isNoData()); assertEquals(model.getColumns(), 0); @@ -95,10 +95,10 @@ public void testNoDataLabel() { assertTrue(model.isVisible()); assertFalse(model.isNoData()); - + attributes.setNoDataLabel(NO_DATA); attributes.setShowData(false); - + assertTrue(model.isVisible()); assertTrue(model.isNoData()); assertEquals(model.getColumns(), 0); @@ -116,9 +116,9 @@ public void verifyTable() { assertTrue(model.isVisible()); - assertFalse(model.isNoData()); assertEquals(model.getColumns(), expectedColumns); assertEquals(model.getRows(), expectedRows); + assertFalse(model.isNoData()); } public void verifyElements() { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/ExtendedDataTable.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/ExtendedDataTable.java 2010-12-21 18:24:20 UTC (rev 20731) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/ExtendedDataTable.java 2010-12-21 18:25:06 UTC (rev 20732) @@ -83,7 +83,7 @@ @Override public boolean isNoData() { - return selenium.isElementPresent(body) && getRows() == 0; + return selenium.isElementPresent(body) && !selenium.isElementPresent(tbody); } @Override