You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by pc...@apache.org on 2004/10/13 08:31:32 UTC
cvs commit: xml-xmlbeans/v2/jam/test/tests/src_150/org/apache/xmlbeans/test/jam JamTestBase_150.java ReflectJamTest_150.java
pcal 2004/10/12 23:31:32
Modified: v2/jam/test build.xml
v2/jam/test/tests/src/org/apache/xmlbeans/test/jam
JamTestBase.java
v2/jam/test/tests/src_150/org/apache/xmlbeans/test/jam
JamTestBase_150.java ReflectJamTest_150.java
Removed: v2/jam/test dummy.jar
Log:
jam: test fixes
Revision Changes Path
1.17 +3 -6 xml-xmlbeans/v2/jam/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/test/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 13 Oct 2004 05:10:35 -0000 1.16
+++ build.xml 13 Oct 2004 06:31:32 -0000 1.17
@@ -127,14 +127,11 @@
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"
classpathref='classpath'/>
- <property name='sources_test' value='org.apache.xmlbeans.test.jam.SourcesJamTest'/>
- <property name='reflect_test' value='org.apache.xmlbeans.test.jam.ReflectJamTest'/>
- <condition property='sources_test' value='${sources_test}_150'>
- <isset property='do15compile'/>
- </condition>
- <condition property='reflect_test' value='${reflect_test}_150'>
+ <condition property='suffix' value='_150'>
<isset property='do15compile'/>
</condition>
+ <property name='sources_test' value='org.apache.xmlbeans.test.jam.SourcesJamTest${suffix}'/>
+ <property name='reflect_test' value='org.apache.xmlbeans.test.jam.ReflectJamTest${suffix}'/>
<!-- why do these have to be separate? something gets
1.2 +19 -5 xml-xmlbeans/v2/jam/test/tests/src/org/apache/xmlbeans/test/jam/JamTestBase.java
Index: JamTestBase.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/test/tests/src/org/apache/xmlbeans/test/jam/JamTestBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JamTestBase.java 13 Oct 2004 05:01:36 -0000 1.1
+++ JamTestBase.java 13 Oct 2004 06:31:32 -0000 1.2
@@ -297,7 +297,6 @@
inners[0].getClasses().length == 0);
}
-
public void testAllClassesAvailable() {
JClass[] classes = mResult.getAllClasses();
List classNames = new ArrayList(classes.length);
@@ -312,10 +311,25 @@
//System.out.println("found:");
//for(int i=0; i<classNames.size(); i++) System.out.println(classNames.get(i).toString());
}
- assertTrue("result does not contain all expected classes",
- classNames.containsAll(expected));
- assertTrue("result contains more than expected classes",
- expected.containsAll(classNames));
+
+ if (!classNames.containsAll(expected)) {
+ expected.removeAll(classNames);
+ System.out.println("Missing classes are: ");
+ for(Iterator i = expected.iterator(); i.hasNext(); ) {
+ System.out.println(" "+i.next());
+ }
+ assertTrue("result does not contain all expected classes",
+ false);
+ }
+ if (!expected.containsAll(classNames)) {
+ classNames.removeAll(expected);
+ System.out.println("Extra classes are: ");
+ for(Iterator i = classNames.iterator(); i.hasNext(); ) {
+ System.out.println(" "+i.next());
+ }
+ assertTrue("result contains more than expected classes",
+ false);
+ }
}
public void testAnnotationUrlValues() {
1.2 +6 -2 xml-xmlbeans/v2/jam/test/tests/src_150/org/apache/xmlbeans/test/jam/JamTestBase_150.java
Index: JamTestBase_150.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/test/tests/src_150/org/apache/xmlbeans/test/jam/JamTestBase_150.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JamTestBase_150.java 13 Oct 2004 04:42:07 -0000 1.1
+++ JamTestBase_150.java 13 Oct 2004 06:31:32 -0000 1.2
@@ -59,6 +59,7 @@
import javax.xml.stream.XMLStreamException;
import java.io.IOException;
+import java.io.File;
import java.util.*;
import org.apache.xmlbeans.test.jam.cases.jsr175.RFEAnnotation;
@@ -127,8 +128,8 @@
*/
public void testIsEnum() {
- JClass gts = mLoader.loadClass(DUMMY+".MyEnum");
- assertTrue(gts.getQualifiedName()+".isEnumType() must be true",
+ JClass gts = resolved(mLoader.loadClass(DUMMY+".MyEnum"));
+ assertTrue(gts.getQualifiedName()+" - isEnumType() must be true",
gts.isEnumType() == true);
}
@@ -284,5 +285,8 @@
super.addAllKnownClasses(c);
}
+ protected File[] getCasesSourcepath() {
+ return new File[] {new File("cases/src"), new File("cases/src_150")};
+ }
}
1.2 +9 -2 xml-xmlbeans/v2/jam/test/tests/src_150/org/apache/xmlbeans/test/jam/ReflectJamTest_150.java
Index: ReflectJamTest_150.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/test/tests/src_150/org/apache/xmlbeans/test/jam/ReflectJamTest_150.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReflectJamTest_150.java 13 Oct 2004 04:42:07 -0000 1.1
+++ ReflectJamTest_150.java 13 Oct 2004 06:31:32 -0000 1.2
@@ -74,7 +74,7 @@
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public class ReflectJamTest_150 extends JamTestBase {
+public class ReflectJamTest_150 extends JamTestBase_150 {
// ========================================================================
// Constructors
@@ -119,8 +119,15 @@
// ========================================================================
// Reflection-specific test methods
+ // ========================================================================
+ // Reflection-specific test methods
+
+//FIXME please move this up into base class
+
+ private static final String EXTJAR_JAR = "../../build/jam/test/extjar.jar";
+
public void testClassLoaderWrapper() throws MalformedURLException {
- File aJarNotInTheClasspath = new File("dummy.jar");
+ File aJarNotInTheClasspath = new File(EXTJAR_JAR);
assertTrue(aJarNotInTheClasspath.getAbsolutePath()+" does not exist",
aJarNotInTheClasspath.exists());
URL url = aJarNotInTheClasspath.toURL();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org