diff options
Diffstat (limited to 'blueprints-processor/adaptors/data-adaptor-provider/src/test')
-rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java) | 6 | ||||
-rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoTest.java) | 7 | ||||
-rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java) | 8 | ||||
-rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoTest.java) | 3 | ||||
-rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNodeTest.java) | 17 | ||||
-rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceTest.java) | 22 | ||||
-rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml | 12 | ||||
-rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml | 14 |
8 files changed, 50 insertions, 39 deletions
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoTest.java index 28736386c..1915017a6 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoTest.java @@ -15,13 +15,15 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -44,7 +46,7 @@ public class ConfigPropertyMapDaoTest { int result = queryExecutorDao.update(sql, data);
Assert.assertNotNull("Failed to get Query Result", result);
- String propKeyValye = configPropertyMapDao.getConfigPropertyByKey("org.onap.ccsdk.config.rest.adaptors.test");
+ String propKeyValye = configPropertyMapDao.getConfigPropertyByKey("org.onap.ccsdk.features.rest.adaptors.test");
Assert.assertNull("propKeyValue is null", propKeyValye);
}
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java index 0e57d3b5f..7bc9189c9 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -28,8 +28,9 @@ import org.junit.FixMethodOrder; import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java index ba150d510..22e9be9b7 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.HashMap;
import java.util.List;
@@ -26,8 +26,10 @@ import org.junit.FixMethodOrder; import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java index 257bc3183..ee7029f0d 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.Date;
import org.junit.Assert;
@@ -24,6 +24,7 @@ import org.junit.FixMethodOrder; import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNodeTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java index b2f24bf60..53724c5c9 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNodeTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.util.HashMap;
import java.util.Map;
@@ -23,12 +23,15 @@ import org.junit.Assert; import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceNode;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java index 6f861a3be..2d599e2f1 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -29,15 +29,17 @@ import org.junit.Assert; import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoTest;
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoTest;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml index f0a50f440..baffb54e6 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml @@ -53,31 +53,31 @@ </bean>
<bean id="configResourceDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="configPropertyMapDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="queryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="namedQueryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">
<constructor-arg ref="namedParameterJdbcTemplate" />
</bean>
<bean id="transactionLogDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<context:component-scan
- base-package="org.onap.ccsdk.config.data.adaptor" />
+ base-package="org.onap.ccsdk.features.data.adaptor" />
</beans>
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml index 17189f2f2..ee3d33120 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml @@ -53,10 +53,10 @@ <!-- <jdbc:script location="sql/schema.sql" /> -->
<!-- </jdbc:initialize-database> -->
<!-- <bean id="dataSetup" -->
- <!-- class="org.onap.ccsdk.config.data.adaptor.db.utils.DataSetup"> -->
+ <!-- class="org.onap.ccsdk.features.data.adaptor.db.utils.DataSetup"> -->
<!-- <property name="testDb" ref="testDb" /> -->
<!-- </bean> -->
- <!-- <bean id="testDb" class="org.onap.ccsdk.config.data.adaptor.db.utils.TestDb"> -->
+ <!-- <bean id="testDb" class="org.onap.ccsdk.features.data.adaptor.db.utils.TestDb"> -->
<!-- <property name="jdbcTemplate" ref="jdbcTemplate" /> -->
<!-- </bean> -->
@@ -71,26 +71,26 @@ </bean>
<bean id="configResourcelDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="ConfigPropertyMapDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="queryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="namedQueryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">
<constructor-arg ref="namedParameterJdbcTemplate" />
</bean>
<context:component-scan
- base-package="org.onap.ccsdk.config.data.adaptor" />
+ base-package="org.onap.ccsdk.features.data.adaptor" />
</beans>
|