[richfaces-svn-commits] JBoss Rich Faces SVN: r22478 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: a4jMediaOutput and 2 other directories.

Author: ppitonak(a)redhat.com Date: 2011-05-06 14:23:48 -0400 (Fri, 06 May 2011) New Revision: 22478 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jMediaOutput/TestImage.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java Log: tests fixed Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java 2011-05-06 12:51:46 UTC (rev 22477) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java 2011-05-06 18:23:48 UTC (rev 22478) @@ -118,7 +118,7 @@ for (int i = 1; i <= count; i++) { String description = selenium.getText(phasesItems.getNthChildElement(i)); - if (!description.startsWith("* ")) { + if (!description.startsWith("*")) { set = new LinkedHashSet<String>(); map.put(getPhaseId(description), set); } else { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jMediaOutput/TestImage.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jMediaOutput/TestImage.java 2011-05-06 12:51:46 UTC (rev 22477) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jMediaOutput/TestImage.java 2011-05-06 18:23:48 UTC (rev 22478) @@ -78,20 +78,20 @@ } } - for (int x = 151; x < 300; x++) { + for (int x = 150; x < 300; x++) { for (int y = 0; y < 60; y++) { assertEquals(bufferedImage.getRGB(x, y), Color.RED.getRGB(), "Top-right quadrant should be red [" + x + ", " + y + "]."); } } for (int x = 0; x < 150; x++) { - for (int y = 61; y < 120; y++) { + for (int y = 60; y < 120; y++) { assertEquals(bufferedImage.getRGB(x, y), Color.BLUE.getRGB(), "Bottom-left quadrant should be blue [" + x + ", " + y + "]."); } } - for (int x = 151; x < 300; x++) { - for (int y = 61; y < 120; y++) { + for (int x = 150; x < 300; x++) { + for (int y = 60; y < 120; y++) { assertEquals(bufferedImage.getRGB(x, y), Color.GREEN.getRGB(), "Bottom-right quadrant should be yellow [" + x + ", " + y + "]."); } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java 2011-05-06 12:51:46 UTC (rev 22477) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java 2011-05-06 18:23:48 UTC (rev 22478) @@ -91,7 +91,7 @@ assertEquals(selenium.getText(output), "new value", "Output did not change."); String listenerText = selenium.getText(jq("div#phasesPanel li:eq(3)")); - assertEquals(listenerText, "* value changed: RichFaces 4 -> new value", "Value change listener was not invoked."); + assertEquals(listenerText, "*1 value changed: RichFaces 4 -> new value", "Value change listener was not invoked."); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java 2011-05-06 12:51:46 UTC (rev 22477) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java 2011-05-06 18:23:48 UTC (rev 22478) @@ -73,7 +73,7 @@ assertEquals(selenium.getText(output), "new value", "Output did not change."); String listenerText = selenium.getText(jq("div#phasesPanel li:eq(3)")); - assertEquals(listenerText, "* value changed: RichFaces 4 -> new value", "Value change listener was not invoked."); + assertEquals(listenerText, "*1 value changed: RichFaces 4 -> new value", "Value change listener was not invoked."); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-05-06 12:51:46 UTC (rev 22477) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-05-06 18:23:48 UTC (rev 22478) @@ -230,7 +230,7 @@ phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); - phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "value changed: 2 -> -10"); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "1 value changed: 2 -> -10"); } @Test