diff options
Diffstat (limited to 'blueprints-processor/adaptors/data-adaptor-provider/src/test')
9 files changed, 151 insertions, 115 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/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java index 487bcd932..28736386c 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/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java @@ -1,15 +1,18 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.onap.ccsdk.config.data.adaptor.dao;
@@ -27,22 +30,22 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration(locations = {"classpath:test-context-h2db.xml"})
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class ConfigPropertyMapDaoTest {
-
+
@Autowired
private ConfigPropertyMapDao configPropertyMapDao;
-
+
@Autowired
private QueryExecutorDao queryExecutorDao;
-
+
@Test
public void testConfigResourcesData() throws Exception {
String sql = "INSERT INTO CONFIG_PROPERTY_MAP (reference_key, reference_value) VALUES ( ?, ?)";
Object[] data = new Object[] {"dummy123", "username123"};
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");
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/config/data/adaptor/dao/ConfigResourceDaoTest.java index ae493e692..0e57d3b5f 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/config/data/adaptor/dao/ConfigResourceDaoTest.java @@ -1,15 +1,18 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.onap.ccsdk.config.data.adaptor.dao;
@@ -37,24 +40,24 @@ import com.att.eelf.configuration.EELFManager; @ContextConfiguration(locations = {"classpath:test-context-h2db.xml"})
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class ConfigResourceDaoTest {
-
+
private static EELFLogger logger = EELFManager.getInstance().getLogger(ConfigResourceDaoTest.class);
-
+
@Autowired
private ConfigResourceDao configResourceDao;
-
+
@Before
public void initialise() {
-
+
}
-
+
@Test
public void testAssignmentResourceData() throws Exception {
ConfigResource configResource = new ConfigResource();
String resourceData = IOUtils.toString(
ConfigResourceDaoTest.class.getClassLoader().getResourceAsStream("reference/resource_data.json"),
Charset.defaultCharset());
-
+
logger.trace("resourceData = " + resourceData);
configResource.setResourceData(resourceData);
configResource.setServiceTemplateName("sample-name");
@@ -68,7 +71,7 @@ public class ConfigResourceDaoTest { configResource.setStatus("success");
configResource.setCreatedDate(new Date(System.currentTimeMillis()));
configResource.setUpdatedBy("an188a");
-
+
List<ResourceAssignmentData> resourceAssignments = new ArrayList<>();
ResourceAssignmentData resourceAssignmentData = new ResourceAssignmentData();
resourceAssignmentData.setDataType("string");
@@ -80,7 +83,7 @@ public class ConfigResourceDaoTest { resourceAssignmentData.setSource("input");
resourceAssignments.add(resourceAssignmentData);
configResource.setResourceAssignments(resourceAssignments);
-
+
ConfigResource dbConfigResource = configResourceDao.save(configResource);
logger.info("Saved sucessfully : " + dbConfigResource.toString());
Assert.assertNotNull("ConfigResource is null", dbConfigResource);
@@ -88,7 +91,7 @@ public class ConfigResourceDaoTest { Assert.assertEquals("Resource Assignment Data count missmatch", true,
dbConfigResource.getResourceAssignments().size() > 0);
}
-
+
@Test
public void testConfigResourcesData() throws Exception {
ConfigResource configResourceInput = new ConfigResource();
@@ -96,7 +99,7 @@ public class ConfigResourceDaoTest { List<ConfigResource> dbConfigResources = configResourceDao.findByConfigResource(configResourceInput);
Assert.assertNotNull("ConfigResources is null", dbConfigResources);
Assert.assertEquals("ConfigResources size missmatch", true, dbConfigResources.size() > 0);
-
+
for (ConfigResource configResource : dbConfigResources) {
Assert.assertNotNull("ConfigResources Assignments is null", configResource.getResourceAssignments());
Assert.assertTrue("ConfigResources Assignments size miss mathch ",
@@ -104,18 +107,18 @@ public class ConfigResourceDaoTest { logger.trace("ResourceAssignments = " + configResource.getResourceAssignments());
}
}
-
+
@Test
public void testDeleteByConfigResource() throws Exception {
ConfigResource configResourceInput = new ConfigResource();
configResourceInput.setResourceId("123456");
-
+
List<ConfigResource> dbConfigResources = configResourceDao.findByConfigResource(configResourceInput);
Assert.assertTrue("ConfigResources is null", !dbConfigResources.isEmpty());
-
+
configResourceInput.setConfigResourceId(dbConfigResources.get(0).getConfigResourceId());
configResourceDao.deleteByConfigResource(configResourceInput);
-
+
dbConfigResources = configResourceDao.findByConfigResource(configResourceInput);
Assert.assertTrue("ConfigResources is not null", dbConfigResources.isEmpty());
}
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/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java index 1fceccebf..ba150d510 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/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java @@ -1,15 +1,18 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.onap.ccsdk.config.data.adaptor.dao;
@@ -36,41 +39,41 @@ import com.att.eelf.configuration.EELFManager; @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class ConfigTransactionLogDaoTest {
private static EELFLogger logger = EELFManager.getInstance().getLogger(ConfigTransactionLogDaoTest.class);
-
+
@Autowired
private TransactionLogDao transactionLogDao;
-
+
@Autowired
private NamedQueryExecutorDao namedQueryExecutorDao;
-
+
@Before
public void initialise() {
-
+
}
-
+
@Test
public void testQueryExecution() throws Exception {
String requestId = "12345";
-
+
transactionLogDao
.save(new TransactionLog(requestId, DataAdaptorConstants.LOG_MESSAGE_TYPE_LOG, "Received Request"));
-
+
List<TransactionLog> result = transactionLogDao.getTransactionsByRequestId(requestId);
logger.info("DB ArtifactReference :" + result);
Assert.assertNotNull("Failed to get Query Result", result);
-
+
List<TransactionLog> result2 =
transactionLogDao.getTransactionsByRequestId(requestId, DataAdaptorConstants.LOG_MESSAGE_TYPE_LOG);
logger.info("DB ArtifactReference :" + result2);
Assert.assertNotNull("Failed to get Query Result", result2);
-
+
String namedsql = "SELECT * FROM CONFIG_TRANSACTION_LOG WHERE request_id = :request_id";
Map<String, Object> parameters = new HashMap<>();
parameters.put("request_id", "12345");
List<Map<String, Object>> namedresult = namedQueryExecutorDao.query(namedsql, parameters);
logger.info("DB ArtifactReference :" + namedresult);
Assert.assertNotNull("Failed to get Query Result", namedresult);
-
+
}
-
+
}
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/config/data/adaptor/dao/QueryExecutorDaoTest.java index ce3e95224..257bc3183 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/config/data/adaptor/dao/QueryExecutorDaoTest.java @@ -1,15 +1,18 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.onap.ccsdk.config.data.adaptor.dao;
@@ -32,18 +35,18 @@ import com.att.eelf.configuration.EELFManager; @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class QueryExecutorDaoTest {
private static EELFLogger logger = EELFManager.getInstance().getLogger(QueryExecutorDaoTest.class);
-
+
@Autowired
private QueryExecutorDao queryExecutorDao;
-
+
@Before
public void initialise() {
-
+
}
-
+
@Test
public void testInsertQueryExecution() throws Exception {
-
+
String sql = "INSERT INTO CONFIG_RESOURCE"
+ "(config_resource_id, resource_id, resource_type, template_name, recipe_name, request_id, resource_data, mask_data, created_date, updated_by) "
+ "VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
@@ -54,25 +57,25 @@ public class QueryExecutorDaoTest { logger.info("Updated successfully rows :" + result);
Assert.assertNotNull("Failed to get Query Result", result);
}
-
+
@Test
public void testUpdateQueryExecution() throws Exception {
-
+
String sql = "UPDATE CONFIG_RESOURCE set recipe_name=? where config_resource_id=?";
Object[] data = new Object[] {"vce-service-template", "12345"};
int result = queryExecutorDao.update(sql, data);
logger.info("Updated successfully rows :" + result);
Assert.assertNotNull("Failed to get Query Result", result);
}
-
+
@Test
public void testDeleteQueryExecution() throws Exception {
-
+
String sql = "DELETE FROM CONFIG_RESOURCE where config_resource_id=?";
Object[] data = new Object[] {"12345"};
int result = queryExecutorDao.update(sql, data);
logger.info("Updated successfully rows :" + result);
Assert.assertNotNull("Failed to get Query Result", result);
}
-
+
}
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/config/data/adaptor/service/ConfigResourceNodeTest.java index 847d5ed42..b2f24bf60 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/config/data/adaptor/service/ConfigResourceNodeTest.java @@ -1,15 +1,18 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.onap.ccsdk.config.data.adaptor.service;
@@ -35,33 +38,33 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:test-context-h2db.xml"})
public class ConfigResourceNodeTest {
-
+
ConfigResourceNode configResourceNode;
-
+
ConfigResourceService configResourceService;
-
+
@Autowired
TransactionLogDao transactionLogDao;
-
+
@Autowired
ConfigResourceDao configResourceDao;
-
+
@Autowired
QueryExecutorDao queryExecutorDao;
-
+
@Autowired
NamedQueryExecutorDao namedQueryExecutorDao;
-
+
@Autowired
ConfigPropertyMapDao configPropertyMapDao;
-
+
@Before
public void before() {
configResourceService = new ConfigResourceServiceImpl(transactionLogDao, configResourceDao, queryExecutorDao,
namedQueryExecutorDao, configPropertyMapDao);
configResourceNode = new ConfigResourceNode(configResourceService);
}
-
+
@Test
public void testSaveConfigTransactionLog() throws Exception {
Map<String, String> inParams = new HashMap<>();
@@ -69,12 +72,12 @@ public class ConfigResourceNodeTest { inParams.put(DataAdaptorConstants.INPUT_PARAM_MESSAGE, "message");
SvcLogicContext ctx = new SvcLogicContext();
ctx.setAttribute("request-id", "requestId12345");
-
+
configResourceNode.saveConfigTransactionLog(inParams, ctx);
-
+
Assert.assertTrue(!transactionLogDao.getTransactionsByRequestId("requestId12345").isEmpty());
}
-
+
@Test(expected = SvcLogicException.class)
public void testSaveConfigTransactionLogException() throws Exception {
configResourceNode = new ConfigResourceNode(null);
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/config/data/adaptor/service/ConfigResourceServiceTest.java index 1240ca237..6f861a3be 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/config/data/adaptor/service/ConfigResourceServiceTest.java @@ -1,15 +1,18 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.onap.ccsdk.config.data.adaptor.service;
@@ -42,30 +45,30 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:test-context-h2db.xml"})
public class ConfigResourceServiceTest {
-
+
ConfigResourceService configResourceService;
-
+
@Autowired
TransactionLogDao transactionLogDao;
-
+
@Autowired
ConfigResourceDao configResourceDao;
-
+
@Autowired
QueryExecutorDao queryExecutorDao;
-
+
@Autowired
NamedQueryExecutorDao namedQueryExecutorDao;
-
+
@Autowired
ConfigPropertyMapDao configPropertyMapDao;
-
+
@Before
public void before() {
configResourceService = new ConfigResourceServiceImpl(transactionLogDao, configResourceDao, queryExecutorDao,
namedQueryExecutorDao, configPropertyMapDao);
}
-
+
@Test
public void testUpdate() throws Exception {
String sql = "INSERT INTO CONFIG_RESOURCE"
@@ -76,20 +79,20 @@ public class ConfigResourceServiceTest { "resource-data", "mask-data", null, new Date(System.currentTimeMillis()), "ab1234"};
int result = configResourceService.update(sql, data);
Assert.assertTrue(result == 1);
-
+
sql = "SELECT * FROM CONFIG_RESOURCE WHERE config_resource_id = ?";
data = new Object[] {"54321"};
List<Map<String, Object>> queryResult = configResourceService.query(sql, data);
Assert.assertTrue(queryResult.size() == 1);
}
-
+
@Test
public void testSaveAndGetConfigResource() throws Exception {
ConfigResource configResource = new ConfigResource();
String resourceData = IOUtils.toString(
ConfigResourceDaoTest.class.getClassLoader().getResourceAsStream("reference/resource_data.json"),
Charset.defaultCharset());
-
+
configResource.setResourceData(resourceData);
configResource.setServiceTemplateName("sample-name");
configResource.setServiceTemplateVersion("1.0.0");
@@ -102,7 +105,7 @@ public class ConfigResourceServiceTest { configResource.setStatus("success");
configResource.setCreatedDate(new Date(System.currentTimeMillis()));
configResource.setUpdatedBy("an188a");
-
+
List<ResourceAssignmentData> resourceAssignments = new ArrayList<>();
ResourceAssignmentData resourceAssignmentData = new ResourceAssignmentData();
resourceAssignmentData.setDataType("string");
@@ -114,7 +117,7 @@ public class ConfigResourceServiceTest { resourceAssignmentData.setSource("input");
resourceAssignments.add(resourceAssignmentData);
configResource.setResourceAssignments(resourceAssignments);
-
+
// save
ConfigResource dbConfigResource = configResourceService.saveConfigResource(configResource);
Assert.assertNotNull("ConfigResource is null", dbConfigResource);
@@ -122,7 +125,7 @@ public class ConfigResourceServiceTest { Assert.assertEquals("Resource Assignment Data count missmatch", true,
dbConfigResource.getResourceAssignments().size() > 0);
Assert.assertEquals(configResource.getServiceTemplateVersion(), dbConfigResource.getServiceTemplateVersion());
-
+
// update
configResource.setServiceTemplateVersion("1.0.1");
dbConfigResource = configResourceService.saveConfigResource(configResource);
@@ -131,7 +134,7 @@ public class ConfigResourceServiceTest { Assert.assertEquals("Resource Assignment Data count missmatch", true,
dbConfigResource.getResourceAssignments().size() > 0);
Assert.assertEquals(configResource.getServiceTemplateVersion(), dbConfigResource.getServiceTemplateVersion());
-
+
// find
ConfigResource configResourceInput = new ConfigResource();
configResourceInput.setResourceId(configResource.getResourceId());
@@ -144,23 +147,23 @@ public class ConfigResourceServiceTest { List<ConfigResource> dbConfigResources = configResourceService.getConfigResource(configResourceInput);
Assert.assertNotNull("ConfigResources is null", dbConfigResources);
Assert.assertEquals("ConfigResources size missmatch", true, dbConfigResources.size() > 0);
-
+
for (ConfigResource dbConfigResouce : dbConfigResources) {
Assert.assertNotNull("ConfigResources Assignments is null", dbConfigResouce.getResourceAssignments());
Assert.assertTrue("ConfigResources Assignments size miss mathch ",
dbConfigResouce.getResourceAssignments().size() > 0);
}
}
-
+
@Test
public void testSaveAndGetTransactionLog() throws Exception {
TransactionLog transactionLog = new TransactionLog();
transactionLog.setMessage("message");
transactionLog.setMessageType("messageType");
transactionLog.setRequestId("requestId");
-
+
configResourceService.save(transactionLog);
-
+
List<TransactionLog> transactions =
configResourceService.getTransactionsByRequestId(transactionLog.getRequestId());
Assert.assertTrue(transactions.size() == 1);
@@ -168,7 +171,7 @@ public class ConfigResourceServiceTest { transactionLog.getMessageType());
Assert.assertTrue(transactions.size() == 1);
}
-
+
@Test
public void testNamedQueryExecutorUpdateNQuery() throws Exception {
Map<String, Object> parameters = new HashMap<>();
@@ -179,10 +182,10 @@ public class ConfigResourceServiceTest { configResourceService.update(
"INSERT INTO CONFIG_TRANSACTION_LOG ( config_transaction_log_id, request_id, message_type, message ) VALUES (:config_transaction_log_id, :request_id, :message_type, :message) ",
parameters);
-
+
List<Map<String, Object>> result = configResourceService
.query("SELECT * FROM CONFIG_TRANSACTION_LOG WHERE request_id = :request_id", parameters);
-
+
Assert.assertTrue(!result.isEmpty());
Assert.assertNotNull(configResourceService.getNamedParameterJdbcTemplate());
}
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/log4j.properties b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/log4j.properties index ce75592ff..1f83d159a 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/log4j.properties +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/log4j.properties @@ -1,5 +1,21 @@ -log4j.rootLogger=INFO, A1 -log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} %5p %t %X{UUID} %c{3}:%L - %m%n -log4j.logger.org.hibernate=INFO +###
+# Copyright © 2017-2018 AT&T Intellectual Property.
+# Modifications Copyright © 2018 IBM.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###
+log4j.rootLogger=INFO, A1
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} %5p %t %X{UUID} %c{3}:%L - %m%n
+log4j.logger.org.hibernate=INFO
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 5b0004c1c..f0a50f440 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 @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
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 0e73b40b3..17189f2f2 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 @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
|