You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/05 00:39:26 UTC
svn commit: r419125 - in
/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model:
ChildPropertyTreeModelTest.java RowKeySetImplTest.java
RowKeySetTreeImplTest.java SortableModelTest.java
Author: matzew
Date: Tue Jul 4 17:39:26 2006
New Revision: 419125
URL: http://svn.apache.org/viewvc?rev=419125&view=rev
Log:
porting down to shale-1.0.2 (still pending)
Modified:
incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/ChildPropertyTreeModelTest.java
incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetImplTest.java
incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetTreeImplTest.java
incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/SortableModelTest.java
Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/ChildPropertyTreeModelTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/ChildPropertyTreeModelTest.java?rev=419125&r1=419124&r2=419125&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/ChildPropertyTreeModelTest.java (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/ChildPropertyTreeModelTest.java Tue Jul 4 17:39:26 2006
@@ -21,30 +21,32 @@
import java.util.Collections;
import java.util.List;
-import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.apache.myfaces.adfbuild.test.MockFContext;
+import org.apache.shale.test.base.AbstractJsfTestCase;
-public class ChildPropertyTreeModelTest extends TestCase
+public class ChildPropertyTreeModelTest extends AbstractJsfTestCase
{
public ChildPropertyTreeModelTest(String name)
{
super(name);
}
- protected void setUp() throws Exception
- {
- super.setUp();
- new MockFContext();
- }
-
- protected void tearDown() throws Exception
- {
- MockFContext.clearContext();
- super.tearDown();
- }
-
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+ public static Test suite()
+ {
+ return new TestSuite(ChildPropertyTreeModelTest.class);
+ }
+
public void testInitialState() throws IntrospectionException
{
TreeModel model = createModel();
@@ -167,19 +169,6 @@
{
TreeModel model = new ChildPropertyTreeModel(_ROOTS, "kids");
return model;
- }
-
- public static void main(String[] args)
- {
- TestRunner.run(ChildPropertyTreeModelTest.class);
-// try
-// {
-// new ChildPropertyTreeModelTest("test").testGetPath();
-// } catch (Exception ex)
-// {
-// ex.printStackTrace();
-// }
-
}
private static final List _ROOTS = _createTree();
Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetImplTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetImplTest.java?rev=419125&r1=419124&r2=419125&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetImplTest.java (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetImplTest.java Tue Jul 4 17:39:26 2006
@@ -29,39 +29,36 @@
import java.util.Set;
import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.apache.myfaces.adfbuild.test.MockFContext;
+import org.apache.shale.test.base.AbstractJsfTestCase;
/**
* Test for the RowKeySetImpl class.
* @author Arjuna Wijeyekoon
*/
-public final class RowKeySetImplTest extends TestCase
+public final class RowKeySetImplTest extends AbstractJsfTestCase
{
public RowKeySetImplTest(String testName)
{
super(testName);
}
- protected void setUp() throws Exception
+ public void setUp()
{
super.setUp();
- new MockFContext();
}
- protected void tearDown() throws Exception
+ public void tearDown()
{
- MockFContext.clearContext();
super.tearDown();
}
-
- public static void main(String[] args)
+ public static Test suite()
{
- TestRunner.run(RowKeySetImplTest.class);
+ return new TestSuite(RowKeySetImplTest.class);
}
-
+
public void testInitialyEmpty()
{
RowKeySetImpl set = _createKeySet(false);
Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetTreeImplTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetTreeImplTest.java?rev=419125&r1=419124&r2=419125&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetTreeImplTest.java (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/RowKeySetTreeImplTest.java Tue Jul 4 17:39:26 2006
@@ -13,7 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.adf.model;
+package org.apache.myfaces.adf.model;
+
import java.beans.IntrospectionException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -24,17 +25,33 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import org.apache.myfaces.adfbuild.test.MockFContext;
+import org.apache.shale.test.base.AbstractJsfTestCase;
-public class RowKeySetTreeImplTest extends TestCase
+public class RowKeySetTreeImplTest extends AbstractJsfTestCase
{
public RowKeySetTreeImplTest(String name)
{
super(name);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(RowKeySetTreeImplTest.class);
}
public void testInitialState() throws IntrospectionException
@@ -45,8 +62,6 @@
public void testIterator() throws IntrospectionException
{
- // PropertyResolver needed when iteration with ChildPropertyTreeModel:
- new MockFContext();
TestPathSet pathSet = new TestPathSet();
_add(pathSet, _0, _011, _20);
@@ -58,7 +73,6 @@
assertEquals(_011, iter.next());
assertEquals(_20, iter.next());
assertFalse(iter.hasNext());
- MockFContext.clearContext();
}
public void testInitialAddAll() throws IntrospectionException
@@ -202,9 +216,6 @@
_add(set, _2, _20, _0, _011);
assertEquals("size", 4, set.size());
- // PropertyResolver needed when iteration with ChildPropertyTreeModel:
- new MockFContext();
-
set = new RowKeySetTreeImpl(true);
TreeModel model = ChildPropertyTreeModelTest.createModel();
set.setCollectionModel(model);
@@ -217,7 +228,6 @@
set.removeAll();
assertEquals("addAll:size", 10, set.size());
- MockFContext.clearContext();
}
public void testClear() throws IntrospectionException
@@ -274,11 +284,6 @@
// test state:
_testNotInSet(pathSet, _0, _011, _20);
assertTrue("is contained", pathSet.contains(_2));
- }
-
- public static void main(String[] args)
- {
- TestRunner.run(RowKeySetTreeImplTest.class);
}
private void _testInSet(RowKeySet set, Object ... keys)
Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/SortableModelTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/SortableModelTest.java?rev=419125&r1=419124&r2=419125&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/SortableModelTest.java (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/model/SortableModelTest.java Tue Jul 4 17:39:26 2006
@@ -20,31 +20,35 @@
import java.util.List;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.myfaces.adf.model.SortCriterion;
-import org.apache.myfaces.adfbuild.test.MockFContext;
+import org.apache.shale.test.base.AbstractJsfTestCase;
/**
* @author Arjuna Wijeyekoon
*/
-public class SortableModelTest extends TestCase
+public class SortableModelTest extends AbstractJsfTestCase
{
public SortableModelTest(String name)
{
super(name);
}
- protected void setUp() throws Exception
+ public void setUp()
{
super.setUp();
- new MockFContext();
}
- protected void tearDown() throws Exception
+ public void tearDown()
{
- MockFContext.clearContext();
super.tearDown();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(SortableModelTest.class);
}
public void testInitialSort()
@@ -161,11 +165,6 @@
assertTrue(dModel.getRowIndex() == 0);
sModel.setRowIndex(2); //Anne
assertTrue(dModel.getRowIndex() == 1);
- }
-
- public static void main(String[] args)
- {
- TestRunner.run(SortableModelTest.class);
}
private DataModel _createTestDataModel()