mocklib-checkins Mailing List for mocklib (Page 3)
Brought to you by:
bittwidler,
fastdragon
Menu
▾
▴
mocklib-checkins — Automail from cvs about what got changed.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
(1) |
Aug
(5) |
Sep
(3) |
Oct
|
Nov
|
Dec
(46) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(54) |
Feb
(120) |
Mar
(31) |
Apr
(11) |
May
(8) |
Jun
(5) |
Jul
|
Aug
(22) |
Sep
(295) |
Oct
(6) |
Nov
(10) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
(2) |
Dec
(8) |
| 2008 |
Jan
|
Feb
(1) |
Mar
|
Apr
(8) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(17) |
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Nobody <fas...@us...> - 2007-05-14 14:33:16
|
Update of /cvsroot/mocklib/mocklib3/bldfiles
In directory sc8-pr-cvs16:/tmp/cvs-serv16099/bldfiles
Modified Files:
build.xml
Log Message:
minor changes to build file.
Index: build.xml
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/bldfiles/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** build.xml 14 May 2007 14:30:37 -0000 1.10
--- build.xml 14 May 2007 14:33:05 -0000 1.11
***************
*** 3,7 ****
Run "ant -projecthelp" to view all the possible targets and descriptions.
-->
! <project name="std_buildfile" default="release" basedir="..">
<!-- Now allow any of the properties to be overridden -->
--- 3,7 ----
Run "ant -projecthelp" to view all the possible targets and descriptions.
-->
! <project name="std_buildfile" default="createdist" basedir="..">
<!-- Now allow any of the properties to be overridden -->
|
|
From: Nobody <fas...@us...> - 2007-05-14 14:30:41
|
Update of /cvsroot/mocklib/mocklib3/bldfiles
In directory sc8-pr-cvs16:/tmp/cvs-serv13307/bldfiles
Modified Files:
build.xml
Log Message:
make changes to build file on trust
Index: build.xml
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/bldfiles/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** build.xml 14 May 2007 14:26:16 -0000 1.9
--- build.xml 14 May 2007 14:30:37 -0000 1.10
***************
*** 661,666 ****
<target name="releaseDocs" depends="promptForInfo, createdist" if="password">
<scp file="${dist}/${name}-${version}.zip" trust="yes" todir="${user}@shell.sourceforge.net:/home/groups/m/mo/mocklib" password="${password}" />
! <sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="rm -rf /home/groups/m/mo/mocklib/htdocs/${name}/*" />
! <sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="unzip /home/groups/m/mo/mocklib/${name}-${version}.zip -d /home/groups/m/mo/mocklib/htdocs/" />
<!--sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="mv /home/groups/m/mo/mocklib/htdocs/${name}/* /home/groups/m/mo/mocklib/htdocs" />
<sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="rm /home/groups/m/mo/mocklib/${name}*.zip" /-->
--- 661,666 ----
<target name="releaseDocs" depends="promptForInfo, createdist" if="password">
<scp file="${dist}/${name}-${version}.zip" trust="yes" todir="${user}@shell.sourceforge.net:/home/groups/m/mo/mocklib" password="${password}" />
! <sshexec host="shell.sourceforge.net" trust="yes" username="${user}" password="${password}" command="rm -rf /home/groups/m/mo/mocklib/htdocs/${name}/*" />
! <sshexec host="shell.sourceforge.net" trust="yes" username="${user}" password="${password}" command="unzip /home/groups/m/mo/mocklib/${name}-${version}.zip -d /home/groups/m/mo/mocklib/htdocs/" />
<!--sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="mv /home/groups/m/mo/mocklib/htdocs/${name}/* /home/groups/m/mo/mocklib/htdocs" />
<sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="rm /home/groups/m/mo/mocklib/${name}*.zip" /-->
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock
In directory sc8-pr-cvs16:/tmp/cvs-serv9113/input/javasrc/biz/xsoftware/mock
Modified Files:
CalledMethod.java Behavior.java MockObject.java
Added Files:
CloningBehavior.java
Removed Files:
NoCloneBehavior.java
Log Message:
modify behavior stuff.
Index: MockObject.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/MockObject.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MockObject.java 15 Nov 2006 17:12:39 -0000 1.10
--- MockObject.java 14 May 2007 14:26:14 -0000 1.11
***************
*** 60,64 ****
/**
! * Set the DefaultReturnValue for a 'method'
* @param method The method name to set the default return value for
* @param returnValue
--- 60,71 ----
/**
! * Set the DefaultReturnValue for a 'method'. This value is returned if none
! * of the following happen
! * <ol>
! * <li>addReturnValue is not called giving a return value</li>
! * <li>addThrowException is not called returning an exception</li>
! * <li>addBehavior is not called running a snippet of code that returns a value</li>
! * </ol>
! *
* @param method The method name to set the default return value for
* @param returnValue
***************
*** 66,70 ****
--- 73,108 ----
public void setDefaultReturnValue(String method, Object returnValue);
+ /**
+ * Set the DefaultBehavior for a 'method'. This Behavior object is used to run a snippet
+ * of code if none of the following happen
+ * <ol>
+ * <li>addReturnValue is not called giving a return value</li>
+ * <li>addThrowException is not called returning an exception</li>
+ * <li>addBehavior is not called running a snippet of code that returns a value</li>
+ * </ol>
+ *
+ * See the Behavior class for more info on what to put in the Behavior implementation.
+ *
+ * @param method When this method is called, the Behavior will be run.
+ * @param b The snippet of code to be run.
+ */
public void setDefaultBehavior(String method, Behavior b);
+
+ /**
+ * Set the DefaultBehavior for a 'method'. This Behavior object is used to run a snippet
+ * of code if none of the following happen
+ * <ol>
+ * <li>addReturnValue is not called giving a return value</li>
+ * <li>addThrowException is not called returning an exception</li>
+ * <li>addBehavior is not called running a snippet of code that returns a value</li>
+ * </ol>
+ *
+ * A Behavior or CloningBehavior can be passed in. See the Behavior or CloningBehavior
+ * class for more info on what to put in the Behavior implementation.
+ *
+ * @param method When this method is called, the Behavior will be run.
+ * @param b The snippet of code to be run.
+ * @param argTypes The parameters types of the method so overloaded method can be specified
+ */
public void setDefaultBehavior(String method, Behavior b, Class ... argTypes);
***************
*** 106,110 ****
--- 144,165 ----
public void addReturnValue(String method, Object ... o);
+ /**
+ * Adds a snippet of code to be run which exists in the Behavior implementation.
+ * A Behavior or CloningBehavior can be passed in. See the Behavior or CloningBehavior
+ * class for more info on what to put in the Behavior implementation.
+ *
+ * @param method When this method is called, the Behavior will be run
+ * @param behavior The snippet of code to be run.
+ */
public void addBehavior(String method, Behavior behavior);
+ /**
+ * Adds a snippet of code to be run which exists in the Behavior implementation.
+ * A Behavior or CloningBehavior can be passed in. See the Behavior or CloningBehavior
+ * class for more info on what to put in the Behavior implementation.
+ *
+ * @param method When this method is called, the Behavior will be run
+ * @param behavior The snippet of code to be run.
+ * @param argTypes The parameters to the method to distinguish between overloaded methods.
+ */
public void addBehavior(String method, Behavior behavior, Class... argTypes);
***************
*** 143,148 ****
--- 198,212 ----
// public void removeIgnore(String method, Class ... argTypes);
+ /**
+ * Sets the timeout which is the delay that a mockobject waits for a method to be
+ * called before failing. The default is 5 seconds.
+ */
public void setExpectTimeout(int timeout);
+ /**
+ * Gets the timeout which is the delay that a mockobject waits for a method to be
+ * called before failing.
+ * @return
+ */
public int getExpectTimeout();
--- NEW FILE: CloningBehavior.java ---
package biz.xsoftware.mock;
/**
* The same exact thing as the Behavior method except a cloning method must be supplied to.
* Sometimes the Behavior method will make modifications to the passed in parameter methods.
* The cloning method allows the mockobject to take a snapshot of the parameters passed into
* the method before they are modified. Then the test can still verify later the correct
* parameters were passed in. So, if you are mocking a method
* </br></br>
* public int doSomethingCool(Map map, int i, long l);
* </br></br>
* Then you must have a cloning method of the form
* </br></br>
* public Object[] doSomethingCoolClone(Map map, int i, long l);
* </br></br>
* Notice that you probably only need to clone the Map and would need to return an object
* array of all the parameters as so... new Object[] { clonedMap, i, l);
*
* @author dhiller
*
*/
public interface CloningBehavior extends Behavior
{
}
Index: CalledMethod.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/CalledMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CalledMethod.java 10 Sep 2006 18:25:52 -0000 1.1
--- CalledMethod.java 14 May 2007 14:26:13 -0000 1.2
***************
*** 30,47 ****
this.howItWasCalled = howItWasCalled;
}
!
public String getMethodName() {
return method;
}
public int getParameterCount() {
return params.length;
}
public Object getParameter(int index) {
return params[index];
}
/**
! *
*/
public Object[] getAllParams() {
--- 30,62 ----
this.howItWasCalled = howItWasCalled;
}
! /**
! * Gets the method this CalledMethod object represents
! * @return
! */
public String getMethodName() {
return method;
}
+ /**
+ * Gets the number of parameters passed into method
+ * @return
+ */
public int getParameterCount() {
return params.length;
}
+ /**
+ * Gets the parameter at location=index
+ * @param index The location of the parameter
+ * @return The parameter that was passed into the method at location=index
+ */
public Object getParameter(int index) {
return params[index];
}
/**
! * Gets all the parameters that were passed into the method. For example, if a method
! * is called ... doSomethingCool("1234", 5, "eeee"), then the following will be returned
! * </br></br>
! * new Object[] {"1234", new Integer(5), "eeee")}
*/
public Object[] getAllParams() {
***************
*** 49,55 ****
--- 64,76 ----
}
+ /**
+ * Returns a stacktrace of how the method was called. This is useful for debugging when you
+ * didn't expect the method to be called.
+ * @return Throwable of how the method was called.
+ */
public Throwable getHowItWasCalled() {
return howItWasCalled;
}
+
@Override
public String toString() {
--- NoCloneBehavior.java DELETED ---
Index: Behavior.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/Behavior.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Behavior.java 15 Sep 2006 21:22:56 -0000 1.4
--- Behavior.java 14 May 2007 14:26:14 -0000 1.5
***************
*** 2,9 ****
/**
*/
! public interface Behavior
! {
-
}
--- 2,17 ----
/**
+ * A way of providing snippets of code to be run when a method is called. If you want
+ * to pass in a Behavior implementation for </br></br>
+ *
+ * public int doSomethingCool(int i, String s, long l);
+ *
+ * </br></br>
+ * then your Behavior class must define the same exact method and that method will be
+ * called in your Behavior implementation when the mockobject's doSomethingCool method
+ * is called. You must also return the same value as the doSomethingCool method which
+ * in this case is an int.
*/
! public interface Behavior {
}
|
|
From: Nobody <fas...@us...> - 2007-05-14 14:26:52
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock
In directory sc8-pr-cvs16:/tmp/cvs-serv9113/input/javasrc/biz/xsoftware/impl/mock
Modified Files:
MockSuperclass.java
Log Message:
modify behavior stuff.
Index: MockSuperclass.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/MockSuperclass.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MockSuperclass.java 15 Nov 2006 17:12:40 -0000 1.7
--- MockSuperclass.java 14 May 2007 14:26:16 -0000 1.8
***************
*** 13,21 ****
import java.util.logging.Logger;
- import biz.xsoftware.mock.Behavior;
import biz.xsoftware.mock.CalledMethod;
import biz.xsoftware.mock.ExpectFailedException;
import biz.xsoftware.mock.MockObject;
! import biz.xsoftware.mock.NoCloneBehavior;
--- 13,21 ----
import java.util.logging.Logger;
import biz.xsoftware.mock.CalledMethod;
+ import biz.xsoftware.mock.CloningBehavior;
import biz.xsoftware.mock.ExpectFailedException;
import biz.xsoftware.mock.MockObject;
! import biz.xsoftware.mock.Behavior;
***************
*** 567,571 ****
try {
! if(behavior instanceof NoCloneBehavior)
return;
--- 567,571 ----
try {
! if(!(behavior instanceof CloningBehavior))
return;
|
|
From: Nobody <fas...@us...> - 2007-05-14 14:26:25
|
Update of /cvsroot/mocklib/mocklib3/bldfiles
In directory sc8-pr-cvs16:/tmp/cvs-serv9113/bldfiles
Modified Files:
build.xml
Log Message:
modify behavior stuff.
Index: build.xml
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/bldfiles/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build.xml 12 Nov 2006 06:37:45 -0000 1.8
--- build.xml 14 May 2007 14:26:16 -0000 1.9
***************
*** 585,589 ****
<checkstyle config="${checkstyle.dir}/config.xml">
<fileset dir="${javacode}" includes="**/*.java"/>
! <formatter type="plain" toFile="${checkstyle.report}/index.html"/>
</checkstyle>
</target>
--- 585,589 ----
<checkstyle config="${checkstyle.dir}/config.xml">
<fileset dir="${javacode}" includes="**/*.java"/>
! <formatter type="plain"/>
</checkstyle>
</target>
***************
*** 660,664 ****
<target name="releaseDocs" depends="promptForInfo, createdist" if="password">
! <scp file="${dist}/${name}-${version}.zip" todir="${user}@shell.sourceforge.net:/home/groups/m/mo/mocklib" password="${password}" />
<sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="rm -rf /home/groups/m/mo/mocklib/htdocs/${name}/*" />
<sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="unzip /home/groups/m/mo/mocklib/${name}-${version}.zip -d /home/groups/m/mo/mocklib/htdocs/" />
--- 660,664 ----
<target name="releaseDocs" depends="promptForInfo, createdist" if="password">
! <scp file="${dist}/${name}-${version}.zip" trust="yes" todir="${user}@shell.sourceforge.net:/home/groups/m/mo/mocklib" password="${password}" />
<sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="rm -rf /home/groups/m/mo/mocklib/htdocs/${name}/*" />
<sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="unzip /home/groups/m/mo/mocklib/${name}-${version}.zip -d /home/groups/m/mo/mocklib/htdocs/" />
***************
*** 713,717 ****
version="true"
use="true"
! public="yes"
overview="${misc}/mockoverview.html"
windowtitle="${javadoc.title} ${version}"
--- 713,717 ----
version="true"
use="true"
! protected="true"
overview="${misc}/mockoverview.html"
windowtitle="${javadoc.title} ${version}"
|
|
From: Nobody <fas...@us...> - 2006-11-22 17:21:19
|
Update of /cvsroot/mocklib/mocklib3/bldfiles In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv4004/bldfiles Modified Files: design.xml Log Message: fix the design file. Index: design.xml =================================================================== RCS file: /cvsroot/mocklib/mocklib3/bldfiles/design.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** design.xml 29 Oct 2006 17:27:53 -0000 1.4 --- design.xml 22 Nov 2006 17:21:09 -0000 1.5 *************** *** 17,23 **** --- 17,29 ---- <package name="api" package="biz.xsoftware.mock"/> + <package name="testcase" package="biz.xsoftware.mock.testcase"> + <depends>api</depends> + <depends>junit</depends> + </package> + <!-- This test suite tests the official mocklib api --> <package name="testapi" package="biz.xsoftware.test.mock" subpackages="include"> <depends>api</depends> + <depends>testcase</depends> <depends>junit</depends> </package> |
|
From: Nobody <fas...@us...> - 2006-11-22 17:20:12
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1865/input/javasrc/biz/xsoftware/test/mock Modified Files: TestMockTestCase.java Log Message: add log checks for warnings or no warnings. Index: TestMockTestCase.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock/TestMockTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestMockTestCase.java 22 Nov 2006 16:46:23 -0000 1.1 --- TestMockTestCase.java 22 Nov 2006 17:16:26 -0000 1.2 *************** *** 43,46 **** --- 43,58 ---- } + public void testWarningLog() { + DummyMockTestCase test = new DummyMockTestCase("testWarningLog"); + TestResult result = test.run(); + + assertEquals(1, result.errorCount()); + } + public void testNoWarningLog() { + DummyMockTestCase test = new DummyMockTestCase("testNoWarningLog"); + TestResult result = test.run(); + + assertEquals(1, result.errorCount()); + } } |
|
From: Nobody <fas...@us...> - 2006-11-22 16:46:29
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20965/input/javasrc/biz/xsoftware/test/mock Modified Files: TestMockCreator.java Added Files: TestMockTestCase.java Removed Files: ListenerOne.java MyTestBehavior.java CarImpl.java ExtendedCar.java Identical.java Car.java FactoryInterface.java Log Message: starting to add MockTestCase --- ExtendedCar.java DELETED --- Index: TestMockCreator.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock/TestMockCreator.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TestMockCreator.java 15 Nov 2006 17:12:40 -0000 1.11 --- TestMockCreator.java 22 Nov 2006 16:46:22 -0000 1.12 *************** *** 12,15 **** --- 12,22 ---- import biz.xsoftware.mock.MockObject; import biz.xsoftware.mock.MockObjectFactory; + import biz.xsoftware.test.mock.helpers.Car; + import biz.xsoftware.test.mock.helpers.CarImpl; + import biz.xsoftware.test.mock.helpers.ExtendedCar; + import biz.xsoftware.test.mock.helpers.FactoryInterface; + import biz.xsoftware.test.mock.helpers.Identical; + import biz.xsoftware.test.mock.helpers.ListenerOne; + import biz.xsoftware.test.mock.helpers.MyTestBehavior; /** --- CarImpl.java DELETED --- --- MyTestBehavior.java DELETED --- --- ListenerOne.java DELETED --- --- Identical.java DELETED --- --- NEW FILE: TestMockTestCase.java --- /** * Copyright (C) 2006 Carrier Access, Corp. */ package biz.xsoftware.test.mock; import biz.xsoftware.test.mock.helpers.DummyMockTestCase; import junit.framework.TestCase; import junit.framework.TestResult; /** */ public class TestMockTestCase extends TestCase { public TestMockTestCase(String arg0) { super(arg0); } /** * @see junit.framework.TestCase#setUp() */ @Override protected void setUp() throws Exception { super.setUp(); } /** * @see junit.framework.TestCase#tearDown() */ @Override protected void tearDown() throws Exception { super.tearDown(); } public void testForgotExpectOnMockObject() { DummyMockTestCase test = new DummyMockTestCase("testForgotExpectOnMockObject"); TestResult result = test.run(); assertEquals(1, result.errorCount()); } } --- FactoryInterface.java DELETED --- --- Car.java DELETED --- |
|
From: dadrox <da...@us...> - 2006-11-15 17:12:54
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24696/input/javasrc/biz/xsoftware/test/mock Modified Files: TestMockCreator.java Log Message: Added CalledMethod[] expect(String method, int times), which allows a method to be expected a number of times... Index: TestMockCreator.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock/TestMockCreator.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TestMockCreator.java 15 Nov 2006 16:54:43 -0000 1.10 --- TestMockCreator.java 15 Nov 2006 17:12:40 -0000 1.11 *************** *** 256,260 **** car.getWheelCount(2); car.getWheelCount(2); ! mock.expect("getWheelCount", "getWheelCount", "getWheelCount", "getWheelCount", "getWheelCount"); mock.expect(MockObject.NONE); --- 256,260 ---- car.getWheelCount(2); car.getWheelCount(2); ! mock.expect("getWheelCount", 5); mock.expect(MockObject.NONE); |
|
From: dadrox <da...@us...> - 2006-11-15 17:12:48
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24696/input/javasrc/biz/xsoftware/mock Modified Files: MockObject.java Log Message: Added CalledMethod[] expect(String method, int times), which allows a method to be expected a number of times... Index: MockObject.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/MockObject.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MockObject.java 15 Nov 2006 16:54:43 -0000 1.9 --- MockObject.java 15 Nov 2006 17:12:39 -0000 1.10 *************** *** 17,21 **** public static String NONE = "No method should have been called"; /** ! * Field used to expect any method so expectCall returns as soon as * any method is called. */ --- 17,21 ---- public static String NONE = "No method should have been called"; /** ! * Field used to expect any method so expect returns as soon as * any method is called. */ *************** *** 47,50 **** --- 47,63 ---- /** + * Waits for a methods to be called a specific number of times. + * If any of the methods, this method throws + * an exception which will fail the test case. For each method, + * this will wait WAIT_TIME milliseconds for each method to be called. + * If the method is not called within this period, an exception will + * be thrown saying 'method' was not called within timeout period. + * @param method + * @param times is the number of times the methods is expected to be called + * @return An array or arrays of params that were passed to the methods called + */ + public CalledMethod[] expect(String method, int times); + + /** * Set the DefaultReturnValue for a 'method' * @param method The method name to set the default return value for |
|
From: dadrox <da...@us...> - 2006-11-15 17:12:46
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24696/input/javasrc/biz/xsoftware/impl/mock Modified Files: MockSuperclass.java Log Message: Added CalledMethod[] expect(String method, int times), which allows a method to be expected a number of times... Index: MockSuperclass.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/MockSuperclass.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MockSuperclass.java 15 Nov 2006 16:54:43 -0000 1.6 --- MockSuperclass.java 15 Nov 2006 17:12:40 -0000 1.7 *************** *** 3,6 **** --- 3,7 ---- import java.lang.reflect.Method; import java.util.ArrayList; + import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; *************** *** 324,327 **** --- 325,335 ---- } + public CalledMethod[] expect(String method, int times) + { + String[] methods = new String[times]; + Arrays.fill(methods, 0, times, method); + return expectImpl(methods); + } + /** * @see biz.xsoftware.mock.MockObject#expectOrderedCalls(java.lang.String[]) |
|
From: dadrox <da...@us...> - 2006-11-15 16:54:55
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16959/input/javasrc/biz/xsoftware/test/mock Modified Files: TestMockCreator.java Log Message: Added addReturnValue(String method, Object ... o) [note the varargs]. This works excellently with games testing. Index: TestMockCreator.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock/TestMockCreator.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TestMockCreator.java 1 Oct 2006 03:18:47 -0000 1.9 --- TestMockCreator.java 15 Nov 2006 16:54:43 -0000 1.10 *************** *** 19,23 **** //private final static Logger log = Logger.getLogger(TestMockCreator.class.getName()); ! /** * @param name --- 19,23 ---- //private final static Logger log = Logger.getLogger(TestMockCreator.class.getName()); ! /** * @param name *************** *** 32,39 **** String param1 = "some param"; l.callMeSecond(param1); ! String methodName = "callMeSecond"; CalledMethod method = m.expect(methodName); ! assertEquals("method name should be the same", methodName, method.getMethodName()); assertEquals("params should equal", param1, method.getParameter(0)); --- 32,39 ---- String param1 = "some param"; l.callMeSecond(param1); ! String methodName = "callMeSecond"; CalledMethod method = m.expect(methodName); ! assertEquals("method name should be the same", methodName, method.getMethodName()); assertEquals("params should equal", param1, method.getParameter(0)); *************** *** 41,54 **** assertEquals("1st param should be equal", param1, method.getAllParams()[0]); } ! public void testEqualsAndToString() throws Exception { MockObject m = MockObjectFactory.createMock(ListenerOne.class); ListenerOne l = (ListenerOne)m; ! assertTrue("These should not be equal", !l.equals(new Integer(4))); assertTrue("These should be equal", l.equals(l)); ! } ! public void testNoneFailure() throws Exception { MockObject m = MockObjectFactory.createMock(ListenerOne.class); --- 41,54 ---- assertEquals("1st param should be equal", param1, method.getAllParams()[0]); } ! public void testEqualsAndToString() throws Exception { MockObject m = MockObjectFactory.createMock(ListenerOne.class); ListenerOne l = (ListenerOne)m; ! assertTrue("These should not be equal", !l.equals(new Integer(4))); assertTrue("These should be equal", l.equals(l)); ! } ! public void testNoneFailure() throws Exception { MockObject m = MockObjectFactory.createMock(ListenerOne.class); *************** *** 56,60 **** String param1 = "some param"; l.callMeSecond(param1); ! try { m.expect(MockObject.NONE); --- 56,60 ---- String param1 = "some param"; l.callMeSecond(param1); ! try { m.expect(MockObject.NONE); *************** *** 64,68 **** } } ! public void testMultipleParams() throws Exception { MockObject m = MockObjectFactory.createMock(ListenerOne.class); --- 64,68 ---- } } ! public void testMultipleParams() throws Exception { MockObject m = MockObjectFactory.createMock(ListenerOne.class); *************** *** 71,80 **** Integer param2 = new Integer(2345); l.multipleParams(param1, param2); ! CalledMethod method = m.expect("multipleParams"); assertEquals("param1 is not correct", param1, method.getParameter(0)); assertEquals("param2 is not correct", param2, method.getParameter(1)); } ! public void testMockCreatorFail() throws Exception { MockObject m = MockObjectFactory.createMock(ListenerOne.class); --- 71,80 ---- Integer param2 = new Integer(2345); l.multipleParams(param1, param2); ! CalledMethod method = m.expect("multipleParams"); assertEquals("param1 is not correct", param1, method.getParameter(0)); assertEquals("param2 is not correct", param2, method.getParameter(1)); } ! public void testMockCreatorFail() throws Exception { MockObject m = MockObjectFactory.createMock(ListenerOne.class); *************** *** 90,109 **** MockObject factory = MockObjectFactory.createMock(FactoryInterface.class); MockObject car = MockObjectFactory.createMock(Car.class); ! factory.addReturnValue("createCar", car); ! //now we would normally tweak code on the subsystem which //would call createcar but we are only unit testing MockCreator Car c = ((FactoryInterface)factory).createCar("someid"); factory.expect("createCar"); ! c.openDoor(); car.expect("openDoor"); } ! public void testThrowCheckedException() throws Exception { MockObject mockList = MockObjectFactory.createMock(ListenerOne.class); mockList.addThrowException("callMeSecond", new IOException("test throwing IOException")); ! ListenerOne l = (ListenerOne)mockList; try { --- 90,109 ---- MockObject factory = MockObjectFactory.createMock(FactoryInterface.class); MockObject car = MockObjectFactory.createMock(Car.class); ! factory.addReturnValue("createCar", car); ! //now we would normally tweak code on the subsystem which //would call createcar but we are only unit testing MockCreator Car c = ((FactoryInterface)factory).createCar("someid"); factory.expect("createCar"); ! c.openDoor(); car.expect("openDoor"); } ! public void testThrowCheckedException() throws Exception { MockObject mockList = MockObjectFactory.createMock(ListenerOne.class); mockList.addThrowException("callMeSecond", new IOException("test throwing IOException")); ! ListenerOne l = (ListenerOne)mockList; try { *************** *** 112,163 **** } catch(IOException e) {} } ! public void testUsingANY() throws Exception { MockObject mockList = MockObjectFactory.createMock(ListenerOne.class); ListenerOne l = (ListenerOne)mockList; ! int expected = 1; l.callMeFirst(expected); ! CalledMethod m = mockList.expect(MockObject.ANY); Integer i = (Integer)m.getAllParams()[0]; assertEquals("param should be 1", new Integer(expected), i); } ! public void testMultipleANYs() throws Exception { MockObject mockList = MockObjectFactory.createMock(ListenerOne.class); ListenerOne l = (ListenerOne)mockList; ! l.callMeFirst(1); l.callMeSecond("second"); ! String[] methods = new String[] { MockObject.ANY, "callMeSecond" }; mockList.expect(methods); } ! public void testWrongMethod() { MockObject mock = MockObjectFactory.createMock(ListenerOne.class); ! try { mock.expect("noSuchMethod"); fail("This should throw an exception"); ! } catch(IllegalArgumentException e) { } } ! public void testDefaultRetVal() { MockObject mock = MockObjectFactory.createMock(Identical.class); ! mock.setDefaultReturnValue("doThat", new byte[] {4}); ! Identical ident = (Identical)mock; byte[] retVal = ident.doThat(null); ! mock.expect("doThat"); ! assertEquals(1, retVal.length); assertEquals(4, retVal[0]); } ! public void testDefaultReturnWithOtherReturns() { --- 112,163 ---- } catch(IOException e) {} } ! public void testUsingANY() throws Exception { MockObject mockList = MockObjectFactory.createMock(ListenerOne.class); ListenerOne l = (ListenerOne)mockList; ! int expected = 1; l.callMeFirst(expected); ! CalledMethod m = mockList.expect(MockObject.ANY); Integer i = (Integer)m.getAllParams()[0]; assertEquals("param should be 1", new Integer(expected), i); } ! public void testMultipleANYs() throws Exception { MockObject mockList = MockObjectFactory.createMock(ListenerOne.class); ListenerOne l = (ListenerOne)mockList; ! l.callMeFirst(1); l.callMeSecond("second"); ! String[] methods = new String[] { MockObject.ANY, "callMeSecond" }; mockList.expect(methods); } ! public void testWrongMethod() { MockObject mock = MockObjectFactory.createMock(ListenerOne.class); ! try { mock.expect("noSuchMethod"); fail("This should throw an exception"); ! } catch(IllegalArgumentException e) { } } ! public void testDefaultRetVal() { MockObject mock = MockObjectFactory.createMock(Identical.class); ! mock.setDefaultReturnValue("doThat", new byte[] {4}); ! Identical ident = (Identical)mock; byte[] retVal = ident.doThat(null); ! mock.expect("doThat"); ! assertEquals(1, retVal.length); assertEquals(4, retVal[0]); } ! public void testDefaultReturnWithOtherReturns() { *************** *** 166,174 **** mock.setDefaultReturnValue("doThat", new byte[] {4}); mock.addReturnValue("doThat", new byte[] {5}); ! Identical ident = (Identical)mock; byte[] retVal = ident.doThat(null); mock.expect("doThat"); ! assertEquals(1, retVal.length); assertEquals(3, retVal[0]); --- 166,174 ---- mock.setDefaultReturnValue("doThat", new byte[] {4}); mock.addReturnValue("doThat", new byte[] {5}); ! Identical ident = (Identical)mock; byte[] retVal = ident.doThat(null); mock.expect("doThat"); ! assertEquals(1, retVal.length); assertEquals(3, retVal[0]); *************** *** 176,180 **** retVal = ident.doThat(null); mock.expect("doThat"); ! assertEquals(1, retVal.length); assertEquals(5, retVal[0]); --- 176,180 ---- retVal = ident.doThat(null); mock.expect("doThat"); ! assertEquals(1, retVal.length); assertEquals(5, retVal[0]); *************** *** 182,218 **** retVal = ident.doThat(null); mock.expect("doThat"); ! assertEquals(1, retVal.length); assertEquals(4, retVal[0]); } ! ! public void testReturnInterface() { MockObject mock = MockObjectFactory.createMock(FactoryInterface.class); ! FactoryInterface factory = (FactoryInterface)mock; ! mock.addReturnValue("createCar", new CarImpl()); Car car = factory.createCar("id"); ! assertEquals(car.getClass(), CarImpl.class); ! mock.expect("createCar"); } ! public void testReturnNull() { MockObject mock = MockObjectFactory.createMock(FactoryInterface.class); ! FactoryInterface factory = (FactoryInterface)mock; ! factory.createCar("aaa"); ! mock.expect("createCar"); } ! public void testBadPrimitive() { MockObject mock = MockObjectFactory.createMock(Car.class); ! Car car = (Car)mock; try { --- 182,218 ---- retVal = ident.doThat(null); mock.expect("doThat"); ! assertEquals(1, retVal.length); assertEquals(4, retVal[0]); } ! ! public void testReturnInterface() { MockObject mock = MockObjectFactory.createMock(FactoryInterface.class); ! FactoryInterface factory = (FactoryInterface)mock; ! mock.addReturnValue("createCar", new CarImpl()); Car car = factory.createCar("id"); ! assertEquals(car.getClass(), CarImpl.class); ! mock.expect("createCar"); } ! public void testReturnNull() { MockObject mock = MockObjectFactory.createMock(FactoryInterface.class); ! FactoryInterface factory = (FactoryInterface)mock; ! factory.createCar("aaa"); ! mock.expect("createCar"); } ! public void testBadPrimitive() { MockObject mock = MockObjectFactory.createMock(Car.class); ! Car car = (Car)mock; try { *************** *** 222,230 **** } catch(IllegalArgumentException e) { } ! } ! public void testNullPrimitive() { MockObject mock = MockObjectFactory.createMock(Car.class); ! Car car = (Car)mock; try { --- 222,230 ---- } catch(IllegalArgumentException e) { } ! } ! public void testNullPrimitive() { MockObject mock = MockObjectFactory.createMock(Car.class); ! Car car = (Car)mock; try { *************** *** 233,241 **** } catch(IllegalArgumentException e) { } ! } public void testPrimitive() { MockObject mock = MockObjectFactory.createMock(Car.class); ! Car car = (Car)mock; mock.addReturnValue("getWheelCount", new Integer(5)); --- 233,241 ---- } catch(IllegalArgumentException e) { } ! } public void testPrimitive() { MockObject mock = MockObjectFactory.createMock(Car.class); ! Car car = (Car)mock; mock.addReturnValue("getWheelCount", new Integer(5)); *************** *** 243,286 **** mock.expect("getWheelCount"); ! } public void testBehavior() { MockObject mock = MockObjectFactory.createMock(Identical.class); ! mock.addBehavior("doThat", new MyTestBehavior()); Identical ident = (Identical)mock; ! byte[] original = new byte[] { 1, 2, 3, 4, 0, 0, 0, 0}; byte[] bytes = new byte[] { 1, 2, 3, 4, 0 ,0,0,0}; ! byte[] newBytes = ident.doThat(bytes); ! CalledMethod m = mock.expect("doThat"); byte[] passedIn = (byte[])m.getAllParams()[0]; ! assertEquals(original.length, passedIn.length); for(int i = 0; i < original.length; i++) { assertEquals(original[i], passedIn[i]); } ! //make sure this is the same byte array we passed in assertSame(bytes, newBytes); ! for(int i = 0; i < 4; i++) { assertEquals(newBytes[i], newBytes[i+4]); } ! } ! // public void testTemp() { // MockObject mock = MockObjectFactory.createMock(ChannelManagerService.class); // int value = 5; // mock.addReturnValue("getWheelCount", value); ! // // ExtendedCar car = (ExtendedCar)mock; // int wheelCount = car.getWheelCount(); // assertEquals(value, wheelCount); // } ! public void testOverloadedMethod() { MockObject mock = MockObjectFactory.createMock(ExtendedCar.class); --- 243,302 ---- mock.expect("getWheelCount"); ! } + public void testMultipleReturns() + { + MockObject mock = MockObjectFactory.createMock(Car.class); + + Car car = (Car)mock; + mock.addReturnValue("getWheelCount", 1, 2, 3, 4, 5); + car.getWheelCount(2); + car.getWheelCount(2); + car.getWheelCount(2); + car.getWheelCount(2); + car.getWheelCount(2); + mock.expect("getWheelCount", "getWheelCount", "getWheelCount", "getWheelCount", "getWheelCount"); + + mock.expect(MockObject.NONE); + } + public void testBehavior() { MockObject mock = MockObjectFactory.createMock(Identical.class); ! mock.addBehavior("doThat", new MyTestBehavior()); Identical ident = (Identical)mock; ! byte[] original = new byte[] { 1, 2, 3, 4, 0, 0, 0, 0}; byte[] bytes = new byte[] { 1, 2, 3, 4, 0 ,0,0,0}; ! byte[] newBytes = ident.doThat(bytes); ! CalledMethod m = mock.expect("doThat"); byte[] passedIn = (byte[])m.getAllParams()[0]; ! assertEquals(original.length, passedIn.length); for(int i = 0; i < original.length; i++) { assertEquals(original[i], passedIn[i]); } ! //make sure this is the same byte array we passed in assertSame(bytes, newBytes); ! for(int i = 0; i < 4; i++) { assertEquals(newBytes[i], newBytes[i+4]); } ! } ! // public void testTemp() { // MockObject mock = MockObjectFactory.createMock(ChannelManagerService.class); // int value = 5; // mock.addReturnValue("getWheelCount", value); ! // // ExtendedCar car = (ExtendedCar)mock; // int wheelCount = car.getWheelCount(); // assertEquals(value, wheelCount); // } ! public void testOverloadedMethod() { MockObject mock = MockObjectFactory.createMock(ExtendedCar.class); *************** *** 288,318 **** mock.addReturnValue("getWheelCount", value); ! ExtendedCar car = (ExtendedCar)mock; int val = car.getWheelCount("asdf"); assertEquals(value, val); } ! public void testAddRemoveIgnore() { MockObject mock = MockObjectFactory.createMock(Car.class); mock.addIgnore("openDoor"); ! mock.addIgnore("closeDoor"); ! Car car = (Car)mock; car.openDoor(); car.closeDoor(); ! mock.expect(MockObject.NONE); ! mock.removeIgnore("closeDoor"); car.closeDoor(); ! mock.expect("closeDoor"); } ! public static void main(String[] args) { TestSuite suite = new TestSuite(); ! suite.addTest(new TestMockCreator("testWrongMethod")); // suite.addTest(new TestMockSuperclass("testMockCreator")); // suite.addTest(new TestMockSuperclass("testMockCreatorFail")); --- 304,334 ---- mock.addReturnValue("getWheelCount", value); ! ExtendedCar car = (ExtendedCar)mock; int val = car.getWheelCount("asdf"); assertEquals(value, val); } ! public void testAddRemoveIgnore() { MockObject mock = MockObjectFactory.createMock(Car.class); mock.addIgnore("openDoor"); ! mock.addIgnore("closeDoor"); ! Car car = (Car)mock; car.openDoor(); car.closeDoor(); ! mock.expect(MockObject.NONE); ! mock.removeIgnore("closeDoor"); car.closeDoor(); ! mock.expect("closeDoor"); } ! public static void main(String[] args) { TestSuite suite = new TestSuite(); ! suite.addTest(new TestMockCreator("testWrongMethod")); // suite.addTest(new TestMockSuperclass("testMockCreator")); // suite.addTest(new TestMockSuperclass("testMockCreatorFail")); |
|
From: dadrox <da...@us...> - 2006-11-15 16:54:54
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16959/input/javasrc/biz/xsoftware/impl/mock Modified Files: MockSuperclass.java Log Message: Added addReturnValue(String method, Object ... o) [note the varargs]. This works excellently with games testing. Index: MockSuperclass.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/MockSuperclass.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MockSuperclass.java 1 Oct 2006 04:02:00 -0000 1.5 --- MockSuperclass.java 15 Nov 2006 16:54:43 -0000 1.6 *************** *** 585,591 **** public void addReturnValue(String method, Object o) { ! verityMethodExists(method); ! Action action = new ReturnValue(o); ! addToActionList(action, method); } --- 585,604 ---- public void addReturnValue(String method, Object o) { ! addReturnValueImpl(method, o); ! } ! ! public void addReturnValue(String method, Object ... o) ! { ! for(int ii = 0; ii < o.length; ii++) ! { ! addReturnValueImpl(method, o[ii]); ! } ! } ! ! private void addReturnValueImpl(String method, Object o) ! { ! verityMethodExists(method); ! Action action = new ReturnValue(o); ! addToActionList(action, method); } |
|
From: dadrox <da...@us...> - 2006-11-15 16:54:49
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16959/input/javasrc/biz/xsoftware/mock Modified Files: MockObject.java Log Message: Added addReturnValue(String method, Object ... o) [note the varargs]. This works excellently with games testing. Index: MockObject.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/MockObject.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MockObject.java 1 Oct 2006 03:18:47 -0000 1.8 --- MockObject.java 15 Nov 2006 16:54:43 -0000 1.9 *************** *** 91,94 **** --- 91,95 ---- */ public void addReturnValue(String method, Object o); + public void addReturnValue(String method, Object ... o); public void addBehavior(String method, Behavior behavior); |
|
From: Nobody <fas...@us...> - 2006-11-12 06:37:52
|
Update of /cvsroot/mocklib/mocklib3/bldfiles In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17928/bldfiles Modified Files: build.xml Log Message: check in new build file used for autobuilds. Index: build.xml =================================================================== RCS file: /cvsroot/mocklib/mocklib3/bldfiles/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** build.xml 14 Sep 2006 15:27:57 -0000 1.7 --- build.xml 12 Nov 2006 06:37:45 -0000 1.8 *************** *** 119,122 **** --- 119,128 ---- *********************************************************************** --> + <target name="promptForInfo"> + <input message="Please enter the version number such as r1-0-1, etc." addproperty="version"/> + <input message="Please enter your sourceforge username" addproperty="user"/> + <input message="Please enter your sourceforge password" addproperty="password"/> + </target> + <target name="taskdefs"> <tstamp> *************** *** 125,132 **** locale ="en"/> </tstamp> - - <input message="Please enter the version number such as r1-0-1, etc." addproperty="version"/> - <input message="Please enter your sourceforge username" addproperty="user"/> - <input message="Please enter your sourceforge password" addproperty="password"/> <!-- Override this property to build official release --> --- 131,134 ---- *************** *** 657,661 **** </target> ! <target name="releaseDocs" depends="createdist" if="password"> <scp file="${dist}/${name}-${version}.zip" todir="${user}@shell.sourceforge.net:/home/groups/m/mo/mocklib" password="${password}" /> <sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="rm -rf /home/groups/m/mo/mocklib/htdocs/${name}/*" /> --- 659,663 ---- </target> ! <target name="releaseDocs" depends="promptForInfo, createdist" if="password"> <scp file="${dist}/${name}-${version}.zip" todir="${user}@shell.sourceforge.net:/home/groups/m/mo/mocklib" password="${password}" /> <sshexec host="shell.sourceforge.net" username="${user}" password="${password}" command="rm -rf /home/groups/m/mo/mocklib/htdocs/${name}/*" /> |
|
From: Nobody <fas...@us...> - 2006-10-29 17:27:59
|
Update of /cvsroot/mocklib/mocklib3/bldfiles In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25914/bldfiles Modified Files: design.xml Log Message: upgrade ant-contrib and fix design file and html files. Index: design.xml =================================================================== RCS file: /cvsroot/mocklib/mocklib3/bldfiles/design.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** design.xml 12 Sep 2006 02:21:00 -0000 1.3 --- design.xml 29 Oct 2006 17:27:53 -0000 1.4 *************** *** 14,22 **** <package name="javaxswing" package="javax.swing.event" needdeclarations="false"/> ! <!-- should use something like this instead on a per project basis --> ! <package name="api" package="biz.xsoftware.mock"> ! <depends>junit</depends> ! </package> <package name="testapi" package="biz.xsoftware.test.mock" subpackages="include"> <depends>api</depends> --- 14,21 ---- <package name="javaxswing" package="javax.swing.event" needdeclarations="false"/> ! <!-- The mocklib api which depends on nothing --> ! <package name="api" package="biz.xsoftware.mock"/> + <!-- This test suite tests the official mocklib api --> <package name="testapi" package="biz.xsoftware.test.mock" subpackages="include"> <depends>api</depends> *************** *** 28,31 **** --- 27,31 ---- </package> + <!-- These are special tests testing subclassing MockSuperclass --> <package name="testImpl" package="biz.xsoftware.impl.mock.test"> <depends>api</depends> |
|
From: Nobody <fas...@us...> - 2006-10-01 04:02:04
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2881/input/javasrc/biz/xsoftware/mock Added Files: NoCloneBehavior.java Log Message: basic example with behavior. --- NEW FILE: NoCloneBehavior.java --- package biz.xsoftware.mock; public interface NoCloneBehavior extends Behavior { } |
|
From: Nobody <fas...@us...> - 2006-10-01 04:02:03
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2881/input/javasrc/biz/xsoftware/impl/mock Modified Files: MockSuperclass.java BehaviorInfo.java Log Message: basic example with behavior. Index: MockSuperclass.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/MockSuperclass.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MockSuperclass.java 1 Oct 2006 03:18:44 -0000 1.4 --- MockSuperclass.java 1 Oct 2006 04:02:00 -0000 1.5 *************** *** 16,19 **** --- 16,20 ---- import biz.xsoftware.mock.ExpectFailedException; import biz.xsoftware.mock.MockObject; + import biz.xsoftware.mock.NoCloneBehavior; *************** *** 558,561 **** --- 559,565 ---- try { + if(behavior instanceof NoCloneBehavior) + return; + Method clonerMethod = clazz.getMethod(m.getName()+"Cloner", (Class[])m.getParameterTypes()); action.setClonerMethod(clonerMethod); *************** *** 621,625 **** if(action instanceof BehaviorInfo) { BehaviorInfo behavior = (BehaviorInfo)action; ! return behavior.runClonerMethod(params); } --- 625,630 ---- if(action instanceof BehaviorInfo) { BehaviorInfo behavior = (BehaviorInfo)action; ! if(behavior.hasClonerMethod()) ! return behavior.runClonerMethod(params); } Index: BehaviorInfo.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/BehaviorInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BehaviorInfo.java 1 Oct 2006 03:18:44 -0000 1.2 --- BehaviorInfo.java 1 Oct 2006 04:02:00 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- package biz.xsoftware.impl.mock; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; *************** *** 16,20 **** public Object execute(Object[] args) throws Throwable { ! return behaviorMethod.invoke(behavior, args); } --- 17,28 ---- public Object execute(Object[] args) throws Throwable { ! try { ! return behaviorMethod.invoke(behavior, args); ! } catch(InvocationTargetException e) { ! if(e.getCause() != null) ! throw e.getCause(); ! else ! throw e; ! } } *************** *** 30,33 **** --- 38,47 ---- this.clonerMethod = clonerMethod; } + + public boolean hasClonerMethod() { + if(clonerMethod == null) + return false; + return true; + } // private Method method; |
|
From: Nobody <fas...@us...> - 2006-10-01 03:18:54
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20088/input/javasrc/biz/xsoftware/mock Modified Files: MockObject.java Log Message: refactor mocklib3 a bit. Index: MockObject.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/MockObject.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MockObject.java 13 Sep 2006 03:09:00 -0000 1.7 --- MockObject.java 1 Oct 2006 03:18:47 -0000 1.8 *************** *** 53,64 **** public void setDefaultReturnValue(String method, Object returnValue); - /** - * Set the DefaultReturnValue for a 'method' - * @param method The method name to set the default return value for - * @param returnValue - * @param argTypes Optionally specify the type of parameters of the method - */ - public void setDefaultReturnValue(String method, Object returnValue, Class... argTypes); - public void setDefaultBehavior(String method, Behavior b); public void setDefaultBehavior(String method, Behavior b, Class ... argTypes); --- 53,56 ---- *************** *** 84,109 **** */ public void addThrowException(String method, Throwable e); - - /** - * Add an exception to throw when a method on the mockObject is called. - * <br/<br/> - * This can be called many times where each time it is called, the - * exception is added to a queue. Each time 'method' is called, it - * checks the queue, if empty, it does not throw an exception. - * <br/<br/> - * Should only pass the type of Throwable that the 'method' - * can throw. If you pass IOException in for a method that - * doesn't have a signature of 'throws IOException', then - * one of the following exceptions will be thrown into - * the sysUnderTest - * <ol> - * <li> UndeclaredThrowableException for MockObjects created with MockCreator</li> - * <li> RuntimeException for Subclasses of MockSuperclass</li> - * </ol> - * @param method The method to throw the exception on when it is called. - * @param e The exception to throw on method. - * @param argTypes Optionally specify the type of parameters of the method - */ - public void addThrowException(String method, Throwable e, Class... argTypes); /** --- 76,79 ---- *************** *** 121,140 **** */ public void addReturnValue(String method, Object o); - - /** - * Add a return value to return when 'method' is called. - * <br></br> - * This can be called multiple times and each call will add - * to a queue. When 'method' is called, it will return - * the first value on the queue. If the queue is null, - * 'method' will return the defaultvalue which is null unless - * setDefaultReturnValue is called on MockObject. - * <br></br> - * Use Integer to return int, Long for long, etc. - * @param method The method that when called returns first value on queue - * @param o The object to return that is added to the queue - * @param argTypes Optionally specify the type of parameters of the method - */ - public void addReturnValue(String method, Object o, Class... argTypes); public void addBehavior(String method, Behavior behavior); --- 91,94 ---- *************** *** 150,162 **** public void addIgnore(String method); ! /** ! * When calling expect, the MockObject will ignore the methods ! * in 'methods' variable so if one of the methods in this array is ! * called, it will not result in an exception. ! * ! * @param method The name of the method to ignore ! * @param argTypes Optionally specify the type of parameters of the method ! */ ! public void addIgnore(String method, Class ... argTypes); /** --- 104,116 ---- public void addIgnore(String method); ! // /** ! // * When calling expect, the MockObject will ignore the methods ! // * in 'methods' variable so if one of the methods in this array is ! // * called, it will not result in an exception. ! // * ! // * @param method The name of the method to ignore ! // * @param argTypes Optionally specify the type of parameters of the method ! // */ ! // public void addIgnore(String method, Class ... argTypes); /** *************** *** 167,177 **** public void removeIgnore(String method); ! /** ! * Removes the method from the ignored methods set. ! * ! * @param method The name of the method to not ignore ! * @param argTypes Optionally specify the type of parameters of the method ! */ ! public void removeIgnore(String method, Class ... argTypes); public void setExpectTimeout(int timeout); --- 121,131 ---- public void removeIgnore(String method); ! // /** ! // * Removes the method from the ignored methods set. ! // * ! // * @param method The name of the method to not ignore ! // * @param argTypes Optionally specify the type of parameters of the method ! // */ ! // public void removeIgnore(String method, Class ... argTypes); public void setExpectTimeout(int timeout); |
|
From: Nobody <fas...@us...> - 2006-10-01 03:18:54
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20088/input/javasrc/biz/xsoftware/test/mock Modified Files: TestMockCreator.java Log Message: refactor mocklib3 a bit. Index: TestMockCreator.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock/TestMockCreator.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TestMockCreator.java 15 Sep 2006 16:12:14 -0000 1.8 --- TestMockCreator.java 1 Oct 2006 03:18:47 -0000 1.9 *************** *** 286,294 **** MockObject mock = MockObjectFactory.createMock(ExtendedCar.class); int value = 5; ! try { ! mock.addReturnValue("getWheelCount", value); ! fail("should have thrown exception"); ! } catch(IllegalArgumentException e) { ! } } --- 286,295 ---- MockObject mock = MockObjectFactory.createMock(ExtendedCar.class); int value = 5; ! ! mock.addReturnValue("getWheelCount", value); ! ! ExtendedCar car = (ExtendedCar)mock; ! int val = car.getWheelCount("asdf"); ! assertEquals(value, val); } |
|
From: Nobody <fas...@us...> - 2006-10-01 03:18:53
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20088/input/javasrc/biz/xsoftware/impl/mock Modified Files: MessageHelper.java ReturnValue.java MockSuperclass.java BehaviorInfo.java ThrowException.java Action.java Removed Files: GenericAction.java Log Message: refactor mocklib3 a bit. Index: ReturnValue.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/ReturnValue.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReturnValue.java 12 Sep 2006 02:20:59 -0000 1.1 --- ReturnValue.java 1 Oct 2006 03:18:44 -0000 1.2 *************** *** 1,5 **** package biz.xsoftware.impl.mock; ! public class ReturnValue extends GenericAction implements Action { private Object retVal; --- 1,5 ---- package biz.xsoftware.impl.mock; ! public class ReturnValue implements Action { private Object retVal; --- GenericAction.java DELETED --- Index: ThrowException.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/ThrowException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ThrowException.java 12 Sep 2006 02:20:59 -0000 1.1 --- ThrowException.java 1 Oct 2006 03:18:44 -0000 1.2 *************** *** 1,5 **** package biz.xsoftware.impl.mock; ! public class ThrowException extends GenericAction implements Action { private Throwable e; --- 1,5 ---- package biz.xsoftware.impl.mock; ! public class ThrowException implements Action { private Throwable e; Index: BehaviorInfo.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/BehaviorInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BehaviorInfo.java 12 Sep 2006 02:20:58 -0000 1.1 --- BehaviorInfo.java 1 Oct 2006 03:18:44 -0000 1.2 *************** *** 5,9 **** import biz.xsoftware.mock.Behavior; ! public class BehaviorInfo extends GenericAction implements Action { private Behavior behavior; --- 5,9 ---- import biz.xsoftware.mock.Behavior; ! public class BehaviorInfo implements Action { private Behavior behavior; *************** *** 30,32 **** --- 30,42 ---- this.clonerMethod = clonerMethod; } + + // private Method method; + // + // public Method getMethod() { + // return method; + // } + // + // public void setMethod(Method method) { + // this.method = method; + // } } Index: Action.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/Action.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Action.java 12 Sep 2006 02:20:58 -0000 1.1 --- Action.java 1 Oct 2006 03:18:45 -0000 1.2 *************** *** 1,5 **** package biz.xsoftware.impl.mock; - import java.lang.reflect.Method; public interface Action { --- 1,4 ---- *************** *** 7,11 **** public Object execute(Object[] args) throws Throwable; - public void setMethod(Method m); - public Method getMethod(); } --- 6,8 ---- Index: MockSuperclass.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/MockSuperclass.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MockSuperclass.java 13 Sep 2006 03:09:00 -0000 1.3 --- MockSuperclass.java 1 Oct 2006 03:18:44 -0000 1.4 *************** *** 85,89 **** * called. */ ! public static final int DEFAULT_WAIT_TIME = 10000; private int waitTime = DEFAULT_WAIT_TIME; --- 85,89 ---- * called. */ ! public static final int DEFAULT_WAIT_TIME = 5000; private int waitTime = DEFAULT_WAIT_TIME; *************** *** 539,546 **** if(behavior == null) throw new IllegalArgumentException("behavior parameter cannot be null"); BehaviorInfo action = new BehaviorInfo(behavior); addToActionList(action, method, argTypes); - Method m = action.getMethod(); //verify behavior has correct methods Class clazz = behavior.getClass(); --- 539,546 ---- if(behavior == null) throw new IllegalArgumentException("behavior parameter cannot be null"); + Method m = checkMethod(method, argTypes); BehaviorInfo action = new BehaviorInfo(behavior); addToActionList(action, method, argTypes); //verify behavior has correct methods Class clazz = behavior.getClass(); *************** *** 574,607 **** public void addThrowException(String method, Throwable e) { ! addThrowException(method, e, new Class[] {}); ! } ! ! /** ! * @see biz.xsoftware.mock.MockObject#addThrowException(java.lang.String, java.lang.Throwable, Class...) ! */ ! public synchronized void addThrowException(String method, Throwable e, Class... argTypes) { ! if(e == null) ! throw new IllegalArgumentException("e parameter to this method cannot be null"); Action action = new ThrowException(e); ! addToActionList(action, method, argTypes); } - public void addReturnValue(String method, Object o) { ! addReturnValue(method, o, new Class[] {}); ! } ! ! /** ! * @see biz.xsoftware.mock.MockObject#addReturnValue(java.lang.String, java.lang.Object, Class...) ! */ ! public synchronized void addReturnValue(String method, Object o, Class... argTypes) { Action action = new ReturnValue(o); ! addToActionList(action, method, argTypes); } private void addToActionList(Action action, String method, Class... argTypes) { ! Method m = checkMethod(method, argTypes); ! action.setMethod(m); List<Action> l = methodToReturnVal.get(method); if(l == null) { --- 574,591 ---- public void addThrowException(String method, Throwable e) { ! verityMethodExists(method); Action action = new ThrowException(e); ! addToActionList(action, method); } public void addReturnValue(String method, Object o) { ! verityMethodExists(method); Action action = new ReturnValue(o); ! addToActionList(action, method); } private void addToActionList(Action action, String method, Class... argTypes) { ! List<Action> l = methodToReturnVal.get(method); if(l == null) { *************** *** 649,656 **** private void verifyMethodsExist(String[] methods) { for(int i = 0; i < methods.length; i++) { ! MethodVerifier.getMethod(getClasses(), false, methods[i]); } } private Method checkMethod(String method, Class[] argTypes) { return MethodVerifier.getMethod(getClasses(), true, method, argTypes); --- 633,644 ---- private void verifyMethodsExist(String[] methods) { for(int i = 0; i < methods.length; i++) { ! verityMethodExists(methods[i]); } } + private void verityMethodExists(String method) { + MethodVerifier.getMethod(getClasses(), false, method); + } + private Method checkMethod(String method, Class[] argTypes) { return MethodVerifier.getMethod(getClasses(), true, method, argTypes); Index: MessageHelper.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/impl/mock/MessageHelper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MessageHelper.java 14 Sep 2006 22:36:53 -0000 1.2 --- MessageHelper.java 1 Oct 2006 03:18:44 -0000 1.3 *************** *** 28,32 **** } ! public static String putTogetherReason(String[] methods, Set<String> ignorables, List methodsCalled, String lastLine) { String reason = "\nMethods you expected...\n"; for(int i = 0; i < methods.length; i++) { --- 28,32 ---- } ! public static String putTogetherReason(String[] methods, Set<String> ignorables, List<CalledMethod> methodsCalled, String lastLine) { String reason = "\nMethods you expected...\n"; for(int i = 0; i < methods.length; i++) { |
|
From: Nobody <fas...@us...> - 2006-09-17 16:35:49
|
Update of /cvsroot/mocklib/netmocklib/bldfiles In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7433/bldfiles Modified Files: project.build Log Message: trying to get FxCop working. Index: project.build =================================================================== RCS file: /cvsroot/mocklib/netmocklib/bldfiles/project.build,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** project.build 17 Sep 2006 15:03:38 -0000 1.3 --- project.build 17 Sep 2006 16:35:13 -0000 1.4 *************** *** 80,84 **** </target> ! <target name="codecoverage" depends="compile"> <mkdir dir="${codecov}"/> <mkdir dir="${reports}"/> --- 80,96 ---- </target> ! <target name="fxcop" depends="compile" description="Runs FxCop"> ! ! <exec program="${tools}/FxCop/fxcopcmd.exe" ! commandline="/p:${tools}/FxCop/ProjectRules.FxCop /c"/> ! <!-- Unfortunately, neither fail the build on warnings --> ! <!--fxcop directOutputToConsole="true" failonerror="true"> ! <targets> ! <include name="${assemblies}/${comp.name}" /> ! </targets> ! </fxcop--> ! </target> ! ! <target name="codecoverage" depends="compile" description="Runs Testall with code coverage report"> <mkdir dir="${codecov}"/> <mkdir dir="${reports}"/> *************** *** 102,106 **** </target> ! <target name="all" depends="winsvc.staging, testall" description="Builds everything, puts in web.staging and runs testall"/> <target name="clean" depends="undeployWinSvc" description="Cleans out files generated from this build file"> --- 114,118 ---- </target> ! <target name="all" depends="winsvc.staging, fxcop, codecoverage" description="Builds everything, puts in web.staging and runs testall"/> <target name="clean" depends="undeployWinSvc" description="Cleans out files generated from this build file"> |
|
From: Nobody <fas...@us...> - 2006-09-17 15:03:45
|
Update of /cvsroot/mocklib/netmocklib/bldfiles In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2832/bldfiles Modified Files: directory.properties project.build Log Message: upgrading NCover and fixing build to include stylesheet. Index: project.build =================================================================== RCS file: /cvsroot/mocklib/netmocklib/bldfiles/project.build,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** project.build 17 Sep 2006 13:50:09 -0000 1.2 --- project.build 17 Sep 2006 15:03:38 -0000 1.3 *************** *** 82,87 **** <target name="codecoverage" depends="compile"> <mkdir dir="${codecov}"/> ! <!--mkdir dir="${reports}"/> ! <mkdir dir="${codecov.report}"/--> <delete dir="${assemblies}\log" failonerror="false"/> <copy todir="${assemblies}"> --- 82,86 ---- <target name="codecoverage" depends="compile"> <mkdir dir="${codecov}"/> ! <mkdir dir="${reports}"/> <delete dir="${assemblies}\log" failonerror="false"/> <copy todir="${assemblies}"> *************** *** 91,95 **** </copy> <exec program="${tools}/NCover/NCover.Console.exe" ! commandline=""${tools}/NUnit/nunit-console.exe" ${assemblies}/${comp.name} //a ${assembly.name} //l ${codecov}/NCover.log //h ${codecov.report}"/> </target> --- 90,96 ---- </copy> <exec program="${tools}/NCover/NCover.Console.exe" ! commandline=""${tools}/NUnit/nunit-console.exe" ${assemblies}/${comp.name} //a ${assembly.name} //l ${codecov}/NCover.log //x ${codecov}/coverage.xml"/> ! ! <style in="${codecov}/coverage.xml" out="${codecov.report}" style="${tools}/NCover/Coverage.xsl"/> </target> Index: directory.properties =================================================================== RCS file: /cvsroot/mocklib/netmocklib/bldfiles/directory.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** directory.properties 17 Sep 2006 13:50:09 -0000 1.3 --- directory.properties 17 Sep 2006 15:03:38 -0000 1.4 *************** *** 22,26 **** <property name="codecov" value="${output}/codecov"/> <property name="reports" value="${output}/reports"/> ! <property name="codecov.report" value="${reports}/CodeCoverage"/> </project> --- 22,26 ---- <property name="codecov" value="${output}/codecov"/> <property name="reports" value="${output}/reports"/> ! <property name="codecov.report" value="${reports}/CodeCoverage.html"/> </project> |
|
From: Nobody <fas...@us...> - 2006-09-17 13:50:15
|
Update of /cvsroot/mocklib/netmocklib/bldfiles In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5446/bldfiles Modified Files: directory.properties project.build Log Message: trying to get NCover to work. Index: project.build =================================================================== RCS file: /cvsroot/mocklib/netmocklib/bldfiles/project.build,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** project.build 16 Sep 2006 04:33:35 -0000 1.1 --- project.build 17 Sep 2006 13:50:09 -0000 1.2 *************** *** 38,42 **** <references basedir="."> <include name="${lib}/**/*.dll"/> ! <include name="${tools}/NUnit/*.dll"/> </references> <resources basedir="${csfiles}"> --- 38,42 ---- <references basedir="."> <include name="${lib}/**/*.dll"/> ! <include name="${libexclude}/**/*.dll"/> </references> <resources basedir="${csfiles}"> *************** *** 82,85 **** --- 82,87 ---- <target name="codecoverage" depends="compile"> <mkdir dir="${codecov}"/> + <!--mkdir dir="${reports}"/> + <mkdir dir="${codecov.report}"/--> <delete dir="${assemblies}\log" failonerror="false"/> <copy todir="${assemblies}"> *************** *** 89,93 **** </copy> <exec program="${tools}/NCover/NCover.Console.exe" ! commandline="/o ${codecov}/${comp.name}.xml /c "${tools}/NUnit/nunit-console.exe" ${assemblies}/${comp.name} /a ${assembly.name} /l ${codecov}/NCover.log"/> </target> --- 91,95 ---- </copy> <exec program="${tools}/NCover/NCover.Console.exe" ! commandline=""${tools}/NUnit/nunit-console.exe" ${assemblies}/${comp.name} //a ${assembly.name} //l ${codecov}/NCover.log //h ${codecov.report}"/> </target> Index: directory.properties =================================================================== RCS file: /cvsroot/mocklib/netmocklib/bldfiles/directory.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** directory.properties 16 Sep 2006 05:00:28 -0000 1.2 --- directory.properties 17 Sep 2006 13:50:09 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- <property name="csfiles" value="csharpcode"/> <property name="lib" value="${input}/libinclude"/> + <property name="libexclude" value="${input}/libexclude"/> <property name="config" value="${input}/config"/> <property name="schemas" value="${input}/schemas"/> *************** *** 20,23 **** --- 21,26 ---- <property name="dist" value="${output}/dist"/> <property name="codecov" value="${output}/codecov"/> + <property name="reports" value="${output}/reports"/> + <property name="codecov.report" value="${reports}/CodeCoverage"/> </project> |
|
From: Nobody <fas...@us...> - 2006-09-16 05:01:04
|
Update of /cvsroot/mocklib/netmocklib/bldfiles In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11233/bldfiles Modified Files: directory.properties Log Message: got buildtemplate working now. Index: directory.properties =================================================================== RCS file: /cvsroot/mocklib/netmocklib/bldfiles/directory.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** directory.properties 16 Sep 2006 04:33:35 -0000 1.1 --- directory.properties 16 Sep 2006 05:00:28 -0000 1.2 *************** *** 4,9 **** <!-- input directories --> <property name="input" value="input"/> ! <property name="csfiles" value="${input}/csharp"/> ! <property name="lib" value="${input}/lib"/> <property name="config" value="${input}/config"/> <property name="schemas" value="${input}/schemas"/> --- 4,9 ---- <!-- input directories --> <property name="input" value="input"/> ! <property name="csfiles" value="csharpcode"/> ! <property name="lib" value="${input}/libinclude"/> <property name="config" value="${input}/config"/> <property name="schemas" value="${input}/schemas"/> |
