aboutsummaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2019-02-22 08:16:26 +0100
committersebdet <sebastien.determe@intl.att.com>2019-02-28 17:44:38 +0100
commitc2bcf2a333a66d401c6afe0589c117f0986a5bd2 (patch)
tree83ff67bcc644101de8f2af366b6d0cc39360cc92 /src/test
parentf08a27fede1086e17632dde816e0ae6214cab286 (diff)
Introduce new entities
Introduce new database entities to support the new Clamp model Change-Id: I6c8d7fdaf8201c2bc7878f8a807c89002525857f Issue-ID: CLAMP-299 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/onap/clamp/it/dao/model/LoopItCase.java98
-rw-r--r--src/test/resources/application.properties17
2 files changed, 114 insertions, 1 deletions
diff --git a/src/test/java/org/onap/clamp/it/dao/model/LoopItCase.java b/src/test/java/org/onap/clamp/it/dao/model/LoopItCase.java
new file mode 100644
index 000000000..06f4a7f88
--- /dev/null
+++ b/src/test/java/org/onap/clamp/it/dao/model/LoopItCase.java
@@ -0,0 +1,98 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.it.dao.model;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.clamp.clds.Application;
+import org.onap.clamp.dao.LoopsRepository;
+import org.onap.clamp.dao.model.LogType;
+import org.onap.clamp.dao.model.Loop;
+import org.onap.clamp.dao.model.LoopLog;
+import org.onap.clamp.dao.model.LoopState;
+import org.onap.clamp.dao.model.MicroServicePolicy;
+import org.onap.clamp.dao.model.OperationalPolicy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+public class LoopItCase {
+
+ @Autowired
+ private LoopsRepository loopRepository;
+
+ @Test
+ public void DecodeEncodeTest() {
+ Loop loopTest = new Loop();
+ loopTest.setName("ClosedLoopTest");
+ loopTest.setSvgRepresentation("representation");
+ loopTest.setBlueprint("blueprint");
+ loopTest.setGlobalPropertiesJson(new Gson().fromJson("{\"testName\":\"testValue\"}", Map.class));
+ loopTest.setLastComputedState(LoopState.DESIGN);
+ loopTest.setBlueprint("yaml");
+
+ OperationalPolicy opPolicy = new OperationalPolicy();
+ opPolicy.setName("OpPolicyTest");
+ opPolicy.setConfigurationsJson(new Gson().fromJson("{\"testname\":\"testvalue\"}", Map.class));
+ opPolicy.setLoop(loopTest);
+ loopTest.addOperationalPolicy(opPolicy);
+
+ MicroServicePolicy µService = new MicroServicePolicy();
+ µService.setJsonRepresentation(new Gson().fromJson("{\"testrepresentation\":\"value\"}", Map.class));
+ µService.setPolicyTosca("tosca");
+ µService.setProperties(new Gson().fromJson("{\"testparam\":\"testvalue\"}", Map.class));
+ µService.setShared(true);
+
+ µService.setName("ConfigPolicyTest");
+ loopTest.addMicroServicePolicy(µService);
+
+ LoopLog log = new LoopLog();
+ log.setLogType(LogType.INFO);
+ log.setMessage("test message");
+
+ loopTest.addLog(log);
+
+ Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().create();
+ String json = gson.toJson(loopTest);
+ assertNotNull(json);
+ Loop loopTestDecoded = gson.fromJson(json, Loop.class);
+ assertNotNull(loopTestDecoded);
+ Loop loop = gson.fromJson(json, Loop.class);
+ assertNotNull(loop);
+
+ Loop loopInDb = loopRepository.save(loopTest);
+ assertNotNull(loopInDb);
+ assertTrue(loopRepository.findById(loopInDb.getName()).get().getName().equals("ClosedLoopTest"));
+ }
+}
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index f41b68dfb..16331ba08 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -63,6 +63,7 @@ server.port=${clamp.it.tests.http}
server.servlet.context-path=/
#Modified engine-rest applicationpath
spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller
+spring.http.converters.preferred-json-mapper=gson
#The max number of active threads in this pool
server.tomcat.max-threads=200
@@ -90,7 +91,7 @@ camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
#clds datasource connection details
spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver
-spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3
+spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:3306,localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3
spring.datasource.cldsdb.username=clds
spring.datasource.cldsdb.password=4c90a0b48204383f4283448d23e0b885a47237b2a23588e7c4651604f51c1067
spring.datasource.cldsdb.validationQuery=SELECT 1
@@ -103,6 +104,20 @@ spring.datasource.cldsdb.initialSize=0
spring.datasource.cldsdb.testOnBorrow=true
spring.datasource.cldsdb.ignoreExceptionOnPreLoad=true
+spring.jpa.properties.javax.persistence.schema-generation.database.action=none
+#spring.jpa.properties.javax.persistence.schema-generation.create-source=metadata
+#spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create
+#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-target=create.sql
+# disable Hibernate DDL generation because the schema will be generated from a sql script
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.properties.hibernate.ddl-auto=validate
+spring.jpa.properties.hibernate.hbm2ddl.delimiter=;
+spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.properties.hibernate.use-new-id-generator-mappings=true
+
+# Whether to enable logging of SQL statements.
+spring.jpa.show-sql=true
+
#Async Executor default Parameters
async.core.pool.size=10
async.max.pool.size=20