[pkg-java] r9282 - trunk/jmock/debian/patches

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-14 10:55:52 +0000 (Tue, 14 Jul 2009)
New Revision: 9282

Modified:
   trunk/jmock/debian/patches/build.patch
   trunk/jmock/debian/patches/code.patch
Log:
* Update patch

Modified: trunk/jmock/debian/patches/build.patch
===================================================================
--- trunk/jmock/debian/patches/build.patch	2009-07-14 09:57:44 UTC (rev 9281)
+++ trunk/jmock/debian/patches/build.patch	2009-07-14 10:55:52 UTC (rev 9282)
@@ -1,8 +1,8 @@
 --- a/build.xml
 +++ b/build.xml
 @@ -1,5 +1,16 @@
--<project default="jars">
--    <property file="build.properties"/>
+-<project default="jars">
+-    <property file="build.properties"/>
 +<project default="jars">
 +    <property name="build.javadoc.subdir" value="javadoc"/>
 +
@@ -16,32 +16,32 @@
 +    </target>
 +
 +    <property file="build.properties"/>
- 
-     <property name="lib.dir" value="lib"/>
-     <property name="examples.dir" value="examples"/>
-@@ -80,7 +91,7 @@
-     <target name="core.test.unit" depends="core.compile">
-         <!-- Must add lib/junit.jar to the CLASSPATH to run this task -->
-         <mkdir dir="${report.test.unit.dir}"/>
--        <junit printsummary="no" haltonfailure="true" haltonerror="true" fork="true">
-+        <junit printsummary="on" haltonfailure="true" haltonerror="true" fork="true">
-             <classpath>
-                 <fileset dir="${lib.dir}"/>
-                 <pathelement path="${core.build.dir}"/>
-             </classpath>
-             <formatter type="plain"/>
-             <batchtest todir="${report.test.unit.dir}">
--                <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*"/>
-+                <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*,**/InvocationMockerTest.java"/>
-             </batchtest>
-         </junit>
-     </target>
+ 
+     <property name="lib.dir" value="lib"/>
+     <property name="examples.dir" value="examples"/>
+@@ -80,14 +91,14 @@
+     <target name="core.test.unit" depends="core.compile">
+         <!-- Must add lib/junit.jar to the CLASSPATH to run this task -->
+         <mkdir dir="${report.test.unit.dir}"/>
+-        <junit printsummary="no" haltonfailure="true" haltonerror="true" fork="true">
++        <junit printsummary="on" haltonfailure="true" haltonerror="true" fork="true">
+             <classpath>
+                 <fileset dir="${lib.dir}"/>
+                 <pathelement path="${core.build.dir}"/>
+             </classpath>
+             <formatter type="plain"/>
+             <batchtest todir="${report.test.unit.dir}">
+-                <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*"/>
++                <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*,**/InvocationMockerTest.java"/>
+             </batchtest>
+         </junit>
+     </target>
 @@ -102,7 +113,7 @@
-             </classpath>
-             <formatter type="plain"/>
-             <batchtest fork="no" todir="${report.test.acceptance.dir}">
--                <fileset dir="${core.atest.dir}" includes="atest/**/*Test.java" excludes="test/**/Abstract*"/>
+             </classpath>
+             <formatter type="plain"/>
+             <batchtest fork="no" todir="${report.test.acceptance.dir}">
+-                <fileset dir="${core.atest.dir}" includes="atest/**/*Test.java" excludes="test/**/Abstract*"/>
 +                 <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*,**/DefaultResultStubTest.java,**/ThrowStubTest.java"/>
-             </batchtest>
-         </junit>
-     </target>
+             </batchtest>
+         </junit>
+     </target>

Modified: trunk/jmock/debian/patches/code.patch
===================================================================
--- trunk/jmock/debian/patches/code.patch	2009-07-14 09:57:44 UTC (rev 9281)
+++ trunk/jmock/debian/patches/code.patch	2009-07-14 10:55:52 UTC (rev 9282)
@@ -1,31 +1,31 @@
 --- a/core/src/test/jmock/core/testsupport/MethodFactory.java
 +++ b/core/src/test/jmock/core/testsupport/MethodFactory.java
 @@ -27,12 +27,13 @@
-         {
-             protected Class findClass( String interfaceName ) {
-                 ClassWriter writer = new ClassWriter(true);
--
--                writer.visit(Constants.ACC_PUBLIC | Constants.ACC_INTERFACE,
+         {
+             protected Class findClass( String interfaceName ) {
+                 ClassWriter writer = new ClassWriter(true);
+-
+-                writer.visit(Constants.ACC_PUBLIC | Constants.ACC_INTERFACE,
 +
 +				// update for asm 1.5
-+                writer.visit(Constants.ACC_PUBLIC, Constants.ACC_INTERFACE,
-                              nameToClassFormat(interfaceName),
-                              "java/lang/Object",
--                             null, /* interfaces */
--                             null  /* source file */);
-+                             new String[0], /* interfaces */
-+                             (String)null  /* source file */);
- 
-                 writer.visitMethod(Constants.ACC_PUBLIC | Constants.ACC_ABSTRACT,
-                                    methodName,
++                writer.visit(Constants.ACC_PUBLIC, Constants.ACC_INTERFACE,
+                              nameToClassFormat(interfaceName),
+                              "java/lang/Object",
+-                             null, /* interfaces */
+-                             null  /* source file */);
++                             new String[0], /* interfaces */
++                             (String)null  /* source file */);
+ 
+                 writer.visitMethod(Constants.ACC_PUBLIC | Constants.ACC_ABSTRACT,
+                                    methodName,
 --- a/core/src/org/jmock/expectation/AssertMo.java
 +++ b/core/src/org/jmock/expectation/AssertMo.java
 @@ -73,7 +73,7 @@
-         assertTrue("Should not have verified", threwException);
-     }
- 
--    static protected void failNotEquals( String message,
-+    public static void failNotEquals( String message,
-                                          Object expected,
-                                          Object actual ) {
-         String formatted = "";
+         assertTrue("Should not have verified", threwException);
+     }
+ 
+-    static protected void failNotEquals( String message,
++    public static void failNotEquals( String message,
+                                          Object expected,
+                                          Object actual ) {
+         String formatted = "";