merge validation2 and model 3.5 into trunk

[cdmlib.git] / cdmlib-services / src / test / java / eu / etaxonomy / cdm / api / service / CommonServiceImplTest.java

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/CommonServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/CommonServiceImplTest.java
index a81dcdf51d4e842d75f1eb04ac12d8bb1c36e4cf..1ddf2d3f934b8ee63d714c869fd0fba361933360 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/CommonServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/CommonServiceImplTest.java
@@ -15,9 +15,8 @@ import java.io.FileNotFoundException;
 import java.util.Set;\r
 import java.util.UUID;\r
 \r
-import org.junit.Assert;\r
-\r
 import org.apache.log4j.Logger;\r
+import org.junit.Assert;\r
 import org.junit.Ignore;\r
 import org.junit.Test;\r
 import org.unitils.dbunit.annotation.DataSet;\r
@@ -168,6 +167,6 @@ public class CommonServiceImplTest extends CdmIntegrationTest {
     @Override\r
     public void createTestDataSet() throws FileNotFoundException {\r
         // TODO Auto-generated method stub\r
-        \r
+\r
     }\r
 }\r