You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/07/18 22:39:44 UTC
svn commit: r423237 - in /incubator/tuscany/sandbox/chianti/sca: core/pom.xml
core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java
databinding/databinding-framework/pom.xml pom.xml
Author: jboynes
Date: Tue Jul 18 13:39:43 2006
New Revision: 423237
URL: http://svn.apache.org/viewvc?rev=423237&view=rev
Log:
clean up easymock dependencies
convert IncludeLoaderTestCase to use easymock
Modified:
incubator/tuscany/sandbox/chianti/sca/core/pom.xml
incubator/tuscany/sandbox/chianti/sca/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java
incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/pom.xml
incubator/tuscany/sandbox/chianti/sca/pom.xml
Modified: incubator/tuscany/sandbox/chianti/sca/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/core/pom.xml?rev=423237&r1=423236&r2=423237&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/core/pom.xml (original)
+++ incubator/tuscany/sandbox/chianti/sca/core/pom.xml Tue Jul 18 13:39:43 2006
@@ -106,5 +106,9 @@
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/tuscany/sandbox/chianti/sca/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java?rev=423237&r1=423236&r2=423237&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/core/src/test/java/org/apache/tuscany/core/loader/IncludeLoaderTestCase.java Tue Jul 18 13:39:43 2006
@@ -17,12 +17,15 @@
package org.apache.tuscany.core.loader;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import junit.framework.TestCase;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
import org.osoa.sca.Version;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -31,27 +34,28 @@
/**
* @version $Rev$ $Date$
*/
-public class IncludeLoaderTestCase extends MockObjectTestCase {
+public class IncludeLoaderTestCase extends TestCase {
private static final QName INCLUDE = new QName(Version.XML_NAMESPACE_1_0, "include");
private IncludeLoader loader;
- private Mock mockReader;
+ private XMLStreamReader reader;
public void testName() throws LoaderException, XMLStreamException {
String name = "foo";
- mockReader.expects(once()).method("getName").will(returnValue(IncludeLoaderTestCase.INCLUDE));
- mockReader.expects(atLeastOnce()).method("getAttributeValue")
- .with(ANYTHING, ANYTHING)
- .will(onConsecutiveCalls(returnValue(name), returnValue(null)));
- mockReader.expects(once()).method("next").will(returnValue(XMLStreamConstants.END_ELEMENT));
- Include include = loader.load(null, (XMLStreamReader) mockReader.proxy(), null);
+ expect(reader.getName()).andReturn(INCLUDE);
+ expect(reader.getAttributeValue(null, "name")).andReturn(name);
+ expect(reader.getAttributeValue(null, "scdlLocation")).andReturn(null);
+ expect(reader.next()).andReturn(END_ELEMENT);
+ replay(reader);
+
+ Include include = loader.load(null, reader, null);
assertEquals(name, include.getName());
+ verify(reader);
}
protected void setUp() throws Exception {
super.setUp();
this.loader = new IncludeLoader(null);
- mockReader = mock(XMLStreamReader.class);
-
+ reader = createMock(XMLStreamReader.class);
}
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/pom.xml?rev=423237&r1=423236&r2=423237&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/pom.xml (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/pom.xml Tue Jul 18 13:39:43 2006
@@ -26,7 +26,6 @@
<artifactId>databinding-framework</artifactId>
<name>Tuscany Data Binding Framework</name>
<description>Data Binding Framework</description>
- <version>1.0-chianti-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -50,17 +49,11 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
</dependency>
-
-
</dependencies>
</project>
Modified: incubator/tuscany/sandbox/chianti/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/pom.xml?rev=423237&r1=423236&r2=423237&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/pom.xml (original)
+++ incubator/tuscany/sandbox/chianti/sca/pom.xml Tue Jul 18 13:39:43 2006
@@ -103,6 +103,18 @@
<version>1.0.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org