From 2bcbad392bc32bad1d90bb4b4d9634bf7b014116 Mon Sep 17 00:00:00 2001
From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Fri, 28 Oct 2011 13:33:12 +0000
Subject: [PATCH] upgrading junit to 4.7 & adding jBenchmark dependency

---
 cdmlib-io/pom.xml                             | 70 ++++++++++---------
 .../cdm/io/sdd/in/SDDImportTest.java          | 64 ++++++++---------
 pom.xml                                       |  1 +
 3 files changed, 71 insertions(+), 64 deletions(-)

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