svn commit: r783623 - in /servicemix/smx4/features/trunk/camel/servicemix-camel: ./ src/test/java/org/apache/servicemix/camel/nmr/ src/test/java/org/apache/servicemix/samples/wsdl_first/

[ff...@apache.org]

Author: ffang
Date: Thu Jun 11 04:02:47 2009
New Revision: 783623

URL: http://svn.apache.org/viewvc?rev=783623&view=rev
Log:
[SMX4-301]Improve test coverage :: SMX4 :: servicemix-camel

Added:
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/PersonImpl.java
      - copied, changed from r783166, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
Removed:
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/samples/wsdl_first/
Modified:
    servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=783623&r1=783622&r2=783623&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Thu Jun 11 04:02:47 2009
@@ -207,7 +207,7 @@
                         <id>generate-test-sources</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                                <sourceRoot>${basedir}/target/generated</sourceRoot>
+                                <sourceRoot>${basedir}/target/generated/test/java</sourceRoot>
                                 <wsdlOptions>
                                         <wsdlOption>
                                                 <wsdl>${basedir}/src/test/resources/person.wsdl</wsdl>
@@ -223,6 +223,18 @@
                 </execution>
         </executions>
       </plugin>
+      <!-- exclude generated class from cxf-codegen-plugin -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <configuration>
+          <instrumentation>
+            <excludes>
+              <exclude>org/apache/servicemix/samples/wsdl_first/*.class</exclude>
+            </excludes>
+          </instrumentation>
+        </configuration>
+      </plugin>
          </plugins>
     </build>
 

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java?rev=783623&r1=783622&r2=783623&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java Thu Jun 11 04:02:47 2009
@@ -30,7 +30,6 @@
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.servicemix.samples.wsdl_first.Person;
-import org.apache.servicemix.samples.wsdl_first.PersonImpl;
 import org.apache.servicemix.samples.wsdl_first.PersonService;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/PersonImpl.java (from r783166, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/PersonImpl.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/PersonImpl.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java&r1=783166&r2=783623&rev=783623&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/PersonImpl.java Thu Jun 11 04:02:47 2009
@@ -14,11 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.samples.wsdl_first;
+package org.apache.servicemix.camel.nmr;
 
 import javax.jws.WebService;
 import javax.xml.ws.Holder;
 
+import org.apache.servicemix.samples.wsdl_first.Person;
+import org.apache.servicemix.samples.wsdl_first.UnknownPersonFault;
+
 @WebService(serviceName = "PersonService",
         targetNamespace = "http://servicemix.apache.org/samples/wsdl-first",
         endpointInterface = "org.apache.servicemix.samples.wsdl_first.Person")