Author: lfryc(a)redhat.com Date: 2011-02-24 06:09:55 -0500 (Thu, 24 Feb 2011) New Revision: 21909 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSelection.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java Log: made tree selection asserts little more verbose Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSelection.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSelection.java 2011-02-24 05:30:15 UTC (rev 21908) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSelection.java 2011-02-24 11:09:55 UTC (rev 21909) @@ -29,11 +29,13 @@ import static org.testng.Assert.assertTrue; import java.net.URL; +import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; import org.jboss.test.selenium.locator.JQueryLocator; +import org.jboss.test.selenium.utils.text.SimplifiedFormat; import org.richfaces.component.SwitchType; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; @@ -62,7 +64,7 @@ @Inject @Use(value = "selectionTypes") - SwitchType selectionType = SwitchType.client; + SwitchType selectionType; SwitchType[] selectionTypes = new SwitchType[] { SwitchType.ajax, SwitchType.client }; SwitchType[] eventEnabledSelectionTypes = new SwitchType[] { SwitchType.ajax }; @@ -122,10 +124,22 @@ } treeNode.select(); assertEquals(getClientId(), "richTree"); - assertEquals(getSelection(), path); - assertEquals(getNewSelection(), path); + assertEquals( + getSelection(), + path, + SimplifiedFormat.format("Actual Selection ({0}) doesn't correspond to expected ({1})", + Arrays.deepToString(getSelection()), Arrays.deepToString(path))); + assertEquals( + getNewSelection(), + path, + SimplifiedFormat.format("Actual New selection ({0}) doesn't correspond to expected ({1})", + Arrays.deepToString(getNewSelection()), Arrays.deepToString(path))); if (old != null) { - assertEquals(getOldSelection(), old); + assertEquals( + getOldSelection(), + old, + SimplifiedFormat.format("Actual Old selection ({0}) doesn't correspond to expected ({1})", + Arrays.deepToString(getOldSelection()), Arrays.deepToString(old))); } else { assertEquals(selenium.getText(oldSelection), "[]"); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-02-24 05:30:15 UTC (rev 21908) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-02-24 11:09:55 UTC (rev 21909) @@ -57,7 +57,7 @@ @Inject @Use(enumeration = true) - public RecursiveModelRepresentation representation = RecursiveModelRepresentation.LIST; + public RecursiveModelRepresentation representation; @Inject @Use(booleans = { true, false }) @@ -134,7 +134,7 @@ list.add(integer); } if (list.isEmpty()) { - throw new IllegalStateException("pattern does not match"); + throw new IllegalStateException("selection string does not match pattern: " + string); } return list.toArray(new Integer[list.size()]); }