From adffaces-commits-return-614-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Fri Aug 11 16:27:02 2006 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 5886 invoked from network); 11 Aug 2006 16:27:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Aug 2006 16:27:02 -0000 Received: (qmail 51693 invoked by uid 500); 11 Aug 2006 16:27:02 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 51665 invoked by uid 500); 11 Aug 2006 16:27:02 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 51646 invoked by uid 99); 11 Aug 2006 16:27:01 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Aug 2006 09:27:01 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Aug 2006 09:26:50 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 35F8F1A981D; Fri, 11 Aug 2006 09:26:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r430818 [2/9] - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ trinidad-api/src/test/java/org/apache/myfaces/trinida... Date: Fri, 11 Aug 2006 16:25:11 -0000 To: adffaces-commits@incubator.apache.org From: awiner@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060811162630.35F8F1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXTableTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXTableTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXTableTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXTableTest.java Fri Aug 11 09:24:50 2006 @@ -54,11 +54,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -127,7 +129,7 @@ assertEquals(1, table.column1Header.getDecodesRowData().size()); assertEquals(1, table.column2Header.getDecodesRowData().size()); - List detailData = table.detailStamp.getDecodesRowData(); + List detailData = table.detailStamp.getDecodesRowData(); _testDetailStamp(table, detailData); } @@ -144,7 +146,7 @@ assertEquals(1, table.column1Header.getValidatesRowData().size()); assertEquals(1, table.column2Header.getValidatesRowData().size()); - List detailData = table.detailStamp.getValidatesRowData(); + List detailData = table.detailStamp.getValidatesRowData(); _testDetailStamp(table, detailData); } @@ -161,7 +163,7 @@ assertEquals(1, table.column1Header.getUpdatesRowData().size()); assertEquals(1, table.column2Header.getUpdatesRowData().size()); - List detailData = table.detailStamp.getUpdatesRowData(); + List detailData = table.detailStamp.getUpdatesRowData(); _testDetailStamp(table, detailData); } @@ -260,6 +262,7 @@ } + @SuppressWarnings("unchecked") public void testNotRenderedSaveRestoreState() { // this test is to make sure no exceptions are thrown during save/restore @@ -282,6 +285,8 @@ } + @SuppressWarnings("unchecked") + @Override protected void doTestUpdateModelValues( FacesContext context, UIViewRoot root, @@ -291,6 +296,8 @@ root.processUpdates(context); } + @SuppressWarnings("unchecked") + @Override protected void doTestProcessValidations( FacesContext context, UIViewRoot root, @@ -300,6 +307,7 @@ root.processValidators(context); } + @Override public void setCurrentContext(FacesContext fc) { // prevent removal of facesContext before we are done testing: @@ -327,14 +335,14 @@ assertEquals(isValid, testComp.isValid()); } - private void _testDetailStamp(TestTable table, List detailData) + private void _testDetailStamp(TestTable table, List detailData) { assertEquals(1, detailData.size()); table.setRowIndex(_DISCLOSED_INDEX); assertEquals(table.getRowData(), detailData.get(0)); } - private void _testColumnChild(TestTable table, List rowData) + private void _testColumnChild(TestTable table, List rowData) { // make sure that the rowData values that were seen during this phase // were the correct values: @@ -355,6 +363,8 @@ // test.testSaveRestoreStateGetValue(); } + @SuppressWarnings("unchecked") + @Override protected void doTestApplyRequestValues( FacesContext context, UIViewRoot root, @@ -364,6 +374,7 @@ root.processDecodes(context); } + @Override protected boolean isRendererUsed() { // we use our own MockRenderer; not the one created by our super class: @@ -385,7 +396,7 @@ private static SortableModel _createTableData() { final int sz = 25; - List data = new ArrayList(sz); + List data = new ArrayList(sz); for(int i=0; i getType(FacesContext context) throws EvaluationException, PropertyNotFoundException { throw new AssertionFailedError("This method should not be called"); } + @Override public Object getValue(FacesContext context) throws EvaluationException, PropertyNotFoundException { if (doNotCall) @@ -410,11 +423,13 @@ return _createTableData(); } + @Override public boolean isReadOnly(FacesContext context) throws EvaluationException, PropertyNotFoundException { throw new AssertionFailedError("This method should not be called"); } + @Override public void setValue(FacesContext context, Object value) throws EvaluationException, PropertyNotFoundException { throw new AssertionFailedError("This method should not be called"); @@ -445,46 +460,55 @@ private static final class TestComponent extends UIXInput { + @SuppressWarnings("unchecked") public TestComponent(String id) { + _decodes = Collections.EMPTY_LIST; + _updates = Collections.EMPTY_LIST; + _validates = Collections.EMPTY_LIST; setId(id); } + @Override public void processDecodes(FacesContext fc) { _decodes = _addRowData(fc, _decodes); } + @Override public void processUpdates(FacesContext fc) { _updates = _addRowData(fc, _updates); } + @Override public void processValidators(FacesContext fc) { _validates = _addRowData(fc, _validates); } - public List getDecodesRowData() + public List getDecodesRowData() { return _decodes; } - public List getValidatesRowData() + public List getValidatesRowData() { return _validates; } - public List getUpdatesRowData() + public List getUpdatesRowData() { return _updates; } + @Override public String toString() { return getId(); } + @Override protected Renderer getRenderer(FacesContext fc) { // for testing purposes must return null. Otherwise a renderer @@ -492,25 +516,26 @@ return null; } - private List _addRowData(FacesContext fc, List currList) + private List _addRowData(FacesContext fc, List currList) { if (currList == Collections.EMPTY_LIST) - currList = new ArrayList(10); + currList = new ArrayList(10); Object rowData = fc.getExternalContext().getRequestMap().get(_VAR); currList.add(rowData); return currList; } - private List _decodes = Collections.EMPTY_LIST; - private List _updates = Collections.EMPTY_LIST; - private List _validates = Collections.EMPTY_LIST; + private List _decodes; + private List _updates; + private List _validates; } private static final String _VAR = "row"; private static final class TestTable extends UIXTable { + @SuppressWarnings("unchecked") public TestTable(SortableModel model) { super(); @@ -521,6 +546,7 @@ UIXColumn column1 = new UIXColumn() { + @Override protected Renderer getRenderer(FacesContext fc) { // for testing purposes must return null. Otherwise a renderer @@ -536,6 +562,7 @@ UIXColumn column2 = new UIXColumn() { + @Override protected Renderer getRenderer(FacesContext fc) { // for testing purposes must return null. Otherwise a renderer @@ -549,7 +576,7 @@ column2Child = new TestComponent("col2Child"); column2.getChildren().add(column2Child); - List kids = getChildren(); + List kids = getChildren(); kids.add(column1); kids.add(column2); @@ -564,6 +591,7 @@ } } + @Override protected Renderer getRenderer(FacesContext fc) { // for testing purposes must return null. Otherwise a renderer Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXTreeTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXTreeTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXTreeTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXTreeTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -86,7 +88,7 @@ } - + @Override public void setCurrentContext(FacesContext fc) { // prevent removal of facesContext before we are done testing: @@ -100,7 +102,7 @@ TestRunner.run(UIXTreeTest.class); } - + @Override protected boolean isRendererUsed() { // we use our own MockRenderer; not the one created by our super class: Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/CoreFormTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/CoreFormTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/CoreFormTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/CoreFormTest.java Fri Aug 11 09:24:50 2006 @@ -44,11 +44,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -184,6 +186,7 @@ return _willBeSubmitted; } + @Override public void decode(FacesContext context) { super.decode(context); @@ -193,6 +196,7 @@ private final boolean _willBeSubmitted; } + @Override protected boolean willChildrenBeProcessed(UIComponent component) { if (!component.isRendered()) Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/data/CoreColumnTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/data/CoreColumnTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/data/CoreColumnTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/data/CoreColumnTest.java Fri Aug 11 09:24:50 2006 @@ -41,11 +41,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/data/CoreSelectRangeChoiceBarTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/data/CoreSelectRangeChoiceBarTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/data/CoreSelectRangeChoiceBarTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/data/CoreSelectRangeChoiceBarTest.java Fri Aug 11 09:24:50 2006 @@ -46,11 +46,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -129,7 +131,7 @@ private class MockRangeChangeListener implements RangeChangeListener { - public List list() + public List list() { return _list; } @@ -139,7 +141,7 @@ _list.add(event); } - private List _list = new ArrayList(); + private List _list = new ArrayList(); } /** Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/input/CoreInputHiddenTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/input/CoreInputHiddenTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/input/CoreInputHiddenTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/input/CoreInputHiddenTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -55,6 +57,7 @@ return new TestSuite(CoreInputHiddenTest.class); } + @Override protected final UIXEditableValue createEditableValue() { return new CoreInputHidden(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/input/CoreSelectBooleanCheckboxTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/input/CoreSelectBooleanCheckboxTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/input/CoreSelectBooleanCheckboxTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/input/CoreSelectBooleanCheckboxTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -55,6 +57,7 @@ return new TestSuite(CoreSelectBooleanCheckboxTest.class); } + @Override protected final UIXEditableValue createEditableValue() { return new CoreSelectBooleanCheckbox(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelAccordionTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelAccordionTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelAccordionTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelAccordionTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelBorderLayoutTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelBorderLayoutTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelBorderLayoutTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelBorderLayoutTest.java Fri Aug 11 09:24:50 2006 @@ -39,11 +39,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -93,6 +95,7 @@ doTestFacetTransparency(component, CorePanelBorderLayout.END_FACET); } + @Override protected UIXPanel createTestComponent() { return new CorePanelBorderLayout(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelBoxTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelBoxTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelBoxTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelBoxTest.java Fri Aug 11 09:24:50 2006 @@ -39,11 +39,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -91,6 +93,7 @@ //doTestAttributeTransparency(component, "width", "10%", "20%"); } + @Override protected UIXPanel createTestComponent() { return new CorePanelBox(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelChoiceTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelChoiceTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelChoiceTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelChoiceTest.java Fri Aug 11 09:24:50 2006 @@ -41,11 +41,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelGroupLayoutTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelGroupLayoutTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelGroupLayoutTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelGroupLayoutTest.java Fri Aug 11 09:24:50 2006 @@ -38,11 +38,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -83,6 +85,7 @@ doTestFacetTransparency(component, CorePanelGroupLayout.SEPARATOR_FACET); } + @Override protected UIXPanel createTestComponent() { return new CorePanelGroupLayout(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelHeaderTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelHeaderTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelHeaderTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelHeaderTest.java Fri Aug 11 09:24:50 2006 @@ -38,11 +38,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -87,6 +89,7 @@ "foo", "bar"); } + @Override protected UIXPanel createTestComponent() { return new CorePanelHeader(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelListTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelListTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelListTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelListTest.java Fri Aug 11 09:24:50 2006 @@ -38,11 +38,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -82,6 +84,7 @@ new Integer(1), new Integer(2)); } + @Override protected UIXPanel createTestComponent() { return new CorePanelList(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelRadioTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelRadioTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelRadioTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelRadioTest.java Fri Aug 11 09:24:50 2006 @@ -41,11 +41,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelSideBarTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelSideBarTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelSideBarTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelSideBarTest.java Fri Aug 11 09:24:50 2006 @@ -38,11 +38,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -79,6 +81,7 @@ "20%"); } + @Override protected UIXPanel createTestComponent() { return new CorePanelSideBar(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowDetailHeaderTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowDetailHeaderTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowDetailHeaderTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowDetailHeaderTest.java Fri Aug 11 09:24:50 2006 @@ -39,11 +39,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -54,6 +56,7 @@ return new TestSuite(CoreShowDetailHeaderTest.class); } + @Override protected UIXShowDetail createHideShow() { return new CoreShowDetailHeader(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowDetailTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowDetailTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowDetailTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowDetailTest.java Fri Aug 11 09:24:50 2006 @@ -39,11 +39,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -54,7 +56,7 @@ return new TestSuite(CoreShowDetailTest.class); } - + @Override protected UIXShowDetail createHideShow() { return new CoreShowDetail(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreBreadCrumbsTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreBreadCrumbsTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreBreadCrumbsTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreBreadCrumbsTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreMenuChoiceTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreMenuChoiceTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreMenuChoiceTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreMenuChoiceTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreTrainTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreTrainTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreTrainTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/nav/CoreTrainTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreOutputTextTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreOutputTextTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreOutputTextTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreOutputTextTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSeparatorTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSeparatorTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSeparatorTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSeparatorTest.java Fri Aug 11 09:24:50 2006 @@ -39,11 +39,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -85,6 +87,7 @@ // no facets yet } + @Override protected UIXObject createTestComponent() { return new CoreSeparator(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSpacerTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSpacerTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSpacerTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSpacerTest.java Fri Aug 11 09:24:50 2006 @@ -38,11 +38,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -86,6 +88,7 @@ // no facets yet } + @Override protected UIXObject createTestComponent() { return new CoreSpacer(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlCellFormatTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlCellFormatTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlCellFormatTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlCellFormatTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlFrameBorderLayoutTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlFrameBorderLayoutTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlFrameBorderLayoutTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlFrameBorderLayoutTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlFrameTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlFrameTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlFrameTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlFrameTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlHtmlTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlHtmlTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlHtmlTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlHtmlTest.java Fri Aug 11 09:24:50 2006 @@ -41,11 +41,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlRowLayoutTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlRowLayoutTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlRowLayoutTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlRowLayoutTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlScriptTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlScriptTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlScriptTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlScriptTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlTableLayoutTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlTableLayoutTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlTableLayoutTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/html/HtmlTableLayoutTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java Fri Aug 11 09:24:50 2006 @@ -15,6 +15,8 @@ */ package org.apache.myfaces.trinidad.context; +import java.awt.Color; +import java.util.List; import java.util.Map; import java.util.TimeZone; import javax.faces.component.UIComponent; @@ -46,42 +48,54 @@ _agent = agent; } + @Override public Agent getAgent() { return _agent; } + @Override public PageResolver getPageResolver() { throw new UnsupportedOperationException("Not implemented yet"); } + @Override public PageFlowScopeProvider getPageFlowScopeProvider() { throw new UnsupportedOperationException("Not implemented yet"); } - + @Override public DialogService getDialogService() { throw new UnsupportedOperationException("Not implemented yet"); } - public Map getPageFlowScope() + @Override + public Map getPageFlowScope() { throw new UnsupportedOperationException("Not implemented yet"); } - public void returnFromDialog(Object returnValue, Map returnParam) + @Override + public void returnFromDialog(Object returnValue, Map returnParam) { throw new UnsupportedOperationException("Should not be called during rendering"); } - public void launchDialog(UIViewRoot dialogRoot, Map dialogParameters, UIComponent source, boolean useWindow, Map windowProperties) + @Override + public void launchDialog( + UIViewRoot dialogRoot, + Map dialogParameters, + UIComponent source, + boolean useWindow, + Map windowProperties) { throw new UnsupportedOperationException("Should not be called during rendering"); } + @Override public boolean isPostback() { return false; @@ -93,16 +107,19 @@ return false; } + @Override public boolean isDebugOutput() { return false; } + @Override public boolean isClientValidationDisabled() { return false; } + @Override public String getOutputMode() { return null; @@ -113,11 +130,13 @@ _skin = skin; } + @Override public String getSkinFamily() { return _skin; } + @Override public String getAccessibilityMode() { return _accMode; @@ -128,6 +147,7 @@ _accMode = accMode; } + @Override public boolean isRightToLeft() { return _rtl; @@ -138,6 +158,7 @@ _rtl = rtl; } + @Override public char getNumberGroupingSeparator() { return _numberGroupingSeparator; @@ -148,6 +169,7 @@ _numberGroupingSeparator = sep; } + @Override public char getDecimalSeparator() { return _decimalSeparator; @@ -158,6 +180,7 @@ _decimalSeparator = sep; } + @Override public String getCurrencyCode() { return _currencyCode; @@ -168,6 +191,7 @@ _currencyCode = code; } + @Override public int getTwoDigitYearStart() { return _twoDigitYearStart; @@ -178,21 +202,25 @@ _twoDigitYearStart = start; } + @Override public String getOracleHelpServletUrl() { throw new UnsupportedOperationException("Not implemented yet"); } - public Map getHelpTopic() + @Override + public Map getHelpTopic() { throw new UnsupportedOperationException("Not implemented yet"); } - public Map getHelpSystem() + @Override + public Map getHelpSystem() { throw new UnsupportedOperationException("Not implemented yet"); } + @Override public TimeZone getTimeZone() { return _timeZone; @@ -203,41 +231,49 @@ _timeZone = timeZone; } + @Override public void addPartialTarget(UIComponent newTarget) { // throw new UnsupportedOperationException("Not implemented yet"); } + @Override public void addPartialTriggerListeners(UIComponent listener, String[] trigger) { throw new UnsupportedOperationException("Should not be called during rendering"); } + @Override public void partialUpdateNotify(UIComponent updated) { throw new UnsupportedOperationException("Should not be called during rendering"); } + @Override public UploadedFileProcessor getUploadedFileProcessor() { throw new UnsupportedOperationException("Should not be called during rendering"); } - public Map getColorPalette() + @Override + public Map> getColorPalette() { throw new UnsupportedOperationException("Not implemented yet"); } - public Map getFormatter() + @Override + public Map> getFormatter() { throw new UnsupportedOperationException("Not implemented yet"); } + @Override public ChangeManager getChangeManager() { throw new UnsupportedOperationException("Not implemented yet"); } + @Override public RegionManager getRegionManager() { throw new UnsupportedOperationException("Not implemented yet"); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ColorConverterTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ColorConverterTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ColorConverterTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ColorConverterTest.java Fri Aug 11 09:24:50 2006 @@ -43,11 +43,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -223,7 +225,7 @@ new Color(105,105,105), }; - List patternsHoloder = new ArrayList(); + List patternsHoloder = new ArrayList(); patternsHoloder.add(new String[]{"#RRGGBB", "RRGGBB"}); patternsHoloder.add(new String[]{"RR.GG.BB", "#RRGGBB" }); patternsHoloder.add(new String[]{"RRGGBB", "r-g-b"}); @@ -239,7 +241,7 @@ for (int i = 0; i < patternsHoloder.size(); i++) { - String[] patterns = (String[]) patternsHoloder.get(i); + String[] patterns = patternsHoloder.get(i); converter.setPatterns(patterns); doTestGetAsString(converter, facesContext, wrapper, colors[i], matchValues[i] ); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java Fri Aug 11 09:24:50 2006 @@ -449,6 +449,7 @@ * @param expectedDate * @return */ + @SuppressWarnings("deprecation") protected static boolean isEqual(Date convDate, Date expectedDate) { GregorianCalendar convGcal = new GregorianCalendar(); @@ -457,6 +458,8 @@ GregorianCalendar expGcal = new GregorianCalendar(); expGcal.setTime(expectedDate); + // -= Simon Lessard =- + // FIXME: Switch to Calendar methods return (convDate.getSeconds() == expectedDate.getSeconds()) && (convDate.getYear() == expectedDate.getYear()) && Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfDateTimeConverterTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfDateTimeConverterTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfDateTimeConverterTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfDateTimeConverterTest.java Fri Aug 11 09:24:50 2006 @@ -32,11 +32,13 @@ super(name); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -47,6 +49,7 @@ return new TestSuite(JsfDateTimeConverterTest.class); } + @Override protected void doTestStateHolderSaveRestore( Converter conv1, Converter conv2, @@ -68,6 +71,7 @@ wrapper.getMock().verify(); } + @Override protected void doTestEquals( Converter conv1, Converter conv2, @@ -81,12 +85,14 @@ assertEquals(expectedOutCome, isEqual); } + @Override protected DateTimeConverter getDateTimeConverter() { return new DateTimeConverter(); } + @Override protected void setSecondaryPattern( DateTimeConverter converter, String secondaryPattern Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfNumberConverterTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfNumberConverterTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfNumberConverterTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfNumberConverterTest.java Fri Aug 11 09:24:50 2006 @@ -40,11 +40,13 @@ super(name); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -55,11 +57,13 @@ return new TestSuite(JsfNumberConverterTest.class); } + @Override protected NumberConverter getNumberConverter() { return new NumberConverter(); } + @Override protected void doTestStateHolderSaveRestore( Converter conv1, Converter conv2, @@ -100,6 +104,7 @@ ); } + @Override protected void doTestEquals( Converter conv1, Converter conv2, @@ -113,6 +118,7 @@ assertEquals(expectedOutCome, isEqual); } + @Override protected void doTestStrictNess( MockFacesContext context, MockUIComponentWrapper wrapper, Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java Fri Aug 11 09:24:50 2006 @@ -491,7 +491,10 @@ private static final String[] _TYPES = {"currency","percent"}; - private static final boolean[] _GROUPING = {true, false}; + // -= Simon Lessard =- + // TODO: Never read locally as of 2006-08-09. Remove whenever possible + // or implements a grouping test using this constant. + //private static final boolean[] _GROUPING = {true, false}; private static final boolean[] _INTEGER_ONLY = {true, false}; Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java Fri Aug 11 09:24:50 2006 @@ -41,7 +41,7 @@ super(name); } - + @Override public void setUp() { super.setUp(); @@ -50,6 +50,7 @@ _mafct.setTimeZone(DEFAULT_TIME_ZONE); } + @Override public void tearDown() { super.tearDown(); @@ -235,11 +236,13 @@ } } + @Override protected javax.faces.convert.DateTimeConverter getDateTimeConverter() { return new DateTimeConverter(); } + @Override protected void setSecondaryPattern( javax.faces.convert.DateTimeConverter converter, String secondaryPattern @@ -248,6 +251,7 @@ ((DateTimeConverter)converter).setSecondaryPattern(secondaryPattern); } + @Override protected void doTestStateHolderSaveRestore( Converter conv1, Converter conv2, Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java Fri Aug 11 09:24:50 2006 @@ -44,11 +44,13 @@ super(name); } + @Override protected NumberConverter getNumberConverter() { return new org.apache.myfaces.trinidad.convert.NumberConverter(); } + @Override public void setUp() { super.setUp(); @@ -58,6 +60,7 @@ _mafct.setCurrencyCode(null); } + @Override public void tearDown() { @@ -74,6 +77,7 @@ return new TestSuite(TrinidadNumberConverterTest.class); } + @Override public void testCurrencyCodeIsHonoured() { DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.US); @@ -104,6 +108,7 @@ mock.verify(); } + @Override protected void doTestStrictNess( MockFacesContext context, MockUIComponentWrapper wrapper, Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModelTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModelTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModelTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModelTest.java Fri Aug 11 09:24:50 2006 @@ -35,11 +35,13 @@ super(name); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -71,8 +73,8 @@ { TreeModel model = createModel(); - Bean root = (Bean) _ROOTS.get(0); - Bean sub = (Bean) root.getKids().get(1); + Bean root = _ROOTS.get(0); + Bean sub = root.getKids().get(1); int[] testPath = {0, 1}; _followPath(model, testPath); @@ -121,7 +123,7 @@ * Tests getRowData, isContainer, enterContainer, exitContainer, getRowCount, * setRowIndex, getRowIndex, getContainerRowKey */ - private void _testTree(TreeModel model, List data) + private void _testTree(TreeModel model, List data) { int sz = data.size(); assertEquals("rowCount", sz, model.getRowCount()); @@ -132,7 +134,7 @@ int oldIndex = model.getRowIndex(); for(int i=0; i kids = bean.getKids(); boolean hasChildren = (kids != null); assertEquals("isContainer", hasChildren, model.isContainer()); @@ -173,11 +175,11 @@ return model; } - private static final List _ROOTS = _createTree(); + private static final List _ROOTS = _createTree(); - private static List _createTree() + private static List _createTree() { - List roots = new ArrayList(3); + List roots = new ArrayList(3); Bean root, sub, subsub; @@ -205,7 +207,7 @@ public static final class Bean { - public List getKids() + public List getKids() { return _kids; } @@ -214,12 +216,12 @@ { if (_kids == null) { - _kids = new ArrayList(3); + _kids = new ArrayList(3); } _kids.add(kid); } - private List _kids = null; + private List _kids = null; } } Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetImplTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetImplTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetImplTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetImplTest.java Fri Aug 11 09:24:50 2006 @@ -48,11 +48,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -124,13 +126,15 @@ Object k2 = _getKey(1); Object k3 = _getKey(2); - List infinite = new AbstractList() + List infinite = new AbstractList() { + @Override public int size() { return Integer.MAX_VALUE; } + @Override public Object get(int index) { // code in javax.faces.model.ListDataModel always fetches index 0: Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImplTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImplTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImplTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImplTest.java Fri Aug 11 09:24:50 2006 @@ -42,11 +42,13 @@ super(name); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/SortableModelTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/SortableModelTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/SortableModelTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/SortableModelTest.java Fri Aug 11 09:24:50 2006 @@ -39,11 +39,13 @@ super(name); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -137,7 +139,7 @@ // Test sorting an empty model - see bug 4258884 public void testEmptyTable() { - DataModel emptyModel = new ListDataModel(new ArrayList()); + DataModel emptyModel = new ListDataModel(new ArrayList()); SortableModel sModel = new SortableModel(emptyModel); _sort(sModel, "age", false); } @@ -172,7 +174,7 @@ private DataModel _createTestDataModel() { - List list = new ArrayList(3); + List list = new ArrayList(3); list.add(_bean1); list.add(_bean2); list.add(_bean3); @@ -215,6 +217,7 @@ return _obj; } + @Override public String toString() { return "name:"+_name+" age:"+_age; Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/resource/AggregatingResourceLoaderTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/resource/AggregatingResourceLoaderTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/resource/AggregatingResourceLoaderTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/resource/AggregatingResourceLoaderTest.java Fri Aug 11 09:24:50 2006 @@ -91,6 +91,7 @@ private class ThrowingResourceLoader extends LocalResourceLoader { + @Override protected URL findResource( String name ) throws IOException @@ -104,6 +105,7 @@ private class UnknownLengthResourceLoader extends LocalResourceLoader { + @Override protected URL findResource( String name ) throws IOException @@ -118,6 +120,7 @@ private class UnknownLengthStreamHandler extends URLStreamHandler { + @Override protected URLConnection openConnection( URL url ) throws IOException @@ -135,16 +138,19 @@ super(url); } + @Override public int getContentLength() { return -1; } + @Override public void connect() throws IOException { // no-op } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(new byte[0]); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/resource/ResourceLoaderTestCase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/resource/ResourceLoaderTestCase.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/resource/ResourceLoaderTestCase.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/resource/ResourceLoaderTestCase.java Fri Aug 11 09:24:50 2006 @@ -75,6 +75,7 @@ public class LocalResourceLoader extends ResourceLoader { + @Override protected URL findResource( String name ) throws IOException Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ArrayMapTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ArrayMapTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ArrayMapTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ArrayMapTest.java Fri Aug 11 09:24:50 2006 @@ -29,14 +29,15 @@ super(testName); } + @Override protected boolean isNullRemove() { return true; } - - protected Map createMap() + @Override + protected Map createMap() { - return new ArrayMap(); + return new ArrayMap(); } } Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64InputStreamTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64InputStreamTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64InputStreamTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64InputStreamTest.java Fri Aug 11 09:24:50 2006 @@ -45,11 +45,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64OutputStreamTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64OutputStreamTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64OutputStreamTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/Base64OutputStreamTest.java Fri Aug 11 09:24:50 2006 @@ -44,11 +44,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); @@ -198,7 +200,7 @@ // write out each char in str to the stream for (int i = 0; i tree = new TreeSet(); for (int i = 0; i < 250; i++) tree.add(new Integer(i)); ListFromCollection lfc = new ListFromCollection(); lfc.setSize(100); - List list = lfc.getList().get(tree); + List list = lfc.getList().get(tree); assertEquals(tree.size(), list.size()); assertEquals(new Integer(5), list.get(5)); assertEquals(new Integer(155), list.get(155)); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ServiceTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ServiceTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ServiceTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ServiceTest.java Fri Aug 11 09:24:50 2006 @@ -59,6 +59,7 @@ assertEquals(b2, Service.getService(b2, Interface2.class)); } + @SuppressWarnings("cast") public void testProvider() { Base b = new UsesProvider(); @@ -99,10 +100,12 @@ static public class UsesProvider extends Base implements Service.Provider { - public Object getService(Class serviceClass) + @SuppressWarnings("unchecked") + public T getService(Class serviceClass) { if (serviceClass == Interface1.class) - return new Interface1() {}; + return (T)new Interface1(){}; + return null; } } Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ByteLengthValidatorTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ByteLengthValidatorTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ByteLengthValidatorTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ByteLengthValidatorTest.java Fri Aug 11 09:24:50 2006 @@ -38,11 +38,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java Fri Aug 11 09:24:50 2006 @@ -48,11 +48,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/RegExpValidatorTest.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/RegExpValidatorTest.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/RegExpValidatorTest.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/RegExpValidatorTest.java Fri Aug 11 09:24:50 2006 @@ -38,11 +38,13 @@ super(testName); } + @Override public void setUp() { super.setUp(); } + @Override public void tearDown() { super.tearDown(); Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ValidatorTestCase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ValidatorTestCase.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ValidatorTestCase.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ValidatorTestCase.java Fri Aug 11 09:24:50 2006 @@ -43,7 +43,7 @@ protected void setMockLabelForComponent(MockUIComponentWrapper wrapper) { - Map attributes = new HashMap(); + Map attributes = new HashMap(); attributes.put("label", "label"); wrapper.getMock().stubs().method("getAttributes").will(returnValue(attributes)); } Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/AbstractBaseTestCase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/AbstractBaseTestCase.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/AbstractBaseTestCase.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/AbstractBaseTestCase.java Fri Aug 11 09:24:50 2006 @@ -45,7 +45,7 @@ { int i; Mock c = mock(UIComponent.class); - Map attrs = new HashMap(); + Map attrs = new HashMap(); for (i = 0; i < attributeNames.length; i++) attrs.put(attributeNames[i], attributeNames[i]); for (i = 0; i < iterations; i++) Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/FacesTestCase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/FacesTestCase.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/FacesTestCase.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/FacesTestCase.java Fri Aug 11 09:24:50 2006 @@ -18,7 +18,7 @@ import java.io.IOException; -import java.util.Iterator; +import java.util.List; import javax.faces.FactoryFinder; import javax.faces.component.UIComponent; @@ -51,6 +51,7 @@ super(testName); } + @Override public void setUp() { super.setUp(); @@ -63,6 +64,7 @@ renderKitFactory.addRenderKit("org.apache.myfaces.trinidad.core", renderKit); } + @Override public void tearDown() { super.tearDown(); @@ -74,7 +76,7 @@ * @param renderkitFactoryClass the render kit factory class */ protected RenderKitFactory setupRenderKitFactory( - Class renderkitFactoryClass) + Class renderkitFactoryClass) { FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY, @@ -103,6 +105,7 @@ * * @throws IOException when the render fails */ + @SuppressWarnings("unchecked") protected void doRenderResponse( FacesContext context, UIComponent component) throws IOException @@ -114,10 +117,8 @@ } else { - Iterator children = component.getChildren().iterator(); - while (children.hasNext()) + for(UIComponent child : (List)component.getChildren()) { - UIComponent child = (UIComponent)children.next(); doRenderResponse(context, child); } } Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MapTestCase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MapTestCase.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MapTestCase.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MapTestCase.java Fri Aug 11 09:24:50 2006 @@ -36,7 +36,7 @@ public void testInitialState() { - Map map = createMap(); + Map map = createMap(); assertEquals(0, map.size()); assertTrue(map.isEmpty()); assertTrue(map.entrySet().isEmpty()); @@ -47,7 +47,7 @@ public void testPut() { - Map map = createMap(); + Map map = createMap(); assertNull(map.put("foo", "bar")); assertEquals(1, map.size()); assertEquals("bar", map.get("foo")); @@ -68,8 +68,8 @@ public void testPutAll() { - Map map = createMap(); - HashMap hashMap = new HashMap(); + Map map = createMap(); + HashMap hashMap = new HashMap(); _putTwo(hashMap); map.putAll(hashMap); @@ -84,7 +84,7 @@ public void testPutNull() { - Map map = createMap(); + Map map = createMap(); // Test putting a null value try @@ -135,17 +135,17 @@ public void testEntrySet() { - Map map = createMap(); + Map map = createMap(); _putTwo(map); - Set entries = map.entrySet(); + Set> entries = map.entrySet(); assertEquals(2, entries.size()); _assertIteratorSize(entries.iterator(), 2); - Iterator iterator = entries.iterator(); + Iterator> iterator = entries.iterator(); while (iterator.hasNext()) { - Map.Entry entry = (Map.Entry) iterator.next(); + Map.Entry entry = iterator.next(); if (entry.getKey().equals("second")) { entry.setValue(new Integer(3)); @@ -193,11 +193,11 @@ public void testEquals() { - Map map = createMap(); + Map map = createMap(); _putTwo(map); assertEquals(map, map); - Map secondMap = createMap(); + Map secondMap = createMap(); assertTrue(!secondMap.equals(map)); assertTrue(!map.equals(secondMap)); assertTrue(!map.equals(null)); @@ -205,7 +205,7 @@ _putTwo(secondMap); assertEquals(map, secondMap); - HashMap hashMap = new HashMap(); + HashMap hashMap = new HashMap(); _putTwo(hashMap); assertEquals(hashMap, map); assertEquals(map, hashMap); @@ -213,7 +213,7 @@ public void testRemove() { - Map map = createMap(); + Map map = createMap(); _putTwo(map); assertNull(map.remove("NOTTHERE")); assertEquals(new Integer(2), map.remove("second")); @@ -230,14 +230,14 @@ public void testKeySet() { - Map map = createMap(); + Map map = createMap(); _putTwo(map); - Set keys = map.keySet(); + Set keys = map.keySet(); assertEquals(2, keys.size()); assertTrue(keys.contains("first")); assertTrue(keys.contains("second")); - HashSet hashSet = new HashSet(); + HashSet hashSet = new HashSet(); hashSet.add("first"); hashSet.add("second"); @@ -256,9 +256,9 @@ public void testValues() { - Map map = createMap(); + Map map = createMap(); _putTwo(map); - Collection values = map.values(); + Collection values = map.values(); assertEquals(2, values.size()); assertTrue(values.contains(new Integer(1))); assertTrue(values.contains(new Integer(2))); @@ -293,7 +293,7 @@ return true; } - private void _assertIteratorSize(Iterator iterator, int count) + private void _assertIteratorSize(Iterator iterator, int count) { for (int i = 0; i < count; i++) { @@ -304,11 +304,11 @@ assertTrue(!iterator.hasNext()); } - private void _putTwo(Map map) + private void _putTwo(Map map) { map.put("first", new Integer(1)); map.put("second", new Integer(2)); } - abstract protected Map createMap(); + abstract protected Map createMap(); } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/AbstractTextNode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/AbstractTextNode.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/AbstractTextNode.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/AbstractTextNode.java Fri Aug 11 09:24:50 2006 @@ -128,7 +128,7 @@ * added under; always returns an enumeration containing only * TEXT_ATTR. */ - public Iterator getAttributeNames( + public Iterator getAttributeNames( UIXRenderingContext context ) { @@ -150,7 +150,7 @@ /** * Returns null. */ - public Iterator getChildNames( + public Iterator getChildNames( UIXRenderingContext context ) { Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/AttributeKey.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/AttributeKey.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/AttributeKey.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/AttributeKey.java Fri Aug 11 09:24:50 2006 @@ -66,7 +66,7 @@ if (attrName == null) throw new IllegalArgumentException(); - AttributeKey attr = (AttributeKey)_sAttrs.get(attrName); + AttributeKey attr = _sAttrs.get(attrName); if (attr == null) attr = new AttributeKey(attrName, -1); @@ -115,11 +115,13 @@ return _attrName; } + @Override public String toString() { return _attrName; } + @Override public boolean equals( Object otherObject ) @@ -127,6 +129,7 @@ return (this == otherObject); } + @Override public int hashCode() { return _attrName.hashCode(); @@ -135,7 +138,10 @@ private String _attrName; private int _attrIndex; - private static Hashtable _sAttrs = new Hashtable(203); + // -= Simon Lessard =- + // TODO: Check if synchronization is really required + private static Hashtable _sAttrs = + new Hashtable(203); // If someone called AttributeKey before UIConstants was // loaded, bad things happen. Prevent this. @@ -147,7 +153,7 @@ // } // Then "attr" would _not_ be the same instance as SOURCE_ATTR. // Which makes stuff blow up. This line fixes that problem. - private static final Class _UICONSTANTS_CLASS = UIConstants.class; + private static final Class _UICONSTANTS_CLASS = UIConstants.class; static { // Hack to eliminate "unused private field" warning Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseMutableUINode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseMutableUINode.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseMutableUINode.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseMutableUINode.java Fri Aug 11 09:24:50 2006 @@ -157,7 +157,7 @@ * Convenience method for appending an enumeration of indexed children. */ public final void addIndexedChildren( - Iterator indexedChildren + Iterator indexedChildren ) { NodeUtils.addIndexedChildren(this, indexedChildren); @@ -346,6 +346,7 @@ * @param createIfNull if true, creates * a ContextMap object if one has not yet been created. */ + @Override protected final ContextMap getNamedChildMap( boolean forMutating ) @@ -373,6 +374,7 @@ * @param createIfNull if true, creates * an AttributeMap object if one has not yet been created. */ + @Override protected final AttributeMap getAttributeMap( boolean createIfNull ) @@ -420,6 +422,7 @@ * @see #replaceIndexedChild * @see #getIndexedChildCount */ + @Override protected final UINodeList getIndexedNodeList( boolean createIfNull ) @@ -448,7 +451,7 @@ */ protected ContextMap createNamedChildMap() { - return new MapContextMap(new ArrayMap()); + return new MapContextMap(new ArrayMap()); } /** Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseRenderer.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseRenderer.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseRenderer.java Fri Aug 11 09:24:50 2006 @@ -92,14 +92,15 @@ postrender(context, node); - boolean assertEnabled = false; - assert assertEnabled = true; - - if (false && assertEnabled) - { - // show the node that ended this output - context.getResponseWriter().writeComment("End:" + node); - } + // -= Simon Lessard =- + // Completely useless piece of code... + //boolean assertEnabled = false; + //assert assertEnabled = true; + //if (false && assertEnabled) + //{ + // // show the node that ended this output + // context.getResponseWriter().writeComment("End:" + node); + //} } Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseUINode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseUINode.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseUINode.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/BaseUINode.java Fri Aug 11 09:24:50 2006 @@ -195,7 +195,7 @@ *

* @see #getNamedChild */ - public Iterator getChildNames( + public Iterator getChildNames( UIXRenderingContext context ) { @@ -261,7 +261,7 @@ *

* @see #getAttributeValue */ - public Iterator getAttributeNames( + public Iterator getAttributeNames( UIXRenderingContext context ) { @@ -428,8 +428,7 @@ return context.getRendererManager().getRenderer(getNamespaceURI(), getLocalName()); } - - + @Override public String toString() { StringBuffer buffer = new StringBuffer(40); Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/ClassRendererInstantiator.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/ClassRendererInstantiator.java?rev=430818&r1=430817&r2=430818&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/ClassRendererInstantiator.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/ClassRendererInstantiator.java Fri Aug 11 09:24:50 2006 @@ -41,7 +41,7 @@ { try { - Class classInstance = ClassLoaderUtils.loadClass(_className); + Class classInstance = ClassLoaderUtils.loadClass(_className); return (Renderer) classInstance.newInstance(); } catch (ClassNotFoundException cnfe)