aslom 2004/12/22 23:13:11
Modified: java build.xml
java/test/providers ProvidersInitialisationTest.java
java/test/util WSIFTestRunner.java
java/test/zipcode ZIPCodeTest.java
Log:
resolving compilation problem for junit target
still very long way to run actually unit tests ...
Revision Changes Path
1.39 +7 -6 ws-wsif/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-wsif/java/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.xml 12 Oct 2004 21:34:34 -0000 1.38
+++ build.xml 23 Dec 2004 07:13:10 -0000 1.39
@@ -48,14 +48,14 @@
<property name="name" value="wsif"/>
<property name="dynamic.name" value="wsif-dynamic"/>
<property name="Name" value="wsif"/>
- <property name="wsif.version" value="2.0.1_IB2"/>
+ <property name="wsif.version" value="2.0.1_IB3"/>
<property name="year-from" value="2002"/>
<property name="year-to" value="2004"/>
<property name="version.postfix" value="-${wsif.version}"/>
<property name="javadoc.title" value="${Name}"/>
- <property name="build.compiler" value="classic"/>
- <property name="debug" value="off"/>
+ <property name="build.compiler" value="modern"/>
+ <property name="debug" value="on"/>
<property name="src.dir" value="./src"/>
<property name="samples.dir" value="./samples"/>
@@ -156,7 +156,7 @@
For more details see lib/README.html</fail>
<available property="activation.present"
classname="javax.activation.DataHandler" classpathref="project.classpath" />
- <fail unless="activation.present">Warning: Java Acticvation is required
+ <fail unless="activation.present">Warning: Java Activation is required
Put J2EE or Java Activation JAR in lib directory and for more details
see lib/README.html</fail>
<available property="commons.logging.present"
classname="org.apache.commons.logging.Log" classpathref="project.classpath" />
@@ -242,8 +242,8 @@
<patternset id="samples.source.files">
<include name="**/*.java"/>
- <exclude name="**/zipcode/**.java" unless="apachesoap.present"/>
<exclude name="ejb/**/*.java" unless="ejb.present"/>
+ <!--exclude name="**/zipcode/*.java" unless="apachesoap.present"/-->
<exclude name="clients/zipcode/**/*.java"/> <!-- until this sample is
migrated -->
<exclude name="clients/stockquote/**/*.java"/> <!-- until this sample
is migrated -->
<exclude name="jca/**"/>
@@ -253,6 +253,7 @@
<include name="**/*.java"/>
<exclude name="shop/**/*.java" unless="ejb.present"/>
<exclude name="multiout/**/*.java" unless="ejb.present"/>
+ <exclude name="**/zipcode/**/*.java" /> <!-- until this sample is
migrated -->
</patternset>
<patternset id="j2c.source.files">
@@ -419,7 +420,7 @@
<!-- ===================================================================
-->
<!-- Compiles unit tests
-->
<!-- ===================================================================
-->
- <target name="tests" depends="dynamic,samples,checkJUnit"
if="junit.present">
+ <target name="tests" depends="prepare,dynamic,samples,checkJUnit"
if="junit.present">
<mkdir dir="${build.tests}"/>
<javac srcdir="test" destdir="${build.tests}"
classpath="${dynamic.dest}:${build.samples}" debug="${debug}">
1.6 +4 -3
ws-wsif/java/test/providers/ProvidersInitialisationTest.java
Index: ProvidersInitialisationTest.java
===================================================================
RCS file:
/home/cvs/ws-wsif/java/test/providers/ProvidersInitialisationTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProvidersInitialisationTest.java 1 Mar 2004 23:53:23 -0000 1.5
+++ ProvidersInitialisationTest.java 23 Dec 2004 07:13:11 -0000 1.6
@@ -1,12 +1,12 @@
/*
* Copyright 2002-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -80,3 +80,4 @@
}
}
}
+
1.35 +16 -20 ws-wsif/java/test/util/WSIFTestRunner.java
Index: WSIFTestRunner.java
===================================================================
RCS file: /home/cvs/ws-wsif/java/test/util/WSIFTestRunner.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- WSIFTestRunner.java 1 Mar 2004 23:53:24 -0000 1.34
+++ WSIFTestRunner.java 23 Dec 2004 07:13:11 -0000 1.35
@@ -1,12 +1,12 @@
/*
* Copyright 2002-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,6 +24,12 @@
package util;
+import addressbook.AddressBookTest;
+import async.AsyncTests;
+import chartype.CharTest;
+import docStyle.MessagingAttachmentsTest;
+import docStyle.NWBankTest;
+import docStyle.ZipCodeAxisTest;
import faults.FaultMsgTest;
import features.FeaturesTest;
import headers.HeadersTest;
@@ -31,13 +37,11 @@
import interop.InteropDocTest;
import interop.InteropDocWrappedTest;
import invocation.DynamicInvokerTest;
-
import jms.JmsFaultTest;
import jms.JmsTest;
import jndi.JNDIAddressBookTest;
import junit.framework.Test;
import junit.framework.TestSuite;
-
import mime.MimeTest;
import providers.PlugableProvidersTest;
import providers.ProvidersInitialisationTest;
@@ -49,14 +53,6 @@
import soapinterop.InteropTest;
import stockquote.StockquoteTest;
import wsdl.WsdlLoadingTest;
-import zipcode.ZIPCodeTest;
-
-import addressbook.AddressBookTest;
-import async.AsyncTests;
-import chartype.CharTest;
-import docStyle.MessagingAttachmentsTest;
-import docStyle.NWBankTest;
-import docStyle.ZipCodeAxisTest;
/**
* Run JUnit tests on WSIF code.
@@ -69,7 +65,7 @@
public class WSIFTestRunner {
public static void main(String[] args) {
- TestUtilities.startListeners();
+ TestUtilities.startListeners();
junit.textui.TestRunner.run(suite());
TestUtilities.stopListeners();
}
@@ -94,7 +90,7 @@
suite.addTest(new TestSuite(WsdlLoadingTest.class));
suite.addTest(new TestSuite(InoutTest.class));
suite.addTest(new TestSuite(DynamicInvokerTest.class));
- suite.addTest(new TestSuite(ZIPCodeTest.class));
+ //suite.addTest(new TestSuite(ZIPCodeTest.class));
suite.addTest(new TestSuite(InteropTest.class));
suite.addTest(new TestSuite(JNDIAddressBookTest.class));
suite.addTest(new TestSuite(PlugableProvidersTest.class));
@@ -123,10 +119,10 @@
}
public static void addIfAvaliable(TestSuite suite, String className) {
- try {
- Class klass = Class.forName(className);
- suite.addTest(new TestSuite(klass));
- } catch(Exception ex) {
- }
+ try {
+ Class klass = Class.forName(className);
+ suite.addTest(new TestSuite(klass));
+ } catch(Exception ex) {
+ }
}
}
1.7 +7 -7 ws-wsif/java/test/zipcode/ZIPCodeTest.java
Index: ZIPCodeTest.java
===================================================================
RCS file: /home/cvs/ws-wsif/java/test/zipcode/ZIPCodeTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ZIPCodeTest.java 1 Mar 2004 23:53:24 -0000 1.6
+++ ZIPCodeTest.java 23 Dec 2004 07:13:11 -0000 1.7
@@ -1,12 +1,12 @@
/*
* Copyright 2002-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,10 +37,10 @@
/**
* Zip code test to test out document style. Only
- * supports Soap and SoapJms. Axis and AxisJms are
- * not tested since this support has not yet been
+ * supports Soap and SoapJms. Axis and AxisJms are
+ * not tested since this support has not yet been
* implemented.
- *
+ *
* @author Mark Whitlock
*/
public class ZIPCodeTest extends TestCase {
@@ -63,7 +63,7 @@
}
// This should test Axis and AxisJms but these haven't been implemented
yet.
- // I have commented out the SoapJms test because it doesn't work and I
+ // I have commented out the SoapJms test because it doesn't work and I
// haven't debugged it yet. I think it may be a bug in the
JMS2HTTPBridge.
public void testZipCodeSoap() {
doit("ZipCodeResolverSoap");
