Author: jjamrich Date: 2011-05-19 03:47:18 -0400 (Thu, 19 May 2011) New Revision: 22500 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/RequestTypeModelGuard.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/waiting/WaitFactory.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/NestedRegionModel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/TestNestedRegion.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFilteringTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableSelection.java 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/TestTreeModelAdaptorToggling.java Log: Fix checkcode violations Main changes in static attributes, where was required made them private and create access methods. In many cases solved by made them final and change case accordingly Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/RequestTypeModelGuard.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/RequestTypeModelGuard.java 2011-05-19 07:46:35 UTC (rev 22499) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/RequestTypeModelGuard.java 2011-05-19 07:47:18 UTC (rev 22500) @@ -34,7 +34,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -public class RequestTypeModelGuard implements MethodHandler { +public final class RequestTypeModelGuard implements MethodHandler { private RequestTypeGuard guard; private RequestTypeModelGuard(RequestTypeGuard guard) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/waiting/WaitFactory.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/waiting/WaitFactory.java 2011-05-19 07:46:35 UTC (rev 22499) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/waiting/WaitFactory.java 2011-05-19 07:47:18 UTC (rev 22500) @@ -46,27 +46,32 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -public class WaitFactory { +public final class WaitFactory { + /** elementPresent waiting */ + public static final ElementPresent ELEMENT_PRESENT = ElementPresent.getInstance(); + /** * Waits for GUI interaction, such as rendering */ - public static AjaxWaiting waitGui = waitAjax().interval(WAIT_GUI_INTERVAL).timeout(getSeleniumTimeout(GUI)); + public static final AjaxWaiting WAIT_GUI = waitAjax().interval(WAIT_GUI_INTERVAL).timeout(getSeleniumTimeout(GUI)); /** * Waits for AJAX interaction with server - not computationally difficult */ - public static AjaxWaiting waitAjax = waitAjax().interval(WAIT_AJAX_INTERVAL).timeout(getSeleniumTimeout(AJAX)); + public static final AjaxWaiting WAIT_AJAX = waitAjax().interval(WAIT_AJAX_INTERVAL).timeout(getSeleniumTimeout(AJAX)); /** * Waits for computationally difficult requests */ - public static SeleniumWaiting waitModel = waitSelenium().interval(WAIT_MODEL_INTERVAL).timeout( + public static final SeleniumWaiting WAIT_MODEL = waitSelenium().interval(WAIT_MODEL_INTERVAL).timeout( getSeleniumTimeout(MODEL)); - public static ElementPresent elementPresent = ElementPresent.getInstance(); - public static TextEquals textEquals = TextEquals.getInstance(); - public static StyleEquals styleEquals = StyleEquals.getInstance(); - public static AttributePresent attributePresent = AttributePresent.getInstance(); - public static AttributeEquals attributeEquals = AttributeEquals.getInstance(); - public static AlertPresent alertPresent = AlertPresent.getInstance(); - public static AlertEquals alertEquals = AlertEquals.getInstance(); - public static CountEquals countEquals = CountEquals.getInstance(); + public static final TextEquals TEXT_EQUALS = TextEquals.getInstance(); + public static final StyleEquals STYLE_EQUALS = StyleEquals.getInstance(); + public static final AttributePresent ATTRIBUTE_PRESENT = AttributePresent.getInstance(); + public static final AttributeEquals ATTRIBUTE_EQUALS = AttributeEquals.getInstance(); + public static final AlertPresent ALERT_PRESENT = AlertPresent.getInstance(); + public static final AlertEquals ALERT_EQUALS = AlertEquals.getInstance(); + public static final CountEquals COUNT_EQUALS = CountEquals.getInstance(); + + private WaitFactory() { }; + } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java 2011-05-19 07:46:35 UTC (rev 22499) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java 2011-05-19 07:47:18 UTC (rev 22500) @@ -7,7 +7,7 @@ import static org.jboss.test.selenium.locator.Attribute.TITLE; import static org.jboss.test.selenium.locator.reference.ReferencedLocator.ref; import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format; -import static org.jboss.test.selenium.waiting.WaitFactory.waitAjax; +import static org.jboss.test.selenium.waiting.WaitFactory.WAIT_AJAX; import static org.jboss.test.selenium.waiting.retrievers.RetrieverFactory.RETRIEVE_ATTRIBUTE; import static org.jboss.test.selenium.waiting.retrievers.RetrieverFactory.RETRIEVE_TEXT; import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq; @@ -130,7 +130,7 @@ private void assertChangeIfNotEqualToOldValue(Retriever<Integer> retrieveCount, Integer eventCount, String eventType) { if (!eventCount.equals(retrieveCount.getValue())) { - assertEquals(waitAjax.failWith(eventType).waitForChangeAndReturn(retrieveCount), eventCount); + assertEquals(WAIT_AJAX.failWith(eventType).waitForChangeAndReturn(retrieveCount), eventCount); } else { assertEquals(retrieveCount.retrieve(), eventCount); } @@ -152,8 +152,8 @@ public void checkTimes(Input event, long requestDelay) { Retriever<Long> retrieveEventTime = (event == Input.FIRST) ? retrieveEvent1Time : retrieveEvent2Time; - long eventTime = waitAjax.waitForChangeAndReturn(retrieveEventTime); - long beginTime = waitAjax.waitForChangeAndReturn(retrieveBeginTime); + long eventTime = WAIT_AJAX.waitForChangeAndReturn(retrieveEventTime); + long beginTime = WAIT_AJAX.waitForChangeAndReturn(retrieveBeginTime); long actualDelay = beginTime - eventTime; long deviation = Math.abs(actualDelay - requestDelay); long maxDeviation = Math.max(300, requestDelay / 2); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/NestedRegionModel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/NestedRegionModel.java 2011-05-19 07:46:35 UTC (rev 22499) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/NestedRegionModel.java 2011-05-19 07:47:18 UTC (rev 22500) @@ -76,11 +76,11 @@ public enum Component { OUTER("Outer"), REGION("Region"), NESTED("Nested region"), DECORATION("Decoration"), INSERTION("Insertion"); - public final JQueryLocator select; - public final JQueryLocator output; - public final JQueryLocator input; - public final JQueryLocator link; - public final OptionLocator<?> executeOption; + private final JQueryLocator select; + private final JQueryLocator output; + private final JQueryLocator input; + private final JQueryLocator link; + private final OptionLocator<?> executeOption; private Component(String name) { String id = name.substring(0, 1).toLowerCase() + WordUtils.capitalize(name).replace(" ", "").substring(1); @@ -108,8 +108,8 @@ Component.OUTER), COMPONENT_REGION(Component.REGION), COMPONENT_NESTED(Component.NESTED), COMPONENT_DECORATION( Component.DECORATION), COMPONENT_INSERTION(Component.INSERTION); - public final OptionLocator<?> option; - public final Component componentBase; + private final OptionLocator<?> option; + private final Component componentBase; private Execute(String label) { this.option = optionLabel(label); @@ -124,5 +124,9 @@ public boolean isComponentBased() { return componentBase != null; } + + public Component getComponentBase() { + return componentBase; + } } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/TestNestedRegion.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/TestNestedRegion.java 2011-05-19 07:46:35 UTC (rev 22499) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/TestNestedRegion.java 2011-05-19 07:47:18 UTC (rev 22500) @@ -96,15 +96,15 @@ } if (execute.isComponentBased()) { - expectedChanges.add(execute.componentBase); + expectedChanges.add(execute.getComponentBase()); } } private void obtainActualChanges() { actualChanges = EnumSet.noneOf(Component.class); - for (Component component : Component.values()) { - if (component.isChanged()) { - actualChanges.add(component); + for (Component currentComponent : Component.values()) { + if (currentComponent.isChanged()) { + actualChanges.add(currentComponent); } } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFilteringTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFilteringTest.java 2011-05-19 07:46:35 UTC (rev 22499) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFilteringTest.java 2011-05-19 07:47:18 UTC (rev 22500) @@ -49,10 +49,6 @@ private static final String[] FILTER_TITLES = new String[] { "Director", null, "CEO" }; private static final Integer[] FILTER_NUMBER_OF_KIDS = new Integer[] { 2, 100, 0, 5 }; - public ExpectedEmployee filterEmployee; - public List<Employee> expectedEmployees; - public int rows; - JQueryLocator selectSex = jq("select"); JQueryLocator inputName = jq("input"); JQueryLocator inputTitle = jq("input"); @@ -61,6 +57,10 @@ FilteringDataTable filtering = new FilteringDataTable(); + private ExpectedEmployee filterEmployee; + private List<Employee> expectedEmployees; + private int rows; + @BeforeMethod public void setup() { filterEmployee = new ExpectedEmployee(); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java 2011-05-19 07:46:35 UTC (rev 22499) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java 2011-05-19 07:47:18 UTC (rev 22500) @@ -24,8 +24,8 @@ import static org.jboss.test.selenium.javascript.JQueryScript.jqObject; import static org.jboss.test.selenium.javascript.JQueryScript.jqScript; import static org.jboss.test.selenium.locator.LocatorFactory.jq; -import static org.jboss.test.selenium.waiting.WaitFactory.elementPresent; -import static org.jboss.test.selenium.waiting.WaitFactory.waitGui; +import static org.jboss.test.selenium.waiting.WaitFactory.ELEMENT_PRESENT; +import static org.jboss.test.selenium.waiting.WaitFactory.WAIT_GUI; import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq; import java.awt.event.KeyEvent; @@ -43,128 +43,128 @@ */ public class Autocomplete implements Model { - private static String KEY_UP = "38"; - private static String KEY_DOWN = "40"; + private static final String KEY_UP = "38"; + private static final String KEY_DOWN = "40"; - AjaxSelenium selenium = AjaxSeleniumProxy.getInstance(); + AjaxSelenium selenium = AjaxSeleniumProxy.getInstance(); - JQueryLocator input = pjq("input.rf-au-inp[id$=autocompleteInput]"); - - JQueryLocator items = jq("div.rf-au-lst-cord[id$=autocompleteList] div[id$=autocompleteItems]"); - JQueryLocator selection = items.getDescendant(jq("div.rf-au-itm-sel")); - JQueryLocator option = jq("div.rf-au-itm"); - JQueryLocator labeledOption = jq("div.rf-au-opt:contains('{0}')"); - - public void typeKeys(String keys) { - for (int i = 0; i < keys.length(); i++) { - final String key = String.valueOf(keys.charAt(i)); - selenium.focus(input); - selenium.keyPress(input, key); - selenium.fireEvent(input, Event.KEYDOWN); - } - } - - public void confirmByKeys() { - pressEnter(); - } - - public void selectByKeys(String label) { - int labeledIndex = getLabeledOptionIndex(label); - while (getSelectedOptionIndex() < labeledIndex) { - pressDown(); - } - while (getSelectedOptionIndex() > labeledIndex) { - pressUp(); - } - } - - public boolean isLabeledOptionAvailable(String label) { - return selenium.isElementPresent(getLabeledOption(label)); - } - - public int getLabeledOptionIndex(String label) { - String index = selenium.getEval(jqScript(getLabeledOption(label), - "index()")); - return Integer.valueOf(index); - } - - public int getSelectedOptionIndex() { - JavaScript script = jqScript(option, "index({0})").parametrize( - jqObject(selection)); - String index = selenium.getEval(script); - return Integer.valueOf(index); - } - - public String getSelectedOptionText() { - return selenium.getText(selection); - } - - public String getInputText() { - return selenium.getValue(input); - } - - private JQueryLocator getLabeledOption(String label) { - return labeledOption.format(label); - } - - public void pressBackspace() { - selenium.keyPressNative(String.valueOf(KeyEvent.VK_BACK_SPACE)); - } - - public void pressUp() { - selenium.keyDown(input, KEY_UP); - } - - public void pressDown() { - selenium.keyDown(input, KEY_DOWN); - } - - public void pressEnter() { - selenium.keyDownNative(Integer.toString(KeyEvent.VK_ENTER)); - } - - public void pressLeft() { - selenium.keyPressNative(String.valueOf(KeyEvent.VK_LEFT)); - } - - public void pressRight() { - selenium.keyPressNative(String.valueOf(KeyEvent.VK_RIGHT)); - } - - public void pressDelete() { - selenium.keyPressNative(String.valueOf(KeyEvent.VK_DELETE)); - } - - public void textSelectionLeft(int size) { - selenium.keyDownNative(String.valueOf(KeyEvent.VK_SHIFT)); - for (int i = 0; i < size; i++) { - selenium.keyPressNative(String.valueOf(KeyEvent.VK_LEFT)); - } - selenium.keyUpNative(String.valueOf(KeyEvent.VK_SHIFT)); - } - - public void textSelectionRight(int size) { - selenium.keyDownNative(String.valueOf(KeyEvent.VK_SHIFT)); - for (int i = 0; i < size; i++) { - selenium.keyPressNative(String.valueOf(KeyEvent.VK_RIGHT)); - } - selenium.keyUpNative(String.valueOf(KeyEvent.VK_SHIFT)); - } - - public void textSelectAll() { - selenium.keyDownNative(String.valueOf(KeyEvent.VK_CONTROL)); - selenium.keyPressNative(String.valueOf(KeyEvent.VK_A)); - selenium.keyDownNative(String.valueOf(KeyEvent.VK_CONTROL)); - } - - public boolean isCompletionVisible() { - if (!selenium.isElementPresent(items)) { - return false; - } - return selenium.isVisible(items); - } - - public void waitForCompletionVisible() { - waitGui.until(elementPresent.locator(option)); - } + JQueryLocator input = pjq("input.rf-au-inp[id$=autocompleteInput]"); + + JQueryLocator items = jq("div.rf-au-lst-cord[id$=autocompleteList] div[id$=autocompleteItems]"); + JQueryLocator selection = items.getDescendant(jq("div.rf-au-itm-sel")); + JQueryLocator option = jq("div.rf-au-itm"); + JQueryLocator labeledOption = jq("div.rf-au-opt:contains('{0}')"); + + public void typeKeys(String keys) { + for (int i = 0; i < keys.length(); i++) { + final String key = String.valueOf(keys.charAt(i)); + selenium.focus(input); + selenium.keyPress(input, key); + selenium.fireEvent(input, Event.KEYDOWN); + } + } + + public void confirmByKeys() { + pressEnter(); + } + + public void selectByKeys(String label) { + int labeledIndex = getLabeledOptionIndex(label); + while (getSelectedOptionIndex() < labeledIndex) { + pressDown(); + } + while (getSelectedOptionIndex() > labeledIndex) { + pressUp(); + } + } + + public boolean isLabeledOptionAvailable(String label) { + return selenium.isElementPresent(getLabeledOption(label)); + } + + public int getLabeledOptionIndex(String label) { + String index = selenium.getEval(jqScript(getLabeledOption(label), + "index()")); + return Integer.valueOf(index); + } + + public int getSelectedOptionIndex() { + JavaScript script = jqScript(option, "index({0})").parametrize( + jqObject(selection)); + String index = selenium.getEval(script); + return Integer.valueOf(index); + } + + public String getSelectedOptionText() { + return selenium.getText(selection); + } + + public String getInputText() { + return selenium.getValue(input); + } + + private JQueryLocator getLabeledOption(String label) { + return labeledOption.format(label); + } + + public void pressBackspace() { + selenium.keyPressNative(String.valueOf(KeyEvent.VK_BACK_SPACE)); + } + + public void pressUp() { + selenium.keyDown(input, KEY_UP); + } + + public void pressDown() { + selenium.keyDown(input, KEY_DOWN); + } + + public void pressEnter() { + selenium.keyDownNative(Integer.toString(KeyEvent.VK_ENTER)); + } + + public void pressLeft() { + selenium.keyPressNative(String.valueOf(KeyEvent.VK_LEFT)); + } + + public void pressRight() { + selenium.keyPressNative(String.valueOf(KeyEvent.VK_RIGHT)); + } + + public void pressDelete() { + selenium.keyPressNative(String.valueOf(KeyEvent.VK_DELETE)); + } + + public void textSelectionLeft(int size) { + selenium.keyDownNative(String.valueOf(KeyEvent.VK_SHIFT)); + for (int i = 0; i < size; i++) { + selenium.keyPressNative(String.valueOf(KeyEvent.VK_LEFT)); + } + selenium.keyUpNative(String.valueOf(KeyEvent.VK_SHIFT)); + } + + public void textSelectionRight(int size) { + selenium.keyDownNative(String.valueOf(KeyEvent.VK_SHIFT)); + for (int i = 0; i < size; i++) { + selenium.keyPressNative(String.valueOf(KeyEvent.VK_RIGHT)); + } + selenium.keyUpNative(String.valueOf(KeyEvent.VK_SHIFT)); + } + + public void textSelectAll() { + selenium.keyDownNative(String.valueOf(KeyEvent.VK_CONTROL)); + selenium.keyPressNative(String.valueOf(KeyEvent.VK_A)); + selenium.keyDownNative(String.valueOf(KeyEvent.VK_CONTROL)); + } + + public boolean isCompletionVisible() { + if (!selenium.isElementPresent(items)) { + return false; + } + return selenium.isVisible(items); + } + + public void waitForCompletionVisible() { + WAIT_GUI.until(ELEMENT_PRESENT.locator(option)); + } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableSelection.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableSelection.java 2011-05-19 07:46:35 UTC (rev 22499) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableSelection.java 2011-05-19 07:47:18 UTC (rev 22500) @@ -83,17 +83,14 @@ public void testMultiSelectionUsingControl() { Collection<Integer> forSelection = order(2, 5, 29, 16, 13, 21); - try { - for (int s : forSelection) { - selection.click(s, CTRL); + for (int s : forSelection) { + selection.click(s, CTRL); - assertEquals(selection.getPrevious(), selected); - selected.add(s); - assertEquals(selection.getCurrent(), selected); - } - } catch (RuntimeException e) { - throw e; + assertEquals(selection.getPrevious(), selected); + selected.add(s); + assertEquals(selection.getCurrent(), selected); } + } @Test @@ -238,6 +235,8 @@ case SHIFT: selenium.shiftKeyUp(); break; + default: + break; } } @@ -249,6 +248,8 @@ case SHIFT: selenium.shiftKeyDown(); break; + default: + break; } } } 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-05-19 07:46:35 UTC (rev 22499) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-05-19 07:47:18 UTC (rev 22500) @@ -45,21 +45,21 @@ * @version $Revision$ */ public class TestTreeModelAdaptorSelection extends TestTreeSelection { - + @Inject + PathsCrate paths; + PathsCrate pathsForListModel = new PathsCrate("listModel", new Integer[][] {{2, 1, 3 }, {3, 3, 2, 2 } }); + PathsCrate pathsForMapModel = new PathsCrate("mapModel", new Integer[][] {{2, 1, 5 }, {3, 3, 2, 6 } }); + PathsCrate pathsForRecursiveModel = new PathsCrate("recursiveModel", new Integer[][] {{4, 1, 10, 2 }, + {1, 4, 3, 11, 4 } }); + + @Inject @Use(enumeration = true) - public RecursiveModelRepresentation representation; + private RecursiveModelRepresentation representation; @Inject @Use(booleans = { true, false }) - public boolean recursiveLeafChildrenNullable; - - @Inject - PathsCrate paths; - PathsCrate pathsForListModel = new PathsCrate("listModel", new Integer[][] { { 2, 1, 3 }, { 3, 3, 2, 2 } }); - PathsCrate pathsForMapModel = new PathsCrate("mapModel", new Integer[][] { { 2, 1, 5 }, { 3, 3, 2, 6 } }); - PathsCrate pathsForRecursiveModel = new PathsCrate("recursiveModel", new Integer[][] { { 4, 1, 10, 2 }, - { 1, 4, 3, 11, 4 } }); + private boolean recursiveLeafChildrenNullable; public URL getTestUrl() { return buildUrl(contextPath, "http://localhost:8080/metamer/faces/components/richTree/treeAdaptors.xhtml"); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java 2011-05-19 07:46:35 UTC (rev 22499) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java 2011-05-19 07:47:18 UTC (rev 22500) @@ -43,11 +43,11 @@ @Inject @Use(enumeration = true) - public RecursiveModelRepresentation representation; + private RecursiveModelRepresentation representation; @Inject @Use(booleans = { true, false }) - public boolean recursiveLeafChildrenNullable; + private boolean recursiveLeafChildrenNullable; @BeforeClass public void setupTreeModelTesting() {