summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlizi00164331 <li.zi30@zte.com.cn>2017-09-20 10:09:24 +0800
committerlizi00164331 <li.zi30@zte.com.cn>2017-09-20 10:09:24 +0800
commita66771ece8eb7c7dce4ff4da35df6e4faf94d8f0 (patch)
tree39adc81c95e84a445baad5c04626dc7adc095e09
parent1c369c805511a8314754c27bb1ce984447ee72b7 (diff)
Add the unit test for ExtsysAppTest.
Change-Id: I8ec279cfff9f1f11fac53cc82a555dc719be29a0 Issue-ID: AAI-340 Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
-rw-r--r--esr-mgr/src/main/java/org/onap/aai/esr/common/HibernateSession.java74
-rw-r--r--esr-mgr/src/main/java/org/onap/aai/esr/resource/ServiceTest.java1
-rw-r--r--esr-mgr/src/test/java/org/onap/aai/esr/ExtsysAppTest.java40
-rw-r--r--esr-mgr/src/test/resources/db/extsys.mv.dbbin12288 -> 0 bytes
-rw-r--r--esr-mgr/src/test/resources/extsys.yml68
-rw-r--r--esr-mgr/src/test/resources/sql/extsys-resource-createObj-mysql.sql71
6 files changed, 182 insertions, 72 deletions
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/common/HibernateSession.java b/esr-mgr/src/main/java/org/onap/aai/esr/common/HibernateSession.java
new file mode 100644
index 0000000..963ccc7
--- /dev/null
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/common/HibernateSession.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * 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.
+ */
+package org.onap.aai.esr.common;
+
+import java.io.File;
+import java.net.URISyntaxException;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.service.ServiceRegistry;
+
+public class HibernateSession {
+ private static File cfgfile = null;
+
+ private static ServiceRegistry serviceRegistry = null;
+ private static Configuration configuration = null;
+ private static SessionFactory sessionFactory = null;
+ private static String resourcePath;
+
+ /**
+ * Get a hibernate sessionFactory.
+ */
+ public static SessionFactory init() {
+ initConfigure();
+ configuration = new Configuration().configure(cfgfile);
+ configuration.setProperty("hibernate.connection.url", "jdbc:h2:tcp://localhost:8205/"
+ + resourcePath + "db/catalog");
+ serviceRegistry =
+ new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build();
+ sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+ return sessionFactory;
+ }
+
+ private static void initConfigure() {
+ try {
+ resourcePath = HibernateSession.class.getResource("/").toURI().getPath();
+ } catch (URISyntaxException e1) {
+ e1.printStackTrace();
+ }
+ final String filename = "Hibernate.cfg.xml";
+ cfgfile = new File(resourcePath + filename);
+ }
+
+ /**
+ * Destory a hibernate sessionFactory.
+ */
+ public static void destory() {
+ if (sessionFactory != null && !sessionFactory.isClosed()) {
+ sessionFactory.close();
+ }
+ }
+
+ /**
+ * test.
+ * @param args param
+ */
+ public static void main(String[] args) {
+
+ }
+}
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/ServiceTest.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/ServiceTest.java
index 0549304..d92d40b 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/ServiceTest.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/ServiceTest.java
@@ -22,7 +22,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.eclipse.jetty.http.HttpStatus;
-import org.onap.aai.esr.wrapper.EmsManagerWrapper;
import com.codahale.metrics.annotation.Timed;
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/ExtsysAppTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/ExtsysAppTest.java
new file mode 100644
index 0000000..8682dfa
--- /dev/null
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/ExtsysAppTest.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * 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.
+ */
+package org.onap.aai.esr;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.onap.aai.esr.common.Config;
+import org.onap.aai.esr.common.HibernateSession;
+
+public class ExtsysAppTest {
+ static {
+ ExtsysAppConfiguration configuration = new ExtsysAppConfiguration();
+ Config.setConfigration(configuration);
+ }
+
+ @Test
+ public void getName() throws Exception {
+ ExtsysApp app = new ExtsysApp();
+ assertEquals(app.getName(),"ONAP-ESR");
+ }
+
+ public static void main(String[] args) throws Exception {
+ String filePath = HibernateSession.class.getResource("/").toURI().getPath()+"extsys.yml";
+ new ExtsysApp().run(new String[]{"server", filePath});
+ }
+}
diff --git a/esr-mgr/src/test/resources/db/extsys.mv.db b/esr-mgr/src/test/resources/db/extsys.mv.db
deleted file mode 100644
index facfeac..0000000
--- a/esr-mgr/src/test/resources/db/extsys.mv.db
+++ /dev/null
Binary files differ
diff --git a/esr-mgr/src/test/resources/extsys.yml b/esr-mgr/src/test/resources/extsys.yml
new file mode 100644
index 0000000..786be0a
--- /dev/null
+++ b/esr-mgr/src/test/resources/extsys.yml
@@ -0,0 +1,68 @@
+#
+# Copyright 2016-2017 ZTE Corporation.
+#
+# 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.
+#
+
+template: Hello, %s!
+
+#defaultName: ${DW_DEFAULT_NAME:-Stranger}
+# the micro service ip
+serviceIp:
+msbDiscoveryIp: 10.74.148.80
+msbDiscoveryPort: 10081
+msbServerAddr: http://10.74.148.80:10081
+cloudInfrastructureAddr: http://10.74.148.80/api/aai-cloudInfrastructure/v11
+externalSystemAddr: http://10.74.148.80/api/aai-externalSystem/v11
+registByHand: true
+
+# use the simple server factory if you only want to run on a single port
+#server:
+# type: simple
+# connector:
+# type: http
+# port: 8080
+server:
+ type: simple
+ rootPath: '/api/aai-esr-server/v1/*'
+ applicationContextPath: /
+ adminContextPath: /admin
+ connector:
+ type: http
+ port: 9518
+
+# Logging settings.
+logging:
+
+ # The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL.
+ level: ALL
+
+ # Logger-specific levels.
+ loggers:
+
+ # Sets the level for 'com.example.app' to DEBUG.
+ org.onap.aai.esr.ExtsysApp: INFO
+
+ appenders:
+ - type: console
+ threshold: INFO
+ timeZone: UTC
+ logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] - %m%n"
+ - type: file
+ threshold: INFO
+ logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] - %m%n"
+ currentLogFilename: ./works/logs/extsys.log
+ archivedLogFilenamePattern: ./works/logs/zip/extsys-%d{yyyy-MM-dd}.log.gz
+ archivedFileCount: 7
+ timeZone: UTC
+
diff --git a/esr-mgr/src/test/resources/sql/extsys-resource-createObj-mysql.sql b/esr-mgr/src/test/resources/sql/extsys-resource-createObj-mysql.sql
deleted file mode 100644
index 073c73f..0000000
--- a/esr-mgr/src/test/resources/sql/extsys-resource-createObj-mysql.sql
+++ /dev/null
@@ -1,71 +0,0 @@
---
--- Copyright 2016 ZTE Corporation.
---
--- 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.
---
-
-DROP TABLE IF EXISTS extsys_base_table;
-CREATE TABLE extsys_base_table (
- ID VARCHAR(200) NOT NULL,
- NAME VARCHAR(200) NULL,
- TYPE VARCHAR(200) NULL,
- VENDOR VARCHAR(100) NULL,
- VERSION VARCHAR(100) NULL,
- DESCRIPTION VARCHAR(100) NULL,
- CREATETIME VARCHAR(200) NULL,
- CATAGORY VARCHAR(200) NULL,
- CONSTRAINT extsys_base_table PRIMARY KEY(ID)
-);
-DROP TABLE IF EXISTS extsys_ems_table;
-CREATE TABLE extsys_ems_table (
- EMSID VARCHAR(200) NOT NULL,
- URL VARCHAR(100) NULL,
- PRODUCTNAME VARCHAR(100) NULL,
- USERNAME VARCHAR(100) NULL,
- PASSWORD VARCHAR(100) NULL,
- CONSTRAINT extsys_ems_table PRIMARY KEY(EMSID)
-);
-
-DROP TABLE IF EXISTS extsys_sdnc_table;
-CREATE TABLE extsys_sdnc_table (
- SDNCONTROLLERID VARCHAR(200) NOT NULL,
- URL VARCHAR(100) NULL,
- USERNAME VARCHAR(100) NULL,
- PASSWORD VARCHAR(100) NULL,
- PRODUCTNAME VARCHAR(100) NULL,
- PROTOCOL VARCHAR(100) NULL,
- CONSTRAINT extsys_sdnc_table PRIMARY KEY(SDNCONTROLLERID)
-);
-
-DROP TABLE IF EXISTS extsys_vim_table;
-CREATE TABLE extsys_vim_table (
- VIMID VARCHAR(200) NOT NULL,
- URL VARCHAR(100) NULL,
- USERNAME VARCHAR(100) NULL,
- PASSWORD VARCHAR(100) NULL,
- DOMAIN VARCHAR(100) NULL,
- TENANT VARCHAR(100) NULL,
- CONSTRAINT extsys_vim_table PRIMARY KEY(VIMID)
-);
-
-DROP TABLE IF EXISTS extsys_vnfm_table;
-CREATE TABLE extsys_vnfm_table (
- VNFMID VARCHAR(200) NOT NULL,
- URL VARCHAR(200) NULL,
- USERNAME VARCHAR(100) NULL,
- PASSWORD VARCHAR(100) NULL,
- VIMID VARCHAR(100) NULL,
- CERTIFICATEURL VARCHAR(200) NULL,
- CONSTRAINT extsys_vnfm_table PRIMARY KEY(VNFMID)
-);
-