You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/02/25 22:12:52 UTC
svn commit: r511615 - in /myfaces/core/branches/jsf12: api/pom.xml
api/src/test/java/javax/faces/application/MockApplication.java impl/pom.xml
impl/src/test/java/org/apache/myfaces/el/unified/ResolverBuilderBaseTest.java
Author: matzew
Date: Sun Feb 25 13:12:51 2007
New Revision: 511615
URL: http://svn.apache.org/viewvc?view=rev&rev=511615
Log:
using Shale 1.1.0-SNAPSHOT for testing/mock
removed the dependency to 1.0.4-SNAPSHOT, which was already released. Now, we are on Shale 1.1.0-SNAPSHOT
Removed:
myfaces/core/branches/jsf12/api/src/test/java/javax/faces/application/MockApplication.java
Modified:
myfaces/core/branches/jsf12/api/pom.xml
myfaces/core/branches/jsf12/impl/pom.xml
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/unified/ResolverBuilderBaseTest.java
Modified: myfaces/core/branches/jsf12/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/pom.xml?view=diff&rev=511615&r1=511614&r2=511615
==============================================================================
--- myfaces/core/branches/jsf12/api/pom.xml (original)
+++ myfaces/core/branches/jsf12/api/pom.xml Sun Feb 25 13:12:51 2007
@@ -215,7 +215,7 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: myfaces/core/branches/jsf12/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/pom.xml?view=diff&rev=511615&r1=511614&r2=511615
==============================================================================
--- myfaces/core/branches/jsf12/impl/pom.xml (original)
+++ myfaces/core/branches/jsf12/impl/pom.xml Sun Feb 25 13:12:51 2007
@@ -306,7 +306,7 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/unified/ResolverBuilderBaseTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/unified/ResolverBuilderBaseTest.java?view=diff&rev=511615&r1=511614&r2=511615
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/unified/ResolverBuilderBaseTest.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/unified/ResolverBuilderBaseTest.java Sun Feb 25 13:12:51 2007
@@ -24,7 +24,7 @@
import javax.el.ELContext;
import javax.el.ELResolver;
import javax.faces.context.FacesContext;
-import javax.faces.context.MockFacesContext;
+import org.apache.shale.test.mock.MockFacesContext12;
import javax.faces.el.EvaluationException;
import javax.faces.el.PropertyNotFoundException;
import javax.faces.el.PropertyResolver;
@@ -44,7 +44,7 @@
private ResolverBuilderBase builder;
private ELContext expectedContext;
private String expectedProperty;
- private MockFacesContext expectedFacesContext;
+ private MockFacesContext12 expectedFacesContext;
private NoOpElResolver configResolver;
private VariableResolver varResolver;
private PropertyResolver propResolver;
@@ -58,7 +58,7 @@
builder = new ResolverBuilderBase(runtimeConfig);
expectedProperty = "xxx";
- expectedFacesContext = new MockFacesContext();
+ expectedFacesContext = new MockFacesContext12();
expectedContext = new FacesELContext(null, expectedFacesContext);
expectedFacesContext.setELContext(expectedContext);