svn commit: r292042 - in /myfaces: build/branches/1_1_1/ impl/branches/1_1_1/ impl/branches/1_1_1/src/test/org/ impl/branches/1_1_1/src/test/org/apache/ impl/branches/1_1_1/src/test/org/apache/myfaces/ impl/branches/1_1_1/src/test/org/apache/myfaces/el/

[bd...@apache.org]

Author: bdudney
Date: Tue Sep 27 13:58:35 2005
New Revision: 292042

URL: http://svn.apache.org/viewcvs?rev=292042&view=rev
Log:
added a cactus test for 623

Added:
    myfaces/build/branches/1_1_1/cactus.properties
    myfaces/impl/branches/1_1_1/src/test/org/
    myfaces/impl/branches/1_1_1/src/test/org/apache/
    myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/
    myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/
    myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/TestBean.java
    myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/ValueBindingImplCactus.java
Modified:
    myfaces/build/branches/1_1_1/build.xml
    myfaces/impl/branches/1_1_1/build.properties

Modified: myfaces/build/branches/1_1_1/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/branches/1_1_1/build.xml?rev=292042&r1=292041&r2=292042&view=diff
==============================================================================
--- myfaces/build/branches/1_1_1/build.xml (original)
+++ myfaces/build/branches/1_1_1/build.xml Tue Sep 27 13:58:35 2005
@@ -499,9 +499,6 @@
             <property name="subproject" value="tomahawk"/>
         </ant>
         <ant target="subproject">
-            <property name="subproject" value="sandbox"/>
-        </ant>
-        <ant target="subproject">
             <property name="subproject" value="examples"/>
         </ant>
     </target>
@@ -668,7 +665,12 @@
               <war warFile="${cactus.dir}/cactus-app.war" context="${cactus.web.context}"/>
           </configuration>
       </cargo-tomcat5x>
-      <copy file="${build.dir}/cactus.properties" todir="${cactus.classes.dir}"/>
+      <copy file="${build.dir}/cactus.properties" todir="${cactus.classes.dir}">
+     	<filterset begintoken="@" endtoken="@">
+  	      <filter token="TEST_PORT" value="${tomcat5x.container.port}"/>
+  	      <filter token="CACTUS_CONTEXT" value="${cactus.web.context}"/>
+    	    </filterset>
+      </copy>
       <junit printsummary="yes" fork="yes" haltonfailure="no">
         <classpath>
           <path refid="cactus.classpath"/>
@@ -885,7 +887,6 @@
             <zipfileset file="${build.dir}/../tomahawk/conf/faces-config.xml" prefix="META-INF/"/>
             <fileset dir="${build.dir}/../impl/src/java" excludes="**/*.java **/package.html"/>
             <fileset dir="${build.dir}/../tomahawk/src/java" excludes="**/*.java **/*.properties"/>
-            <fileset dir="${build.dir}/../sandbox/src/java" excludes="**/*.java"/>
         </jar>
 
     </target>

Added: myfaces/build/branches/1_1_1/cactus.properties
URL: http://svn.apache.org/viewcvs/myfaces/build/branches/1_1_1/cactus.properties?rev=292042&view=auto
==============================================================================
--- myfaces/build/branches/1_1_1/cactus.properties (added)
+++ myfaces/build/branches/1_1_1/cactus.properties Tue Sep 27 13:58:35 2005
@@ -0,0 +1,3 @@
+# This property tells cactus where to find the war that has the tests
+
+cactus.contextURL=http://localhost:@TEST_PORT@/@CACTUS_CONTEXT@
\ No newline at end of file

Modified: myfaces/impl/branches/1_1_1/build.properties
URL: http://svn.apache.org/viewcvs/myfaces/impl/branches/1_1_1/build.properties?rev=292042&r1=292041&r2=292042&view=diff
==============================================================================
--- myfaces/impl/branches/1_1_1/build.properties (original)
+++ myfaces/impl/branches/1_1_1/build.properties Tue Sep 27 13:58:35 2005
@@ -8,6 +8,20 @@
 test.classes.dir     = ${temp.dir}/tests/classes
 test.reports.dir     = ${temp.dir}/tests/reports
 test.suffix          = **/*Test.java
+
+
+cactus.lib.dir           = ${lib.dir}/cactus
+cactus.src.dir           = ${subproject.dir}/src/test
+cactus.web.context       = tomahawk-cactus-tests
+cactus.dir    		    = ${build.dir}/cactus
+cactus.classes.dir       = ${cactus.dir}/classes
+cactus.reports.dir       = ${cactus.dir}/reports
+cactus.suffix            = **/*Cactus.java
+has.cactus.tests         = true
+
+tomcat5x.container.dir   = ${cactus.dir}/tomcat5x
+tomcat5x.container.port  = 9090
+
 jar.file             = myfaces-impl.jar
 jar.include.pattern  = org/**/*.class
 jar.fileset2.dir     = ${subproject.dir}/src/java

Added: myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/TestBean.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/TestBean.java?rev=292042&view=auto
==============================================================================
--- myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/TestBean.java (added)
+++ myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/TestBean.java Tue Sep 27 13:58:35 2005
@@ -0,0 +1,19 @@
+package org.apache.myfaces.el;
+
+import java.util.Map;
+
+public class TestBean {
+	private Map map;
+
+	public TestBean(Map map) {
+		this.map = map;
+	}
+
+	public Map getMap() {
+		return map;
+	}
+
+	public void setMap(Map map) {
+		this.map = map;
+	}
+}

Added: myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/ValueBindingImplCactus.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/ValueBindingImplCactus.java?rev=292042&view=auto
==============================================================================
--- myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/ValueBindingImplCactus.java (added)
+++ myfaces/impl/branches/1_1_1/src/test/org/apache/myfaces/el/ValueBindingImplCactus.java Tue Sep 27 13:58:35 2005
@@ -0,0 +1,162 @@
+package org.apache.myfaces.el;
+
+import java.util.HashMap;
+
+import javax.faces.FactoryFinder;
+import javax.faces.application.Application;
+import javax.faces.application.ViewHandler;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+import javax.faces.context.FacesContextFactory;
+import javax.faces.el.ValueBinding;
+import javax.faces.lifecycle.Lifecycle;
+import javax.faces.lifecycle.LifecycleFactory;
+
+import org.apache.cactus.ServletTestCase;
+
+public class ValueBindingImplCactus extends ServletTestCase {
+	private FacesContext facesContext;
+	private UIViewRoot viewRoot;
+	private Application application;
+	
+	protected void setUp() throws Exception {
+		super.setUp();
+		FacesContextFactory facesContextFactory = (FacesContextFactory) FactoryFinder
+				.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
+		LifecycleFactory lifecycleFactory = (LifecycleFactory) FactoryFinder
+				.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
+		Lifecycle lifecycle = lifecycleFactory
+				.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
+		facesContext = facesContextFactory.getFacesContext(this.config
+				.getServletContext(), request, response, lifecycle);
+		assertNotNull(facesContext);
+		application = facesContext.getApplication();
+		ViewHandler viewHandler = application.getViewHandler();
+		String viewId = "/index.jsp";
+		viewRoot = viewHandler.createView(facesContext, viewId);
+		viewRoot.setViewId(viewId);
+		facesContext.setViewRoot(viewRoot);
+	}
+
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	/*
+	 * Test method for
+	 * 'org.apache.myfaces.el.ValueBindingImpl.getExpressionString()'
+	 */
+	public void testGetExpressionString() {
+
+	}
+
+	/*
+	 * Test method for
+	 * 'org.apache.myfaces.el.ValueBindingImpl.getType(FacesContext)'
+	 */
+	public void testGetType() {
+
+	}
+
+	/*
+	 * Test method for
+	 * 'org.apache.myfaces.el.ValueBindingImpl.getValue(FacesContext)'
+	 */
+	public void testGetValue() {
+	}
+
+	/*
+	 * Test method for
+	 * 'org.apache.myfaces.el.ValueBindingImpl.isReadOnly(FacesContext)'
+	 */
+	public void testIsReadOnly() {
+
+	}
+
+	/*
+	 * Test method for
+	 * 'org.apache.myfaces.el.ValueBindingImpl.setValue(FacesContext, Object)'
+	 */
+	public void testSetValueSimpleMap() {
+		facesContext.getExternalContext().getRequestMap().put("foo", new HashMap());
+		ValueBinding binding = application.createValueBinding("#{foo['baz']}");
+		Integer value = new Integer(14);
+		binding.setValue(facesContext, value);
+		assertEquals(14, value.intValue());
+	}
+
+	public void testSetValueSimpleBeanInRequestMap() {
+		TestBean bean = new TestBean(new HashMap());
+		facesContext.getExternalContext().getRequestMap().put("bean", bean);
+		ValueBinding binding = application.createValueBinding("#{bean.map['baz']}");
+		Integer value = new Integer(14);
+		binding.setValue(facesContext, value);
+		assertEquals(14, value.intValue());
+	}
+
+	public void testSetValueSimpleBeanInSessionMap() {
+		TestBean bean = new TestBean(new HashMap());
+		facesContext.getExternalContext().getSessionMap().put("bean", bean);
+		ValueBinding binding = application.createValueBinding("#{bean.map['baz']}");
+		Integer value = new Integer(14);
+		binding.setValue(facesContext, value);
+		assertEquals(14, value.intValue());
+	}
+
+	/*
+	 * Test method for
+	 * 'org.apache.myfaces.el.ValueBindingImpl.ValueBindingImpl(Application,
+	 * String)'
+	 */
+	public void testValueBindingImplApplicationString() {
+
+	}
+
+	/*
+	 * Test method for 'org.apache.myfaces.el.ValueBindingImpl.toString()'
+	 */
+	public void testToString() {
+
+	}
+
+	/*
+	 * Test method for
+	 * 'org.apache.myfaces.el.ValueBindingImpl.ValueBindingImpl()'
+	 */
+	public void testValueBindingImpl() {
+
+	}
+
+	/*
+	 * Test method for
+	 * 'org.apache.myfaces.el.ValueBindingImpl.saveState(FacesContext)'
+	 */
+	public void testSaveState() {
+
+	}
+
+	/*
+	 * Test method for
+	 * 'org.apache.myfaces.el.ValueBindingImpl.restoreState(FacesContext,
+	 * Object)'
+	 */
+	public void testRestoreState() {
+
+	}
+
+	/*
+	 * Test method for 'org.apache.myfaces.el.ValueBindingImpl.isTransient()'
+	 */
+	public void testIsTransient() {
+
+	}
+
+	/*
+	 * Test method for
+	 * 'org.apache.myfaces.el.ValueBindingImpl.setTransient(boolean)'
+	 */
+	public void testSetTransient() {
+
+	}
+
+}