upgrading junit to 4.7 & adding jBenchmark dependency

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index c07ee7571cd0ea513441094c1c793e31589df779..8f66a5797c8e6aeb26a60312973cf08100caaef5 100644 (file)
--- a/cdmlib-io/pom.xml
+++ b/cdmlib-io/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <!-- 
+  <!--
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
    -->
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
     <version>3.0.9-SNAPSHOT</version>
-       <relativePath>../pom.xml</relativePath>
+  <relativePath>../pom.xml</relativePath>
   </parent>
-  
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-io</artifactId>
   <name>CDM Import/Export</name>
@@ -34,23 +34,23 @@
       </plugin>
     </plugins>
   </build>
-  <dependencies>   
+  <dependencies>
   <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>cdmlib-persistence</artifactId>
-               <type>test-jar</type>
-               <scope>test</scope> 
-               <version>${project.version}</version>
-       </dependency>
-       <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>cdmlib-services</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>cdmlib-ext</artifactId>
-       </dependency>
-       <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-persistence</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+      <version>${project.version}</version>
+    </dependency>
+     <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-services</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-ext</artifactId>
+    </dependency>
+    <dependency>
         <groupId>org.unitils</groupId>
         <artifactId>unitils</artifactId>
     </dependency>
@@ -58,24 +58,30 @@
       <groupId>org.dbunit</groupId>
       <artifactId>dbunit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.carrotsearch</groupId>
+      <artifactId>junit-benchmarks</artifactId>
+      <version>0.3.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.apache.poi</groupId>
-               <artifactId>poi</artifactId>
-       </dependency>
-       <dependency>
+    </dependency>
+    <dependency>
+    <groupId>org.apache.poi</groupId>
+    <artifactId>poi</artifactId>
+  </dependency>
+  <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>org.springframework.oxm</artifactId>
     </dependency>
-       <dependency>
-               <groupId>com.yourkit</groupId>
-               <artifactId>yjp-controller-api-redist</artifactId>
-               <version>8.0.1</version>
-       </dependency>
-        <dependency>
+  <dependency>
+    <groupId>com.yourkit</groupId>
+    <artifactId>yjp-controller-api-redist</artifactId>
+    <version>8.0.1</version>
+  </dependency>
+   <dependency>
        <groupId>org.springframework.ws</groupId>
        <artifactId>spring-xml</artifactId>
        <version>1.5.6</version>
@@ -92,7 +98,7 @@
            <groupId>org.springframework</groupId>
            <artifactId>spring-beans</artifactId>
          </exclusion>
-       </exclusions>       
+       </exclusions>
      </dependency>
   </dependencies>
 </project>

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/in/SDDImportTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/in/SDDImportTest.java
index 361c3515c9be7ab7f1bca6407c9b5a1f1d757e8a..8c5ab09cd38aece58d93711feecb0fb165c8776d 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/in/SDDImportTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/in/SDDImportTest.java
@@ -1,8 +1,8 @@
 /**\r
 * Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
@@ -31,36 +31,36 @@ import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
  * @version 1.0\r
  */\r
 \r
-@Ignore // we ignore this test at the moment because it does not run with maven\r
+//@Ignore // we ignore this test at the moment because it does not run with maven\r
 public class SDDImportTest extends CdmTransactionalIntegrationTest {\r
-       \r
-       @SpringBeanByType\r
-       SDDImport sddImport;\r
-       \r
-       @SpringBeanByType\r
-       INameService nameService;\r
-       \r
-       private SDDImportConfigurator configurator;\r
-       \r
-       @Before\r
-       public void setUp() throws URISyntaxException {\r
-               URL url = this.getClass().getResource("/eu/etaxonomy/cdm/io/sdd/SDDImportTest-input.xml");\r
-               Assert.assertNotNull(url);\r
-               configurator = SDDImportConfigurator.NewInstance(url.toURI(), null);\r
-       }\r
-       \r
-       @Test\r
-       public void testInit() {\r
-               assertNotNull("sddImport should not be null", sddImport);\r
-               assertNotNull("nameService should not be null", nameService);\r
-       }\r
-       \r
-       @Test\r
-       public void testDoInvoke() {\r
-               sddImport.doInvoke(new SDDImportState(configurator));\r
-               this.setComplete();\r
-               this.endTransaction();\r
-               assertEquals("Number of TaxonNames should be 1", 1, nameService.count(null));\r
-       }\r
+\r
+    @SpringBeanByType\r
+    SDDImport sddImport;\r
+\r
+    @SpringBeanByType\r
+    INameService nameService;\r
+\r
+    private SDDImportConfigurator configurator;\r
+\r
+    @Before\r
+    public void setUp() throws URISyntaxException {\r
+        URL url = this.getClass().getResource("/eu/etaxonomy/cdm/io/sdd/SDDImportTest-input.xml");\r
+        Assert.assertNotNull(url);\r
+        configurator = SDDImportConfigurator.NewInstance(url.toURI(), null);\r
+    }\r
+\r
+    @Test\r
+    public void testInit() {\r
+        assertNotNull("sddImport should not be null", sddImport);\r
+        assertNotNull("nameService should not be null", nameService);\r
+    }\r
+\r
+    @Test\r
+    public void testDoInvoke() {\r
+        sddImport.doInvoke(new SDDImportState(configurator));\r
+        this.setComplete();\r
+        this.endTransaction();\r
+        assertEquals("Number of TaxonNames should be 1", 1, nameService.count(null));\r
+    }\r
 \r
 }\r

diff --git a/pom.xml b/pom.xml
index 719ea75b10aadad0c1fb53a355f29396cb498094..847dcfc5c2203ad48af69649c40b926baba235a5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -585,6 +585,7 @@
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
+      <version>4.7</version>
                </dependency>
                <dependency>
                        <groupId>log4j</groupId>