Menu
▾
▴
mockobjects-java-dev — For people who are working on the implementation of the java version
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(151) |
Sep
(21) |
Oct
(6) |
Nov
(70) |
Dec
(8) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(47) |
Feb
(66) |
Mar
(23) |
Apr
(115) |
May
(24) |
Jun
(53) |
Jul
(10) |
Aug
(279) |
Sep
(84) |
Oct
(149) |
Nov
(138) |
Dec
(52) |
| 2003 |
Jan
(22) |
Feb
(20) |
Mar
(29) |
Apr
(106) |
May
(170) |
Jun
(122) |
Jul
(70) |
Aug
(64) |
Sep
(27) |
Oct
(71) |
Nov
(49) |
Dec
(9) |
| 2004 |
Jan
(7) |
Feb
(38) |
Mar
(3) |
Apr
(9) |
May
(22) |
Jun
(4) |
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
|
Nov
(15) |
Dec
(2) |
| 2005 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(28) |
Jun
(3) |
Jul
(11) |
Aug
(5) |
Sep
(1) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2006 |
Jan
(8) |
Feb
(3) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Griffin C. <gri...@ho...> - 2002-10-14 23:39:27
|
I like the idea of the seperate projects, with www.mockobjects.com being the hub for all information. That way, any new projects (ports, implementation, etc..) won't need to be managed by the www.mockobjects.com guys. It would be tough to control a single project that has 47 project admins, one for each "port". Similar to how the xUnit ports were handled. I definatly think that there should be a central, generic area of information about the direction of the mock objects community in general. -Griffin >From: "Steve Freeman" <st...@m3...> >To: "MockObjects" <moc...@li...> >Subject: Re: [MO-java-dev] .NET Mock Objects? >Date: Mon, 14 Oct 2002 21:24:20 +0100 > >I'm in 2 minds about this. On the one hand, it would be nice to have >everything in the same place. On the other hand, on sourceforge, the >project seems to be the unit of control, who gets to be a commiter >etc -- so that seems like the right granularity. If anything, there >might be an argument for having mockobjects as a glue project, for >documentation say, and adding a new mockobjects-java. > >Any opinions, anyone? > >S. > > >----- Original Message ----- >From: "Jeff Martin" <je...@mk...> > > Personally I'd rather see dotnetmock move over here. > > > > Not to try and subsume what you're doing but to try and keep the flow >of > > ideas between different implementations going. > > > > It would be nice to present a united front rather than a whole series >of > > small loosely related projects. > > > > > >------------------------------------------------------- >This sf.net email is sponsored by:ThinkGeek >Welcome to geek heaven. >http://thinkgeek.com/sf >_______________________________________________ >Mockobjects-java-dev mailing list >Moc...@li... >https://lists.sourceforge.net/lists/listinfo/mockobjects-java-dev Griffin Caprio cell: (773) 230-0936 _________________________________________________________________ Join the worlds largest e-mail service with MSN Hotmail. http://www.hotmail.com |
|
From: Griffin C. <gri...@ho...> - 2002-10-14 23:30:57
|
Great, thanks! -Griffin >From: Jeff Martin <je...@mk...> >To: "'Mockobjects Java Dev'" <moc...@li...> >Subject: Re: [MO-java-dev] .NET Mock Objects - v0.1 Released >Date: 14 Oct 2002 11:57:49 +0100 > >I've added a link on from www.mockobjects.com to this. > >At some point I might add a bit more detail about each project. > >On Fri, 2002-10-11 at 06:10, Griffin Caprio wrote: > > This is an announcement for the initial release of the .NET Mock Objects > > core framework. > > > > http://www.sourceforge.net/projects/dotnetmock > > > > The initial .NET implementation of the core framework is complete. Next >is > > the implementation of standard .NET objects. > > > > Feedback is welcome as well as any help or contributions. After all, >there > > is only one lowly programmer working on this ;) > > > > -Griffin > > > > > > > > ------------------------------------------------------- > > This sf.net email is sponsored by:ThinkGeek > > Welcome to geek heaven. > > http://thinkgeek.com/sf > > _______________________________________________ > > Mockobjects-java-dev mailing list > > Moc...@li... > > https://lists.sourceforge.net/lists/listinfo/mockobjects-java-dev >-- >Jeff Martin <je...@mk...> >mkodo > > > >------------------------------------------------------- >This sf.net email is sponsored by:ThinkGeek >Welcome to geek heaven. >http://thinkgeek.com/sf >_______________________________________________ >Mockobjects-java-dev mailing list >Moc...@li... >https://lists.sourceforge.net/lists/listinfo/mockobjects-java-dev Griffin Caprio cell: (773) 230-0936 _________________________________________________________________ Join the worlds largest e-mail service with MSN Hotmail. http://www.hotmail.com |
|
From: Steve F. <sm...@us...> - 2002-10-14 23:10:30
|
Update of /cvsroot/mockobjects/mockobjects-java In directory usw-pr-cvs1:/tmp/cvs-serv14200 Added Files: make_mocks.sh Log Message: added helper build script --- NEW FILE: make_mocks.sh --- #!/usr/bin/bash # helper script for building all the combinations # copy it somewhere it won't be overwritten and set the paths # to those on your machine # This version setup for cygwin on my machine # - smgf export ANT_HOME="D:\java\ant" cd mockobjects-java rm -f lib/junit.jar cp /cygdrive/d/java/junit/3.7/junit.jar lib export PATH=$ANT_HOME/bin:$PATH ant.bat clean ( export JAVA_HOME="D:\java\jdk\1.3.1_05" export PATH=$JAVA_HOME/bin:$PATH echo "+++++++++ JAVA 1.3 +++++++++++++" echo " +++++ JDK 1.2 +++++" rm -f lib/j2ee.jar cp /cygdrive/d/java/j2sdkee1.2.1//lib/j2ee.jar lib ant.bat clean-compiled jar echo " +++++ JDK 1.3 +++++" rm -f lib/j2ee.jar cp /cygdrive/d/java/j2sdkee1.3.1/lib/j2ee.jar lib ant.bat clean-compiled jar ) ( export JAVA_HOME="D:\java\jdk\1.4.1" export PATH=$JAVA_HOME/bin:$PATH echo "+++++++++ JAVA 1.4 +++++++++++++" echo " +++++ JDK 1.2 +++++" rm -f lib/j2ee.jar cp /cygdrive/d/java/j2sdkee1.2.1//lib/j2ee.jar lib ant.bat clean-compiled jar echo " +++++ JDK 1.3 +++++" rm -f lib/j2ee.jar cp /cygdrive/d/java/j2sdkee1.3.1/lib/j2ee.jar lib ant.bat clean-compiled jar ) |
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/helpers In directory usw-pr-cvs1:/tmp/cvs-serv13062/src/j2ee/common/com/mockobjects/helpers Removed Files: TagTestHelper.java FilterTestHelper.java AbstractServletTestHelper.java ServletTestHelper.java Log Message: moved from j2ee/common to j2ee/1.3 --- TagTestHelper.java DELETED --- --- FilterTestHelper.java DELETED --- --- AbstractServletTestHelper.java DELETED --- --- ServletTestHelper.java DELETED --- |
|
From: Steve F. <sm...@us...> - 2002-10-14 23:00:28
|
Update of /cvsroot/mockobjects/mockobjects-java
In directory usw-pr-cvs1:/tmp/cvs-serv10936
Modified Files:
build.xml
Log Message:
some reformatting
added more versioning details to output file names
refactored shared target code
Index: build.xml
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xml 29 Aug 2002 08:34:36 -0000 1.24
+++ build.xml 14 Oct 2002 23:00:17 -0000 1.25
@@ -1,27 +1,24 @@
<?xml version="1.0"?>
<project name="mockobjects" default="jar" basedir=".">
+
<property file="${user.home}/build.properties" />
<property file="build.properties" />
<property name="out.dir" value="out" />
<property name="out.doc.dir" value="${out.dir}/doc" />
- <property name="out.javadoc.dir"
- value="${out.doc.dir}/javadoc" />
+ <property name="out.javadoc.dir" value="${out.doc.dir}/javadoc" />
<property name="core.classes" value="${out.dir}/core/classes" />
<property name="jdk.classes" value="${out.dir}/jdk/classes" />
<property name="j2ee.classes" value="${out.dir}/j2ee/classes" />
- <property name="httpclient.classes"
- value="${out.dir}/ext/httpclient/classes" />
+ <property name="httpclient.classes" value="${out.dir}/ext/httpclient/classes" />
<property name="out.site.dir" value="${out.dir}/site" />
<property name="out.src.dir" value="${out.dir}/src" />
- <property name="out.src.examples.dir"
- value="${out.src.dir}/examples" />
+ <property name="out.src.examples.dir" value="${out.src.dir}/examples" />
<property name="out.xdoc.doc.dir" value="${out.dir}/xdoc/doc" />
- <property name="out.xdoc.site.dir"
- value="${out.dir}/xdoc/site" />
+ <property name="out.xdoc.site.dir" value="${out.dir}/xdoc/site" />
<target name="project-properties">
<property name="project.fullname" value="Mock Objects" />
- <property name="project.version" value="0.4" />
+ <property name="project.version" value="0.5" />
<property name="project.name" value="mockobjects" />
<property name="year" value="2002" />
<property name="debug" value="on" />
@@ -35,8 +32,7 @@
<property name="src.j2ee.dir" value="${src.dir}/j2ee" />
<property name="src.jdk.dir" value="${src.dir}/jdk" />
<property name="src.httpclient.dir" value="${src.dir}/extensions" />
- <property name="src.examples.dir"
- value="${src.dir}/examples" />
+ <property name="src.examples.dir" value="${src.dir}/examples" />
<property name="conf.dir" value="conf" />
<property name="doc.dir" value="doc" />
<property name="xdoc.dir" value="${doc.dir}/xdocs" />
@@ -46,14 +42,12 @@
<target name="deliverable-names" depends="project-properties">
<property name="dist.dir" value="dist" />
- <property name="jar.base.name" value="mocks" />
- <property name="sources.zip.name"
- value="${project.name}-src" />
+ <property name="jar.base.name" value="mockobjects-${project.version}" />
+ <property name="alt.jar.base.name" value="alt-${project.version}" />
+ <property name="sources.zip.name" value="${project.name}-src" />
<property name="site.name" value="${project.name}-website" />
- <property name="javadoc.name"
- value="${project.name}-javadoc" />
- <property name="project.zip.name"
- value="${project.name}-${project.version}" />
+ <property name="javadoc.name" value="${project.name}-javadoc" />
+ <property name="project.zip.name" value="${project.name}-${project.version}" />
</target>
<target name="useful-file-patterns">
@@ -69,27 +63,25 @@
</fileset>
</path>
- <available property="jdk.version" value="1.2"
- classname="java.lang.ThreadLocal" />
- <available property="jdk.version" value="1.3"
- classname="java.lang.StrictMath" />
- <available property="jdk.version" value="1.4"
- classname="java.lang.CharSequence" />
+ <available property="jdk.version" value="1.2" classname="java.lang.ThreadLocal" />
+ <available property="jdk.version" value="1.3" classname="java.lang.StrictMath" />
+ <available property="jdk.version" value="1.4" classname="java.lang.CharSequence" />
<available property="j2ee.version" value="1.2"
- classpathref="lib.classpath"
- classname="javax.servlet.Servlet" />
+ classpathref="lib.classpath"
+ classname="javax.servlet.Servlet" />
<available property="j2ee.version" value="1.3"
- classpathref="lib.classpath"
- classname="javax.servlet.Filter" />
+ classpathref="lib.classpath"
+ classname="javax.servlet.Filter" />
<available property="httpclient" value="true"
- classpathref="lib.classpath"
- classname="org.apache.commons.httpclient.HttpClient" />
+ classpathref="lib.classpath"
+ classname="org.apache.commons.httpclient.HttpClient" />
<property name="jar.j2ee.name" value="" />
<available property="jar.j2ee.name"
- value="_j2ee${j2ee.version}" classpathref="lib.classpath"
- classname="javax.servlet.Servlet" />
+ value="_j2ee${j2ee.version}"
+ classpathref="lib.classpath"
+ classname="javax.servlet.Servlet" />
</target>
<target name="call-me-first"
@@ -113,49 +105,23 @@
</target>
<target name="_flush-dir">
-<!-- requires flush.dir -->
+ <!-- requires flush.dir -->
<delete dir="${flush.dir}" quiet="yes" />
<mkdir dir="${flush.dir}" />
</target>
- <target name="_copy-from-j2ee" if="j2ee.version">
-<!-- requires copy.todir, src.patternset.id -->
- <copy todir="${copy.todir}" filtering="true"
- includeEmptyDirs="false">
- <fileset dir="${src.dir}/j2ee/common">
- <patternset refid="${src.patternset.id}" />
- </fileset>
-
- <fileset dir="${src.dir}/j2ee/${j2ee.version}">
- <patternset refid="${src.patternset.id}" />
- </fileset>
- </copy>
- </target>
-
- <target name="_copy-from-src"
- depends="useful-file-patterns, _copy-from-j2ee">
-<!-- requires copy.todir, src.patternset.id -->
- <copy todir="${copy.todir}" filtering="true"
- includeEmptyDirs="false">
- <fileset dir="${src.dir}/core">
- <patternset refid="${src.patternset.id}" />
- </fileset>
- </copy>
- </target>
-
<target name="compile-core" depends="call-me-first"
description="Compile mock objects core">
<mkdir dir="${core.classes}" />
<javac destdir="${core.classes}" debug="${debug}"
- deprecation="${deprecation}" verbose="false"
- optimize="${optimize}" srcdir="${src.core.dir}">
+ deprecation="${deprecation}" verbose="false"
+ optimize="${optimize}" srcdir="${src.core.dir}">
<exclude name="com/mockobjects/test/**" />
<classpath>
<path refid="lib.classpath" />
-
<pathelement path="${java.class.path}" />
</classpath>
</javac>
@@ -203,12 +169,14 @@
<mkdir dir="${j2ee.classes}" />
- <javac destdir="${j2ee.classes}" debug="${debug}"
- deprecation="${deprecation}" verbose="false"
- optimize="${optimize}">
+ <javac destdir="${j2ee.classes}"
+ debug="${debug}"
+ deprecation="${deprecation}"
+ verbose="false"
+ optimize="${optimize}">
- <src path="${src.j2ee.dir}/${j2ee.version}" />
<src path="${src.j2ee.dir}/common" />
+ <src path="${src.j2ee.dir}/${j2ee.version}" />
<classpath>
<path refid="lib.classpath" />
@@ -273,49 +241,59 @@
</target>
<target name="copy-nonjava-files"
- depends="source-locations, check-availabilities, call-me-first">
+ depends="source-locations, check-availabilities, call-me-first">
</target>
- <target name="jar" depends="jar-core,jar-jdk,jar-j2ee"/>
+ <target name="jar"
+ depends="jar-core, jar-jdk, jar-j2ee"/>
- <target name="jar-core" depends="test"
- description="Generate core mockobjects jar">
-
- <jar jarfile="${out.dir}/mockobjects-core.jar"
- manifest="${conf.dir}/manifest">
+ <target name="jar-core"
+ depends="deliverable-names, test"
+ description="Generate core mockobjects jar">
+ <jar jarfile="${out.dir}/${jar.base.name}-core.jar"
+ manifest="${conf.dir}/manifest">
<fileset dir="${core.classes}" />
</jar>
</target>
- <target name="jar-jdk" depends="test"
- description="Generate jdk mockobjects jar">
- <jar jarfile="${out.dir}/mockobjects-jdk${jdk.version}.jar"
- manifest="${conf.dir}/manifest">
- <fileset dir="${jdk.classes}">
- <exclude name="alt/**"/>
- </fileset>
- </jar>
- <jar jarfile="${out.dir}/alt-jdk${jdk.version}.jar"
- manifest="${conf.dir}/manifest">
- <fileset dir="${jdk.classes}">
- <include name="alt/**"/>
- </fileset>
- </jar>
+
+ <target name="jar-jdk"
+ depends="deliverable-names, test"
+ description="Generate jdk mockobjects jar">
+ <antcall target="_inner-jar">
+ <param name="jarfile.name" value="${out.dir}/${jar.base.name}-jdk${jdk.version}.jar" />
+ <param name="alt.jarfile.name" value="${out.dir}/${alt.jar.base.name}-jdk${jdk.version}.jar" />
+ <param name="classes.dir" value="${jdk.classes}" />
+ </antcall>
</target>
- <target name="jar-j2ee" depends="test" if="j2ee.version"
- description="Generate j2ee mockobjects jar">
- <jar jarfile="${out.dir}/mockobjects-j2ee${j2ee.version}.jar"
- manifest="${conf.dir}/manifest">
- <fileset dir="${j2ee.classes}">
+
+ <target name="jar-j2ee"
+ depends="deliverable-names, test"
+ if="j2ee.version"
+ description="Generate j2ee mockobjects jar">
+ <antcall target="_inner-jar">
+ <param name="jarfile.name" value="${out.dir}/${jar.base.name}-j${jdk.version}-j2ee${j2ee.version}.jar" />
+ <param name="alt.jarfile.name" value="${out.dir}/${alt.jar.base.name}-j${jdk.version}-j2ee${j2ee.version}.jar" />
+ <param name="classes.dir" value="${j2ee.classes}" />
+ </antcall>
+ </target>
+
+ <target name="_inner-jar"
+ depends="deliverable-names, test" >
+ <!-- requires jarfile.name, alt.jarfile.name, classes.dir -->
+ <jar jarfile="${jarfile.name}"
+ manifest="${conf.dir}/manifest">
+ <fileset dir="${classes.dir}">
<exclude name="alt/**"/>
</fileset>
</jar>
- <jar jarfile="${out.dir}/alt-j2ee${j2ee.version}.jar"
- manifest="${conf.dir}/manifest">
- <fileset dir="${j2ee.classes}">
+ <jar jarfile="${alt.jarfile.name}"
+ manifest="${conf.dir}/manifest">
+ <fileset dir="${classes.dir}">
<include name="alt/**"/>
</fileset>
</jar>
</target>
+
<target name="jar-ext-httpclient" depends="test, compile-ext-httpclient"
description="Generate extention mockobjects jar">
<jar jarfile="${out.dir}/mockobjects-httpclient.jar"
@@ -368,15 +346,15 @@
</target>
<target name="_prepare-xdoc">
-<!-- requires prepare.xdoc.dir, book.xml.file -->
+ <!-- requires prepare.xdoc.dir, book.xml.file -->
<mkdir dir="${prepare.xdoc.dir}" />
-<!-- Copy doc-book.xml to book.xml for defining the local
+ <!-- Copy doc-book.xml to book.xml for defining the local
documentation web site and replacing token filters (year) -->
<copy file="${xdoc.dir}/${book.xml.file}" filtering="on"
- tofile="${prepare.xdoc.dir}/book.xml" />
+ tofile="${prepare.xdoc.dir}/book.xml" />
-<!-- Copy all remaining files from ${xdoc.dir} to
+ <!-- Copy all remaining files from ${xdoc.dir} to
${out.xdoc.doc.dir} -->
<copy todir="${prepare.xdoc.dir}" filtering="on">
<fileset dir="${xdoc.dir}">
@@ -392,7 +370,6 @@
<antcall target="_prepare-xdoc">
<param name="prepare.xdoc.dir" value="${out.xdoc.doc.dir}" />
-
<param name="book.xml.file" value="doc-book.xml" />
</antcall>
@@ -423,35 +400,34 @@
description="Generate the documentation website">
</target>
-<!--
+ <!--
========================================================================
Generate the web site
+ Note that we do not copy the javadoc to the web site. This is
+ because the web site need to evolve independently of the javadoc
+ for a given version of the project. In other words, the javadoc on
+ the web site must not change until a new release is out.
========================================================================
- -->
+ -->
+ <!--
<target name="prepare-site"
- depends="deliverable-names, call-me-first">
+ depends="deliverable-names, call-me-first">
<mkdir dir="${out.site.dir}" />
- <mkdir dir="${out.site.dir}/images" />
-
<antcall target="_prepare-xdoc">
- <param name="prepare.xdoc.dir"
- value="${out.xdoc.site.dir}" />
-
+ <param name="prepare.xdoc.dir" value="${out.xdoc.site.dir}" />
<param name="book.xml.file" value="site-book.xml" />
</antcall>
-<!-- Copy the images -->
+ <mkdir dir="${out.site.dir}/images" />
<copy todir="${out.site.dir}/images">
<fileset dir="${xdoc.dir}/images" />
</copy>
-<!-- Copy the papers -->
<copy todir="${out.site.dir}/papers">
<fileset dir="${xdoc.dir}/papers" />
</copy>
-<!-- Copy other files (non XML) -->
<copy todir="${out.site.dir}">
<fileset dir="${xdoc.dir}">
<include name="misc/*.pdf" />
@@ -459,70 +435,72 @@
</copy>
<uptodate property="stylebook.site.notrequired"
- targetfile="${out.site.dir}/index.html">
+ targetfile="${out.site.dir}/index.html">
<srcfiles dir="${out.xdoc.site.dir}" includes="**/*.*" />
-
<srcfiles dir="${skin.dir}" includes="**/*.*" />
</uptodate>
-<!-- Note that we do not copy the javadoc to the web site. This is
- because the web site need to evolve independently of the javadoc
- for a given version of the project. In other words, the javadoc on
- the web site must not change until a new release is out -->
</target>
-<!-- Generate the web site -->
<target name="site"
- depends="deliverable-names, prepare-site"
- unless="stylebook.site.notrequired"
- description="Generate the web site">
+ description="Generate the web site"
+ depends="deliverable-names, prepare-site"
+ unless="stylebook.site.notrequired">
+
<stylebook book="${out.xdoc.site.dir}/book.xml"
- skinDirectory="${skin.dir}/jakarta.apache.org"
- targetDirectory="${out.site.dir}">
+ skinDirectory="${skin.dir}/jakarta.apache.org"
+ targetDirectory="${out.site.dir}">
<classpath>
<pathelement path="${java.class.path}" />
</classpath>
</stylebook>
-<!-- Create the gzipped web site -->
- <tar tarfile="${out.dir}/${site.name}.tar"
- basedir="${out.site.dir}" />
+ <tar tarfile="${out.dir}/${site.name}.tar" basedir="${out.site.dir}" />
+ <gzip zipfile="${out.dir}/${site.name}.tar.gz" src="${out.dir}/${site.name}.tar" />
+ <delete file="${out.dir}/${site.name}.tar" />
+ </target>
+ -->
- <gzip zipfile="${out.dir}/${site.name}.tar.gz"
- src="${out.dir}/${site.name}.tar" />
+ <target name="clean-compiled"
+ description="Clean up compiled class files"
+ depends="call-me-first" >
+ <delete quiet="true">
+ <fileset dir="${core.classes}" />
+ <fileset dir="${jdk.classes}" />
+ <fileset dir="${j2ee.classes}" />
+ </delete>
- <delete file="${out.dir}/${site.name}.tar" />
</target>
- <target name="clean" depends="call-me-first"
- description="clean up all generated files">
+ <target description="clean up all generated files"
+ name="clean"
+ depends="call-me-first">
<delete>
<fileset dir=".">
<include name="**/*.bak" />
</fileset>
</delete>
-<!-- Deletes all files ending with '~' -->
<delete>
<fileset dir="." includes="**/*~" defaultexcludes="no" />
</delete>
-<!-- Remove the out directory -->
<delete dir="${out.dir}" />
</target>
- <target name="prepare-dist" depends="jar,doc">
+ <target name="prepare-dist"
+ depends="jar,doc">
<mkdir dir="${dist.dir}" />
</target>
- <target name="zip-java-sources" depends="deliverable-names">
- <zip zipfile="${out.dir}/${sources.zip.name}.zip"
- basedir="${src.dir}" />
+ <target name="zip-java-sources"
+ depends="deliverable-names">
+ <zip zipfile="${out.dir}/${sources.zip.name}.zip" basedir="${src.dir}" />
</target>
- <target name="dist"
- depends="call-me-first, prepare-dist, zip-java-sources"
- description="Generate the distributables">
+ <target description="Generate the distributables"
+ name="dist"
+ depends="call-me-first, prepare-dist, zip-java-sources">
<zip zipfile="${dist.dir}/mockobjects${project.version}.zip">
<zipfileset dir="${out.dir}" prefix="lib">
<include name="*.jar" />
@@ -541,8 +519,9 @@
Do it all
========================================================================
-->
- <target name="all" depends="clean, test, jar, doc, site, dist"
- description="do it all (clean, jar, doc, test, site)">
+ <target name="all"
+ depends="clean, test, jar, doc, dist"
+ description="do it all (clean, jar, doc, test)">
</target>
<!--
@@ -555,6 +534,7 @@
========================================================================
-->
+<!--
<target name="deploy-site" depends="clean, site" if="username"
description="Deploy the web site to SourceForge (see target for details)">
@@ -575,6 +555,6 @@
line="-l ${username} ${deploy.host} 'cd ${deploy.homepage};gunzip ${site.name}.tar.gz;tar xvf ${site.name}.tar;rm ${site.name}.tar'" />
</exec>
</target>
-
+-->
</project>
|
|
From: Steve F. <sm...@us...> - 2002-10-14 22:58:32
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/alt/javax/mail/internet In directory usw-pr-cvs1:/tmp/cvs-serv10355/src/j2ee/common/alt/javax/mail/internet Removed Files: MimeMessageImpl.java MimeMessageFactoryImpl.java Log Message: moved some j2ee alt and helper classes from common to 1.3 to avoid compilation failures --- MimeMessageImpl.java DELETED --- --- MimeMessageFactoryImpl.java DELETED --- |
|
From: Steve F. <sm...@us...> - 2002-10-14 22:58:31
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/alt/javax/mail In directory usw-pr-cvs1:/tmp/cvs-serv10355/src/j2ee/common/alt/javax/mail Removed Files: ServiceImpl.java TransportImpl.java MessageImpl.java SessionImpl.java Log Message: moved some j2ee alt and helper classes from common to 1.3 to avoid compilation failures --- ServiceImpl.java DELETED --- --- TransportImpl.java DELETED --- --- MessageImpl.java DELETED --- --- SessionImpl.java DELETED --- |
|
From: Steve F. <sm...@us...> - 2002-10-14 22:58:31
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/alt/javax/mail
In directory usw-pr-cvs1:/tmp/cvs-serv10355/src/j2ee/1.3/alt/javax/mail
Added Files:
SessionImpl.java TransportImpl.java MessageImpl.java
ServiceImpl.java
Log Message:
moved some j2ee alt and helper classes from
common to 1.3 to avoid compilation failures
--- NEW FILE: SessionImpl.java ---
package alt.javax.mail;
import javax.mail.*;
import java.util.Properties;
public class SessionImpl implements Session {
private final javax.mail.Session session;
public SessionImpl(javax.mail.Session session) {
this.session = session;
}
public Session getInstance(Properties props, Authenticator
authenticator) {
return new SessionImpl(session.getInstance(props, authenticator));
}
public Session getInstance(Properties props) {
return new SessionImpl(session.getInstance(props));
}
public Session getDefaultInstance(Properties props, Authenticator
authenticator) {
return new SessionImpl(session.getDefaultInstance(
props, authenticator));
}
public Session getDefaultInstance(Properties props) {
return new SessionImpl(session.getDefaultInstance(props));
}
public void setDebug(boolean debug) {
}
public boolean getDebug() {
return session.getDebug();
}
public Provider getProviders()[] {
return session.getProviders();
}
public Provider getProvider(String protocol) throws NoSuchProviderException {
return session.getProvider(protocol);
}
public void setProvider(Provider provider) throws NoSuchProviderException {
session.setProvider(provider);
}
public Store getStore() throws NoSuchProviderException {
return session.getStore();
}
public Store getStore(String protocol) throws NoSuchProviderException {
return session.getStore(protocol);
}
public Store getStore(URLName url) throws NoSuchProviderException {
return session.getStore(url);
}
public Store getStore(Provider provider) throws NoSuchProviderException {
return session.getStore(provider);
}
public Folder getFolder(URLName url) throws MessagingException {
return session.getFolder(url);
}
public Transport getTransport() throws NoSuchProviderException {
return new TransportImpl(session.getTransport());
}
public Transport getTransport(String protocol) throws NoSuchProviderException {
return new TransportImpl(session.getTransport(protocol));
}
public Transport getTransport(URLName url) throws NoSuchProviderException {
return new TransportImpl(session.getTransport(url));
}
public Transport getTransport(Provider provider) throws NoSuchProviderException {
return new TransportImpl(session.getTransport(provider));
}
public Transport getTransport(Address address) throws NoSuchProviderException {
return new TransportImpl(session.getTransport(address));
}
public void setPasswordAuthentication(URLName url, PasswordAuthentication pw) {
session.setPasswordAuthentication(url, pw);
}
public PasswordAuthentication getPasswordAuthentication(URLName url) {
return session.getPasswordAuthentication(url);
}
public PasswordAuthentication requestPasswordAuthentication(java.net.InetAddress addr, int port, String protocol, String prompt, String defaultUserName) {
return session.requestPasswordAuthentication(addr, port, protocol,
prompt, defaultUserName);
}
public Properties getProperties() {
return session.getProperties();
}
public String getProperty(String name) {
return session.getProperty(name);
}
public javax.mail.Session getWrappedSession() {
return session;
}
}
--- NEW FILE: TransportImpl.java ---
package alt.javax.mail;
import alt.javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Address;
import javax.mail.event.TransportListener;
public class TransportImpl extends ServiceImpl implements Transport {
private final javax.mail.Transport transport;
public TransportImpl(javax.mail.Transport transport){
super(transport);
this.transport = transport;
}
public void send(Message message) throws MessagingException{
transport.send(message.getRealMessage());
}
public void send(Message message, Address[] addresses)
throws MessagingException{
transport.send(message.getRealMessage(), addresses);
}
public void sendMessage(Message message, Address[] addresses)
throws MessagingException{
transport.sendMessage(message.getRealMessage(), addresses);
}
public void addTransportListener(TransportListener transportListener){
transport.addTransportListener(transportListener);
}
public void removeTransportListener(TransportListener transportListener){
transport.removeTransportListener(transportListener);
}
}
--- NEW FILE: MessageImpl.java ---
package alt.javax.mail;
import com.mockobjects.MockObject;
import javax.mail.MessagingException;
import javax.mail.Address;
import javax.mail.Flags;
import javax.mail.Multipart;
import java.util.Date;
import java.util.Enumeration;
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
public class MessageImpl implements Message {
private final javax.mail.Message message;
public MessageImpl(javax.mail.Message message) {
this.message = message;
}
public javax.mail.Message getRealMessage() {
return message;
}
public final Address[] getFrom() throws MessagingException {
return message.getFrom();
}
public final void setFrom() throws MessagingException {
message.setFrom();
}
public final void setFrom(Address address) throws MessagingException {
message.setFrom(address);
}
public final void addFrom(Address[] addresses) throws MessagingException {
message.addFrom(addresses);
}
public final Address[] getRecipients(javax.mail.Message.RecipientType type) throws MessagingException {
return message.getRecipients(type);
}
public final void setRecipients(javax.mail.Message.RecipientType type, Address[] addresses) throws MessagingException {
message.setRecipients(type, addresses);
}
public final void addRecipients(javax.mail.Message.RecipientType type, Address[] addresses) throws MessagingException {
message.addRecipients(type, addresses);
}
public final String getSubject() throws MessagingException {
return message.getSubject();
}
public final void setSubject(String s) throws MessagingException {
message.setSubject(s);
}
public final Date getSentDate() throws MessagingException {
return message.getSentDate();
}
public final void setSentDate(Date date) throws MessagingException {
message.setSentDate(date);
}
public final Date getReceivedDate() throws MessagingException {
return message.getReceivedDate();
}
public final Flags getFlags() throws MessagingException {
return message.getFlags();
}
public final void setFlags(Flags flags, boolean b) throws MessagingException {
message.setFlags(flags, b);
}
public final Message reply(boolean b) throws MessagingException {
return new MessageImpl(message.reply(b));
}
public final void saveChanges() throws MessagingException {
message.saveChanges();
}
public final int getSize() throws MessagingException {
return message.getSize();
}
public final int getLineCount() throws MessagingException {
return message.getLineCount();
}
public final String getContentType() throws MessagingException {
return message.getContentType();
}
public final boolean isMimeType(String s) throws MessagingException {
return message.isMimeType(s);
}
public final String getDisposition() throws MessagingException {
return message.getDisposition();
}
public final void setDisposition(String s) throws MessagingException {
message.setDisposition(s);
}
public final String getDescription() throws MessagingException {
return message.getDescription();
}
public final void setDescription(String s) throws MessagingException {
message.setDescription(s);
}
public final String getFileName() throws MessagingException {
return message.getFileName();
}
public final void setFileName(String s) throws MessagingException {
message.setFileName(s);
}
public final InputStream getInputStream() throws IOException, MessagingException {
return message.getInputStream();
}
public final javax.activation.DataHandler getDataHandler() throws MessagingException {
return message.getDataHandler();
}
public final Object getContent() throws IOException, MessagingException {
return message.getContent();
}
public final void setDataHandler(javax.activation.DataHandler handler) throws MessagingException {
message.setDataHandler(handler);
}
public final void setContent(Object o, String s) throws MessagingException {
message.setContent(o, s);
}
public final void setText(String s) throws MessagingException {
message.setText(s);
}
public final void setContent(Multipart multipart) throws MessagingException {
message.setContent(multipart);
}
public final void writeTo(OutputStream stream) throws IOException, MessagingException {
message.writeTo(stream);
}
public final String[] getHeader(String s) throws MessagingException {
return message.getHeader(s);
}
public final void setHeader(String s, String s1) throws MessagingException {
message.setHeader(s, s1);
}
public final void addHeader(String s, String s1) throws MessagingException {
message.addHeader(s, s1);
}
public final void removeHeader(String s) throws MessagingException {
message.removeHeader(s);
}
public final Enumeration getAllHeaders() throws MessagingException {
return message.getAllHeaders();
}
public final Enumeration getMatchingHeaders(String[] strings) throws MessagingException {
return message.getAllHeaders();
}
public final Enumeration getNonMatchingHeaders(String[] strings) throws MessagingException {
return message.getNonMatchingHeaders(strings);
}
}
--- NEW FILE: ServiceImpl.java ---
package alt.javax.mail;
import javax.mail.MessagingException;
import javax.mail.URLName;
import javax.mail.event.ConnectionListener;
public class ServiceImpl implements Service {
private final javax.mail.Service service;
public ServiceImpl(javax.mail.Service service){
this.service = service;
}
public void connect() throws MessagingException{
service.connect();
}
public void connect(String host, String user, String password)
throws MessagingException{
service.connect(host, user, password);
}
public void connect(String host, int port, String user, String password)
throws MessagingException{
service.connect(host, port, user, password);
}
public boolean isConnected(){
return service.isConnected();
}
public void close() throws MessagingException{
service.close();
}
public URLName getURLName(){
return service.getURLName();
}
public void addConnectionListener(ConnectionListener connectionListener){
service.addConnectionListener(connectionListener);
}
public void removeConnectionListener(ConnectionListener connectionListener){
service.removeConnectionListener(connectionListener);
}
public String toString(){
return service.toString();
}
}
|
|
From: Steve F. <sm...@us...> - 2002-10-14 22:58:31
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/com/mockobjects/helpers
In directory usw-pr-cvs1:/tmp/cvs-serv10355/src/j2ee/1.3/com/mockobjects/helpers
Added Files:
ServletTestHelper.java FilterTestHelper.java
TagTestHelper.java AbstractServletTestHelper.java
Log Message:
moved some j2ee alt and helper classes from
common to 1.3 to avoid compilation failures
--- NEW FILE: ServletTestHelper.java ---
package com.mockobjects.helpers;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import java.io.IOException;
/**
* Sets up mock servlet objects in a common configuration.
* HttpSession is attached to request, RequestDispatcher is connected to HttpSession
* @see com.mockobjects.servlet.MockHttpServletRequest#setSession
* @see com.mockobjects.servlet.MockServletContext#setupGetRequestDispatcher
*/
public class ServletTestHelper extends AbstractServletTestHelper {
private final HttpServlet testSubject;
public ServletTestHelper(HttpServlet testSubject) {
super();
this.testSubject = testSubject;
}
/**
* Calls HttpServlet.init passing it the MockServletConfig
*/
public void testServletInit() throws ServletException {
testSubject.init(servletConfig);
}
/**
* Calls HttpServlet.service passing it the MockHttpServletRequest & MockHttpServletResponse
*/
public void testServlet() throws ServletException, IOException {
testSubject.service(request, response);
}
}
--- NEW FILE: FilterTestHelper.java ---
package com.mockobjects.helpers;
import com.mockobjects.servlet.MockFilterChain;
import com.mockobjects.servlet.MockFilterConfig;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import java.io.IOException;
/**
* $Revision: 1.1 $
*/
public class FilterTestHelper extends AbstractServletTestHelper {
private final Filter filter;
private final MockFilterChain filterChain = new MockFilterChain();
private final MockFilterConfig filterConfig = new MockFilterConfig();
public FilterTestHelper(Filter filter) {
this.filter = filter;
filterConfig.setupGetServletContext(servletContext);
}
public MockFilterChain getFilterChain() {
return filterChain;
}
public MockFilterConfig getFilterConfig() {
return filterConfig;
}
public void testInit() throws ServletException {
filter.init(filterConfig);
}
public void testDoFilter() throws ServletException, IOException {
filter.doFilter(request, response, filterChain);
}
}
--- NEW FILE: TagTestHelper.java ---
package com.mockobjects.helpers;
import com.mockobjects.servlet.MockBodyContent;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import junit.framework.Assert;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTag;
import javax.servlet.jsp.tagext.IterationTag;
import javax.servlet.jsp.tagext.Tag;
/**
* Sets up mock tag objects in a common configuration.
* MockHttpServletRequest, MockServletContext and MockHttpSession are attached to MockPageContext
* @see com.mockobjects.servlet.MockPageContext#setRequest();
* @see com.mockobjects.servlet.MockPageContext#setServletContext();
* @see com.mockobjects.servlet.MockPageContext#setSession();
*/
public class TagTestHelper extends AbstractServletTestHelper {
private final MockPageContext pageContext = new MockPageContext();
private final MockBodyContent bodyContent = new MockBodyContent();
private final MockJspWriter outWriter = new MockJspWriter();
private final MockJspWriter enclosingWriter = new MockJspWriter();
private final Tag testSubject;
private final String getReturnValueName(int returnValue) {
switch (returnValue) {
case BodyTag.EVAL_BODY_INCLUDE:
return "EVAL_BODY_INCLUDE";
case BodyTag.EVAL_PAGE:
return "EVAL_PAGE";
case BodyTag.SKIP_BODY:
return "SKIP_BODY";
case BodyTag.SKIP_PAGE:
return "SKIP_PAGE";
case BodyTag.EVAL_BODY_BUFFERED:
return "EVAL_BODY_BUFFERED|EVAL_BODY_AGAIN";
default:
return "Unknown return value (" + returnValue + ")";
}
}
/**
* @param testSubject The Tag to be tested
*/
public TagTestHelper(Tag testSubject) {
this.testSubject = testSubject;
pageContext.setRequest(getRequest());
pageContext.setServletContext(getServletContext());
pageContext.setSession(getHttpSession());
pageContext.setJspWriter(outWriter);
bodyContent.setupGetEnclosingWriter(enclosingWriter);
}
/**
* @return The writer use when making calls to PageContext.getOut
*/
public MockJspWriter getOutWriter() {
return outWriter;
}
public MockPageContext getPageContext() {
return pageContext;
}
/**
* Assert that the return value of doStartTag is equal to an expectedValue
* @param expectedValue value to check against doStartTag
*/
public void assertDoStartTag(final int expectedValue) throws JspException {
testSubject.setPageContext(pageContext);
checkReturnValue("doStartTag", expectedValue, testSubject.doStartTag());
}
private final void checkReturnValue(final String methodName, final int expectedValue, final int returnValue) {
Assert.assertEquals(methodName + " expected value " + getReturnValueName(expectedValue) +
" but was " + getReturnValueName(returnValue),
expectedValue, returnValue);
}
/**
* Invoke doInitBody on the test subject
*/
public void testDoInitBody() throws JspException {
Assert.assertTrue("Test subject not an instance of BodyTag",
testSubject instanceof BodyTag);
((BodyTag) testSubject).setBodyContent(bodyContent);
((BodyTag) testSubject).doInitBody();
}
/**
* Assert that the return value of doAfterBody is equal to an expectedValue
* @param expectedValue value to check against doAfterBody
*/
public void assertDoAfterBody(int expectedValue) throws JspException {
Assert.assertTrue("Test subject not an instance of BodyTag",
testSubject instanceof IterationTag);
checkReturnValue("doAfterTag", expectedValue, ((IterationTag) testSubject).doAfterBody());
}
/**
* Assert that the return value of doEndTag is equal to an expectedValue
* @param expectedValue value to check against doEndTag
*/
public void assertDoEndTag(int expectedValue) throws JspException {
Assert.assertEquals("doEndTag returned unexpected value" + getReturnValueName(expectedValue),
expectedValue, testSubject.doEndTag());
}
}
--- NEW FILE: AbstractServletTestHelper.java ---
package com.mockobjects.helpers;
import com.mockobjects.servlet.*;
/**
* $Revision: 1.1 $
*/
public abstract class AbstractServletTestHelper {
protected final MockHttpServletRequest request = new MockHttpServletRequest();
protected final MockHttpServletResponse response = new MockHttpServletResponse();
protected final MockHttpSession httpSession = new MockHttpSession();
protected final MockRequestDispatcher requestDispatcher = new MockRequestDispatcher();
protected final MockServletContext servletContext = new MockServletContext();
protected final MockServletConfig servletConfig = new MockServletConfig();
public AbstractServletTestHelper() {
request.setSession(httpSession);
servletContext.setupGetRequestDispatcher(requestDispatcher);
}
public MockHttpServletRequest getRequest() {
return request;
}
public MockHttpSession getHttpSession() {
return httpSession;
}
public MockRequestDispatcher getRequestDispatcher() {
return requestDispatcher;
}
public MockHttpServletResponse getResponse() {
return response;
}
public MockServletContext getServletContext() {
return servletContext;
}
public MockServletConfig getServletConfig() {
return servletConfig;
}
}
|
|
From: Steve F. <sm...@us...> - 2002-10-14 22:58:31
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/alt/javax/mail/internet
In directory usw-pr-cvs1:/tmp/cvs-serv10355/src/j2ee/1.3/alt/javax/mail/internet
Added Files:
MimeMessageImpl.java MimeMessageFactoryImpl.java
Log Message:
moved some j2ee alt and helper classes from
common to 1.3 to avoid compilation failures
--- NEW FILE: MimeMessageImpl.java ---
package alt.javax.mail.internet;
import alt.javax.mail.Message;
import alt.javax.mail.MessageImpl;
import alt.javax.mail.Session;
import javax.mail.Address;
import javax.mail.Flags;
import javax.mail.Folder;
import javax.mail.MessagingException;
import javax.mail.search.SearchTerm;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Enumeration;
public class MimeMessageImpl extends MessageImpl implements MimeMessage {
private final javax.mail.internet.MimeMessage message;
public MimeMessageImpl(Session session) {
super(new javax.mail.internet.MimeMessage(session.getWrappedSession()));
message = (javax.mail.internet.MimeMessage)getRealMessage();
}
public void setRecipient(javax.mail.Message.RecipientType type, Address address) throws MessagingException {
message.setRecipient(type, address);
}
public void addRecipient(javax.mail.Message.RecipientType type, Address address) throws MessagingException {
message.addRecipient(type, address);
}
public void setFlag(Flags.Flag flag, boolean b) throws MessagingException {
message.setFlag(flag, b);
}
public int getMessageNumber() {
return message.getMessageNumber();
}
public Folder getFolder() {
return message.getFolder();
}
public boolean isExpunged() {
return message.isExpunged();
}
public boolean match(SearchTerm term) throws MessagingException {
return message.match(term);
}
public Address[] getAllRecipients() throws MessagingException {
return message.getAllRecipients();
}
public void setRecipients(javax.mail.Message.RecipientType type, String s) throws MessagingException {
message.setRecipients(type, s);
}
public void addRecipients(javax.mail.Message.RecipientType type, String s) throws MessagingException {
message.addRecipients(type, s);
}
public Address[] getReplyTo() throws MessagingException {
return message.getReplyTo();
}
public void setReplyTo(Address[] addresses) throws MessagingException {
message.setReplyTo(addresses);
}
public void setSubject(String s, String s1) throws MessagingException {
message.setSubject(s, s1);
}
public String getEncoding() throws MessagingException {
return message.getEncoding();
}
public String getContentID() throws MessagingException {
return message.getContentID();
}
public void setContentID(String s) throws MessagingException {
message.setContentID(s);
}
public String getContentMD5() throws MessagingException {
return message.getContentMD5();
}
public void setContentMD5(String s) throws MessagingException {
message.setContentMD5(s);
}
public void setDescription(String s, String s1) throws MessagingException {
message.setDescription(s, s1);
}
public String[] getContentLanguage() throws MessagingException {
return message.getContentLanguage();
}
public void setContentLanguage(String[] strings) throws MessagingException {
message.setContentLanguage(strings);
}
public String getMessageID() throws MessagingException {
return message.getMessageID();
}
public InputStream getRawInputStream() throws MessagingException {
return message.getRawInputStream();
}
public void setText(String s, String s1) throws MessagingException {
message.setText(s, s1);
}
public void writeTo(OutputStream stream, String[] strings) throws IOException, MessagingException {
message.writeTo(stream, strings);
}
public String getHeader(String s, String s1) throws MessagingException {
return message.getHeader(s, s1);
}
public void addHeaderLine(String s) throws MessagingException {
message.addHeaderLine(s);
}
public Enumeration getAllHeaderLines() throws MessagingException {
return message.getAllHeaderLines();
}
public Enumeration getMatchingHeaderLines(String[] strings) throws MessagingException {
return message.getMatchingHeaderLines(strings);
}
public Enumeration getNonMatchingHeaderLines(String[] strings) throws MessagingException {
return message.getNonMatchingHeaderLines(strings);
}
public synchronized boolean isSet(Flags.Flag flag) throws MessagingException {
return message.isSet(flag);
}
}
--- NEW FILE: MimeMessageFactoryImpl.java ---
package alt.javax.mail.internet;
import alt.javax.mail.internet.MimeMessage;
import alt.javax.mail.Session;
public class MimeMessageFactoryImpl implements MimeMessageFactory {
public MimeMessage createMimeMessage(Session session){
return new MimeMessageImpl(session);
}
}
|
|
From: Steve F. <sm...@us...> - 2002-10-14 22:57:24
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/com/mockobjects/helpers In directory usw-pr-cvs1:/tmp/cvs-serv10007/src/j2ee/1.3/com/mockobjects/helpers Log Message: Directory /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/com/mockobjects/helpers added to the repository |
|
From: Steve F. <sm...@us...> - 2002-10-14 22:57:05
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/alt/javax/mail/internet In directory usw-pr-cvs1:/tmp/cvs-serv9870/src/j2ee/1.3/alt/javax/mail/internet Log Message: Directory /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/alt/javax/mail/internet added to the repository |
|
From: Steve F. <sm...@us...> - 2002-10-14 22:57:05
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/alt/javax/mail In directory usw-pr-cvs1:/tmp/cvs-serv9870/src/j2ee/1.3/alt/javax/mail Log Message: Directory /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/alt/javax/mail added to the repository |
|
From: Steve F. <sm...@us...> - 2002-10-14 22:57:05
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/alt In directory usw-pr-cvs1:/tmp/cvs-serv9870/src/j2ee/1.3/alt Log Message: Directory /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/alt added to the repository |
|
From: Steve F. <sm...@us...> - 2002-10-14 22:57:05
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/alt/javax In directory usw-pr-cvs1:/tmp/cvs-serv9870/src/j2ee/1.3/alt/javax Log Message: Directory /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/alt/javax added to the repository |
|
From: Steve F. <sm...@us...> - 2002-10-14 22:56:28
|
Update of /cvsroot/mockobjects/mockobjects-java/doc
In directory usw-pr-cvs1:/tmp/cvs-serv9683/doc
Modified Files:
site.xml
Log Message:
more work on automatic update
some reformatting
added a tar target
Index: site.xml
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/doc/site.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- site.xml 17 Sep 2002 14:31:15 -0000 1.6
+++ site.xml 14 Oct 2002 22:56:25 -0000 1.7
@@ -2,10 +2,11 @@
<project name="site" default="site" basedir=".">
<target name="project-properties">
- <property name="project.name" value="mockobjects" />
- <property name="site.name" value="${project.name}-website" />
- <property name="out.dir" value="out" />
- <property name="site.tar" value="${site.name}.tar" />
+ <tstamp />
+ <property name="project.name" value="mockobjects"/>
+ <property name="site.name" value="${project.name}-website"/>
+ <property name="out.dir" value="out"/>
+ <property name="site.tar" value="${site.name}.${DSTAMP}.tar"/>
</target>
<target name="copy-stylesheet">
@@ -13,7 +14,7 @@
</target>
<target name="clean"
- depends="project-properties">
+ depends="project-properties">
<delete quiet="true">
<fileset dir="${out.dir}"/>
<fileset includes="**/*.class"/>
@@ -23,47 +24,53 @@
<target name="add-task">
<javac srcdir="."/>
<taskdef name="template"
- classname="com.mockobjects.doc.SiteTemplate"
- classpath="."/>
+ classname="com.mockobjects.doc.SiteTemplate"
+ classpath="."/>
</target>
<target name="site"
- depends="project-properties, add-task, copy-stylesheet"
- description="Create the output directory and copy templated files over.">
+ depends="project-properties, add-task, copy-stylesheet"
+ description="Create the output directory and copy templated files over.">
<mkdir dir="${out.dir}"/>
- <template
- templatefile="html/template.txt"
- todir="${out.dir}"
- dir="html"
- includes="*.html"/>
+ <template templatefile="html/template.txt"
+ todir="${out.dir}"
+ dir="html"
+ includes="*.html"/>
</target>
<!--
- ========================================================================
- Deploy the web site to SourceForge, using the 'scp'
- command. The variable "username" need to be passed to Ant
- when calling this target and represent your username on SourceForge.
-
- Ex: ant -Dusername=vmassol deploy-site
+ ========================================================================
+ Deploy the web site to SourceForge, using the 'scp'
+ and 'ssh' commands. The variable "username" need to be passed to Ant
+ when calling this target and represent your username on SourceForge.
+
+ Ex: ant -Dusername=vmassol deploy-site
+
+ ========================================================================
+ -->
+ <target name="site.tar"
+ depends="project-properties, site">
+ <tar destfile="${site.tar}"
+ basedir="${out.dir}" />
+ </target>
- ========================================================================
- -->
<target name="deploy-site"
- depends="project-properties"
- if="username"
- description="Deploy the web site to SourceForge (see target for details)">
-
- <property name="deploy.homepage"
- value="/home/groups/m/mo/mockobjects/htdocs"/>
- <property name="deploy.host"
- value="mockobjects.sourceforge.net"/>
-
- <apply dir="." executable="scp" parallel="true" relative="true">
- <srcfile/>
- <arg value="${username}@${deploy.host}:${deploy.homepage}"/>
- <fileset dir="${out.dir}"/>
- </apply>
-
+ depends="project-properties, clean, site, site.tar"
+ if="username"
+ description="Deploy the web site to SourceForge (see target for details)">
+
+ <property name="deploy.target.dir" value="/home/groups/m/mo/mockobjects/htdocs"/>
+ <property name="deploy.host" value="mockobjects.sourceforge.net"/>
+
+ <exec dir="." executable="scp" failonerror="true">
+ <arg value="${site.tar}"/>
+ <arg value="${username}@${deploy.host}:${deploy.target.dir}"/>
+ </exec>
+
+ <exec dir="." executable="ssh" failonerror="true">
+ <arg line="-l ${username} ${deploy.host} 'cd ${deploy.target.dir}; tar xvf ${site.tar}; rm ${site.tar}'"/>
+ </exec>
</target>
+
</project>
|
|
From: Steve F. <st...@m3...> - 2002-10-14 22:46:49
|
> As well as providing a central resource and starting point, bigger > umbrella-like projects have increased commonality, user input and overall > 'clout'. And you get the trust factor too - I'd naturally pay more > attention to something on Jakarta than on a personal geocities homepage. that said, Jakarta is not one single project (is it?). > Bolotics (TM). shouldn't that be spelt "Bollotics"? > The more I think about it, the more sense it makes to keep it all together > and prevent the fragmentation. OK. > p.s. In the mean time I'm carrying on with the commits. You can't stop me - > no you can't! Never!!!! just watch me... S. |
|
From: Joe W. <jo...@tr...> - 2002-10-14 22:16:42
|
As well as providing a central resource and starting point, bigger umbrella-like projects have increased commonality, user input and overall 'clout'. And you get the trust factor too - I'd naturally pay more attention to something on Jakarta than on a personal geocities homepage. Saying that, it's common that larger communities get bogged down in too many standards, leadership disputes, arguments and Bolotics (TM). Thankfully it hasn't happened on MO :). The more I think about it, the more sense it makes to keep it all together and prevent the fragmentation. -Joe p.s. In the mean time I'm carrying on with the commits. You can't stop me - no you can't! Never!!!! At 21:24 14/10/2002 +0100, Steve Freeman wrote: >I'm in 2 minds about this. On the one hand, it would be nice to have >everything in the same place. On the other hand, on sourceforge, the >project seems to be the unit of control, who gets to be a commiter >etc -- so that seems like the right granularity. If anything, there >might be an argument for having mockobjects as a glue project, for >documentation say, and adding a new mockobjects-java. > >Any opinions, anyone? > >S. > > >----- Original Message ----- >From: "Jeff Martin" <je...@mk...> > > Personally I'd rather see dotnetmock move over here. > > > > Not to try and subsume what you're doing but to try and keep the flow >of > > ideas between different implementations going. > > > > It would be nice to present a united front rather than a whole series >of > > small loosely related projects. > > > > > >------------------------------------------------------- >This sf.net email is sponsored by:ThinkGeek >Welcome to geek heaven. >http://thinkgeek.com/sf >_______________________________________________ >Mockobjects-java-dev mailing list >Moc...@li... >https://lists.sourceforge.net/lists/listinfo/mockobjects-java-dev |
|
From: Steve F. <st...@m3...> - 2002-10-14 20:24:17
|
Given that we seem to be going around a loop, very slowly, I have an alternate proposal. I'm still finding it hard to talk about this stuff in the abstract. Simon, how about you come up with cases that you think represent what you want to do. We (collectively) will figure out the best solution for each one. Eventually, we'll either be unable to solve your problem and have to extend things, or we won't. You game? S. |
|
From: Steve F. <st...@m3...> - 2002-10-14 20:24:16
|
I'm in 2 minds about this. On the one hand, it would be nice to have everything in the same place. On the other hand, on sourceforge, the project seems to be the unit of control, who gets to be a commiter etc -- so that seems like the right granularity. If anything, there might be an argument for having mockobjects as a glue project, for documentation say, and adding a new mockobjects-java. Any opinions, anyone? S. ----- Original Message ----- From: "Jeff Martin" <je...@mk...> > Personally I'd rather see dotnetmock move over here. > > Not to try and subsume what you're doing but to try and keep the flow of > ideas between different implementations going. > > It would be nice to present a united front rather than a whole series of > small loosely related projects. |
|
From: Joe W. <joe...@us...> - 2002-10-14 19:30:21
|
Update of /cvsroot/mockobjects/nmock/test/NMock
In directory usw-pr-cvs1:/tmp/cvs-serv26381a/test/NMock
Modified Files:
MockTest.cs
Log Message:
Strict property added to Mock (throws exception if method called with no expectations setup)
Index: MockTest.cs
===================================================================
RCS file: /cvsroot/mockobjects/nmock/test/NMock/MockTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MockTest.cs 14 Oct 2002 19:23:58 -0000 1.5
+++ MockTest.cs 14 Oct 2002 19:30:17 -0000 1.6
@@ -250,5 +250,17 @@
mock.ExpectNoCall("myMethod");
mock.Call("myMethod");
}
+
+ [Test]
+ [ExpectedException(typeof(VerifyException))]
+ public void Strict()
+ {
+ mock.Strict = true;
+ mock.Expect("x");
+ mock.Expect("y");
+ mock.Call("x");
+ mock.Call("y");
+ mock.Call("z");
+ }
}
}
|
|
From: Joe W. <joe...@us...> - 2002-10-14 19:30:21
|
Update of /cvsroot/mockobjects/nmock/src/NMock
In directory usw-pr-cvs1:/tmp/cvs-serv26381a/src/NMock
Modified Files:
IMock.cs Mock.cs
Log Message:
Strict property added to Mock (throws exception if method called with no expectations setup)
Index: IMock.cs
===================================================================
RCS file: /cvsroot/mockobjects/nmock/src/NMock/IMock.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IMock.cs 14 Oct 2002 19:23:57 -0000 1.3
+++ IMock.cs 14 Oct 2002 19:30:15 -0000 1.4
@@ -20,6 +20,12 @@
object Object { get; }
/// <summary>
+ /// If strict, any method called that doesn't have an expectation set
+ /// will fail. (Defaults false)
+ /// </summary>
+ bool Strict { get; set; }
+
+ /// <summary>
/// Expect a method to be called with the supplied parameters.
/// </summary>
void Expect(string methodName, params object[] args);
Index: Mock.cs
===================================================================
RCS file: /cvsroot/mockobjects/nmock/src/NMock/Mock.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Mock.cs 14 Oct 2002 19:23:57 -0000 1.5
+++ Mock.cs 14 Oct 2002 19:30:16 -0000 1.6
@@ -9,6 +9,7 @@
private string name;
private object obj;
+ private bool strict;
private IDictionary expectations;
private IDictionary values;
@@ -31,6 +32,12 @@
set { obj = value; }
}
+ public virtual bool Strict
+ {
+ get { return strict; }
+ set { strict = value; }
+ }
+
public virtual void Verify()
{
foreach (IList list in expectations.Values)
@@ -74,6 +81,10 @@
IList list = (IList) expectations[methodName];
if (list == null)
{
+ if ( strict )
+ {
+ throw new VerifyException(methodName + "() called too many times");
+ }
return null;
}
if (list.Count == 0)
|
|
From: Joe W. <joe...@us...> - 2002-10-14 19:24:03
|
Update of /cvsroot/mockobjects/nmock/src/NMock
In directory usw-pr-cvs1:/tmp/cvs-serv23415/src/NMock
Modified Files:
IMock.cs Mock.cs
Log Message:
ExpectNoCall added
Index: IMock.cs
===================================================================
RCS file: /cvsroot/mockobjects/nmock/src/NMock/IMock.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IMock.cs 6 Oct 2002 22:57:48 -0000 1.2
+++ IMock.cs 14 Oct 2002 19:23:57 -0000 1.3
@@ -25,6 +25,11 @@
void Expect(string methodName, params object[] args);
/// <summary>
+ /// Expect no call to this method.
+ /// </summary>
+ void ExpectNoCall(string methodName);
+
+ /// <summary>
/// Expect a method to be called with the supplied parameters and setup a
/// value to be returned.
/// </summary>
Index: Mock.cs
===================================================================
RCS file: /cvsroot/mockobjects/nmock/src/NMock/Mock.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Mock.cs 14 Oct 2002 19:14:13 -0000 1.4
+++ Mock.cs 14 Oct 2002 19:23:57 -0000 1.5
@@ -44,6 +44,11 @@
ExpectAndReturn(methodName, null, args);
}
+ public virtual void ExpectNoCall(string methodName)
+ {
+ addExpectation(new Expectation(methodName, null, new VerifyException(methodName + "() should never be called."), null));
+ }
+
public virtual void ExpectAndReturn(string methodName, object result, params object[] args)
{
addExpectation(new Expectation(methodName, result, null, args));
@@ -91,7 +96,6 @@
list.Add(e);
}
-
private class Expectation
{
public string MethodName;
@@ -115,7 +119,7 @@
this.e = e;
}
- public object Verify(string methodName, object[] args)
+ public virtual object Verify(string methodName, object[] args)
{
Assertion.AssertEquals(this.MethodName, methodName);
|
|
From: Joe W. <joe...@us...> - 2002-10-14 19:24:03
|
Update of /cvsroot/mockobjects/nmock/test/NMock
In directory usw-pr-cvs1:/tmp/cvs-serv23415/test/NMock
Modified Files:
MockTest.cs
Log Message:
ExpectNoCall added
Index: MockTest.cs
===================================================================
RCS file: /cvsroot/mockobjects/nmock/test/NMock/MockTest.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MockTest.cs 14 Oct 2002 19:14:13 -0000 1.4
+++ MockTest.cs 14 Oct 2002 19:23:58 -0000 1.5
@@ -243,5 +243,12 @@
mock.Call("myMethod");
}
+ [Test]
+ [ExpectedException(typeof(VerifyException))]
+ public void ExpectNoCall()
+ {
+ mock.ExpectNoCall("myMethod");
+ mock.Call("myMethod");
+ }
}
}
|
|
From: Joe W. <joe...@us...> - 2002-10-14 19:14:20
|
Update of /cvsroot/mockobjects/nmock/src/NMock
In directory usw-pr-cvs1:/tmp/cvs-serv19252a/src/NMock
Modified Files:
Mock.cs
Log Message:
Expectations now setup on per method basis rather than per mock
Index: Mock.cs
===================================================================
RCS file: /cvsroot/mockobjects/nmock/src/NMock/Mock.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Mock.cs 14 Oct 2002 18:43:29 -0000 1.3
+++ Mock.cs 14 Oct 2002 19:14:13 -0000 1.4
@@ -7,18 +7,16 @@
public class Mock : IMock
{
- private int currentExpectation;
private string name;
private object obj;
- private IList expectations;
+ private IDictionary expectations;
private IDictionary values;
public Mock(string name)
{
this.name = name;
- expectations = new ArrayList();
+ expectations = new Hashtable();
values = new Hashtable();
- currentExpectation = 0;
}
public virtual string Name
@@ -35,7 +33,10 @@
public virtual void Verify()
{
- Assertion.AssertEquals(currentExpectation, expectations.Count);
+ foreach (IList list in expectations.Values)
+ {
+ Assertion.AssertEquals(0, list.Count);
+ }
}
public virtual void Expect(string methodName, params object[] args)
@@ -45,12 +46,12 @@
public virtual void ExpectAndReturn(string methodName, object result, params object[] args)
{
- expectations.Add(new Expectation(methodName, result, null, args));
+ addExpectation(new Expectation(methodName, result, null, args));
}
public virtual void ExpectAndThrow(string methodName, Exception e, params object[] args)
{
- expectations.Add(new Expectation(methodName, null, e, args));
+ addExpectation(new Expectation(methodName, null, e, args));
}
public virtual void SetValue(string methodName, object returnVal)
@@ -64,25 +65,43 @@
{
return values[methodName];
}
- if (currentExpectation == expectations.Count)
+
+ IList list = (IList) expectations[methodName];
+ if (list == null)
+ {
+ return null;
+ }
+ if (list.Count == 0)
{
Assertion.Fail(methodName + "() called too many times");
}
- Expectation exp = (Expectation)expectations[currentExpectation];
- currentExpectation++;
- return exp.Verify(methodName, args);
+ Expectation e = (Expectation)list[0];
+ list.RemoveAt(0);
+ return e.Verify(methodName, args);
}
+ private void addExpectation(Expectation e)
+ {
+ IList list = (IList) expectations[e.MethodName];
+ if (list == null)
+ {
+ list = new ArrayList();
+ expectations[e.MethodName] = list;
+ }
+ list.Add(e);
+ }
+
+
private class Expectation
{
- private string methodName;
+ public string MethodName;
private object[] args;
private object returnValue;
private Exception e;
public Expectation(string methodName, object returnValue, Exception e, object[] args)
{
- this.methodName = methodName;
+ this.MethodName = methodName;
if (args == null)
{
this.args = new object[0];
@@ -98,7 +117,7 @@
public object Verify(string methodName, object[] args)
{
- Assertion.AssertEquals(this.methodName, methodName);
+ Assertion.AssertEquals(this.MethodName, methodName);
// assert that each passed in arg is validated by the appropriate predicate.
for (int i = 0; i < this.args.Length; i++)
|
39 messages has been excluded from this view by a project administrator.
