Changeset 1603

Timestamp:

10/31/11 10:50:39 (13 years ago)

Author:

twagoo

Message:

Renamed ComponentRegistryDatabase? in test packages to ComponentRegistryTestDatabase? for clarity

Location:

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry

Files:

• impl/database/AdminRegistryTest.java (modified) (1 diff)
• impl/database/ComponentDescriptionDaoTest.java (modified) (1 diff)
• impl/database/ComponentRegistryDbImplTest.java (modified) (1 diff)
• impl/database/ComponentRegistryFactoryDbImplTest.java (modified) (1 diff)
• impl/database/ComponentRegistryTestDatabase.java (moved) (moved from ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDatabase.java) (1 diff)
• impl/database/ProfileDescriptionDaoTest.java (modified) (1 diff)
• impl/database/UserDaoTest.java (modified) (1 diff)
• rest/ComponentRegistryRestServiceTest.java (modified) (2 diffs)
• rest/ConcurrentRestServiceTest.java (modified) (2 diffs)
• rest/MDValidatorTest.java (modified) (2 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/AdminRegistryTest.java

@@ -43 +43 @@
     @Before
     public void init() {
-        ComponentRegistryDatabase.resetAndCreateAllTables(jdbcTemplate);
+        ComponentRegistryTestDatabase.resetAndCreateAllTables(jdbcTemplate);
     }
 

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentDescriptionDaoTest.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.impl.database;
 
-import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase.*;
+import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryTestDatabase.*;
 import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.model.ComponentDescription;

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java

@@ -47 +47 @@
     @Before
     public void init() {
-        ComponentRegistryDatabase.resetAndCreateAllTables(jdbcTemplate);
+        ComponentRegistryTestDatabase.resetAndCreateAllTables(jdbcTemplate);
     }
 

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImplTest.java

@@ -33 +33 @@
     @Before
     public void init() {
-        ComponentRegistryDatabase.resetDatabase(jdbcTemplate);
-        ComponentRegistryDatabase.createTableRegistryUser(jdbcTemplate);
+        ComponentRegistryTestDatabase.resetDatabase(jdbcTemplate);
+        ComponentRegistryTestDatabase.createTableRegistryUser(jdbcTemplate);
     }
 

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryTestDatabase.java

@@ -7 +7 @@
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
-public final class ComponentRegistryDatabase {
+public final class ComponentRegistryTestDatabase {
 
-    private ComponentRegistryDatabase() {
+    private ComponentRegistryTestDatabase() {
     }
 

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ProfileDescriptionDaoTest.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.impl.database;
 
-import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase.*;
+import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryTestDatabase.*;
 import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/UserDaoTest.java

@@ -30 +30 @@
     @Before
     public void init() {
-        ComponentRegistryDatabase.resetDatabase(jdbcTemplate);
-        ComponentRegistryDatabase.createTableRegistryUser(jdbcTemplate);
+        ComponentRegistryTestDatabase.resetDatabase(jdbcTemplate);
+        ComponentRegistryTestDatabase.createTableRegistryUser(jdbcTemplate);
     }
 

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java

@@ -27 +27 @@
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
 import clarin.cmdi.componentregistry.impl.database.ComponentRegistryBeanFactory;
-import clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase;
+import clarin.cmdi.componentregistry.impl.database.ComponentRegistryTestDatabase;
 import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
@@ -52 +52 @@
     @Before
     public void init() {
-        ComponentRegistryDatabase.resetAndCreateAllTables(jdbcTemplate);
+        ComponentRegistryTestDatabase.resetAndCreateAllTables(jdbcTemplate);
         createUserRecord();
         // Get public component registry

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/ConcurrentRestServiceTest.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.rest;
 
-import clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase;
+import clarin.cmdi.componentregistry.impl.database.ComponentRegistryTestDatabase;
 import clarin.cmdi.componentregistry.model.AbstractDescription;
 import static clarin.cmdi.componentregistry.rest.ComponentRegistryRestService.USERSPACE_PARAM;
@@ -46 +46 @@
     @Before
     public void init() {
-        ComponentRegistryDatabase.resetAndCreateAllTables(jdbcTemplate);
+        ComponentRegistryTestDatabase.resetAndCreateAllTables(jdbcTemplate);
         createUserRecord();
     }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/MDValidatorTest.java

@@ -18 +18 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
-import clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase;
+import clarin.cmdi.componentregistry.impl.database.ComponentRegistryTestDatabase;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;
@@ -34 +34 @@
     @Before
     public void init() {
-        ComponentRegistryDatabase.resetAndCreateAllTables(jdbcTemplate);
+        ComponentRegistryTestDatabase.resetAndCreateAllTables(jdbcTemplate);
         publicRegistry = componentRegistryFactory.getPublicRegistry();
     }