[richfaces-svn-commits] JBoss Rich Faces SVN: r12143 - trunk/framework/test/src/test/java/org/ajax4jsf/application.

[richfaces-svn-commits at lists.jboss.org]

Author: alexsmirnov
Date: 2009-01-06 14:45:51 -0500 (Tue, 06 Jan 2009)
New Revision: 12143

Modified:
   trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java
   trunk/framework/test/src/test/java/org/ajax4jsf/application/ComponentLoaderTest.java
Log:
Fix stateManager tests.

Modified: trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java
===================================================================
--- trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java	2009-01-06 19:28:11 UTC (rev 12142)
+++ trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java	2009-01-06 19:45:51 UTC (rev 12143)
@@ -42,6 +42,7 @@
 import javax.faces.render.RenderKitFactory;
 import javax.faces.render.ResponseStateManager;
 
+import org.ajax4jsf.application.TreeStructureNode.FacetEntry;
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
 import org.apache.shale.test.mock.MockRenderKit;
 
@@ -149,18 +150,17 @@
 	}
 	
 	public void testTreeNodeApply() throws Exception {
-		//FIXME
-		/*
 			buildTestTree();
 			TreeStructureNode node = new TreeStructureNode();
-			node.apply(facesContext, facesContext.getViewRoot(), new HashSet());
+			node.apply(facesContext, facesContext.getViewRoot(), new HashSet<String>());
 			assertEquals(2, node.getChildren().size());
 			assertEquals(1, node.getFacets().size());
-			TreeStructureNode nodeA = (TreeStructureNode) node.getFacets().get(FACET_A);
+			FacetEntry nodeA = node.getFacets().get(0);
 			assertNotNull(nodeA);
-			assertEquals(1, nodeA.getChildren().size());
-			assertEquals(1, nodeA.getFacets().size());
-		*/
+			assertEquals(FACET_A, nodeA.getName());
+			assertEquals(1, nodeA.getNode().getChildren().size());
+			assertEquals(1, nodeA.getNode().getFacets().size());
+		
 	}
 
 	public void testTreeNodeCheckUniqueId() throws Exception {
@@ -180,8 +180,6 @@
 	
 	
 	public void testTreeNodeSerialisation() throws Exception {
-		//FIXME
-		/*
 		buildTestTree();
 		TreeStructureNode node = new TreeStructureNode();
 		node.apply(facesContext, facesContext.getViewRoot(), new HashSet());
@@ -193,11 +191,11 @@
 		TreeStructureNode nodeIn = (TreeStructureNode) in.readObject();
 		assertEquals(2, nodeIn.getChildren().size());
 		assertEquals(1, nodeIn.getFacets().size());
-		TreeStructureNode nodeA = (TreeStructureNode) nodeIn.getFacets().get(FACET_A);
+		FacetEntry nodeA = nodeIn.getFacets().get(0);
 		assertNotNull(nodeA);
-		assertEquals(1, nodeA.getChildren().size());
-		assertEquals(1, nodeA.getFacets().size());
-		*/
+		assertEquals(FACET_A, nodeA.getName());
+		assertEquals(1, nodeA.getNode().getChildren().size());
+		assertEquals(1, nodeA.getNode().getFacets().size());
 	}
 	/**
 	 * 

Modified: trunk/framework/test/src/test/java/org/ajax4jsf/application/ComponentLoaderTest.java
===================================================================
--- trunk/framework/test/src/test/java/org/ajax4jsf/application/ComponentLoaderTest.java	2009-01-06 19:28:11 UTC (rev 12142)
+++ trunk/framework/test/src/test/java/org/ajax4jsf/application/ComponentLoaderTest.java	2009-01-06 19:45:51 UTC (rev 12143)
@@ -69,19 +69,8 @@
 		assertEquals(UIInput.class, input.getClass());
 	}
 
-	/**
-	 * Test method for {@link org.ajax4jsf.application.ComponentsLoaderImpl#transform(java.lang.Object)}.
-	 */
-	public void testTransform() {
-		//FIXME
-		/*
-		Object componentClass = loader.transform(UIInput.class.getName());
-		assertSame(UIInput.class, componentClass);
-		*/
-	}
 
 	public void testGetLoader() throws Exception {
-		//FIXME
-		/*assertSame(classLoader,loader.getClassLoader());*/
+		assertSame(classLoader,loader.getClassLoader());
 	}
 }