Fix unit test issue

Change-Id: If42d15f2572c9005e61ca108ea7cdd0525771a31
Signed-off-by: huangjian <huang.jian12@zte.com.cn>

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/ToolUtil.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/ToolUtil.java
index 60a0858..3415958 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/ToolUtil.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/ToolUtil.java
@@ -87,12 +87,10 @@ public class ToolUtil {
             InputStream uploadedInputStream) throws IOException {
         File tmpDir = new File(dirName);
         LOG.info("tmpdir = " + File.separator + dirName);
-        LOG.info("tmpDir.getAbsolutePath() = " + tmpDir.getAbsolutePath());
         if (!tmpDir.exists()) {
             tmpDir.mkdirs();
         }
-
-        File file = new File(tmpDir.getAbsolutePath() + File.separator + fileName);
+        File file = new File(tmpDir + File.separator + fileName);
         OutputStream os = null;
         try {
             int read = 0;
@@ -112,7 +110,7 @@ public class ToolUtil {
 
     public static String getTempDir(String dirName, String fileName) {
         // File tmpDir = new File(File.separator + dirName);
-        return dirName + File.separator + fileName.replace(".csar", "");
+        return Class.class.getClass().getResource("/").getPath() + dirName + File.separator + fileName.replace(".csar", "");
     }
 
     public static String getUnzipDir(String dirName) {

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/entity/EnumOnboardState.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/entity/EnumOnboardState.java
new file mode 100644 (file)
index 0000000..c4cab53
--- /dev/null
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/entity/EnumOnboardState.java
@@ -0,0 +1,34 @@
+/**\r
+ * Copyright 2016 [ZTE] and others.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+package org.openo.commontosca.catalog.entity;\r
+\r
+/**\r
+ * @author 00164331\r
+ *\r
+ */\r
+public enum EnumOnboardState {\r
+    onBoarded("onBoarded"), nonOnBoarded("non-onBoarded");\r
+    \r
+    String value;\r
+\r
+    EnumOnboardState(String value) {\r
+        this.value = value;\r
+    }\r
+    \r
+    public String getValue() {\r
+        return value;\r
+    }\r
+}\r

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/filemanage/http/HttpFileManagerImpl.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/filemanage/http/HttpFileManagerImpl.java
index c323f11..f0a68d5 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/filemanage/http/HttpFileManagerImpl.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/filemanage/http/HttpFileManagerImpl.java
@@ -38,8 +38,9 @@ public class HttpFileManagerImpl implements FileManager {
         }
         // File dstFile = new File(ToolUtil.getHttpServerPath() + dstPath);
         // LOGGER.info("dstFile AbsolutePath:" + dstFile.getAbsolutePath());
+        String targetDir = Class.class.getClass().getResource("/").getPath() + ToolUtil.getHttpServerPath() + dstPath;
         try {
-            ToolUtil.copyDirectory(srcPath, ToolUtil.getHttpServerPath() + dstPath, true);
+            ToolUtil.copyDirectory(srcPath, targetDir, true);
         } catch (IOException e) {
             flag = false;
             LOGGER.error("copy file failed.errorMsg:" + e.getMessage());

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapperUtil.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapperUtil.java
index 7395ed1..ed20c14 100644 (file)
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapperUtil.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapperUtil.java
@@ -42,6 +42,7 @@ import org.openo.commontosca.catalog.model.externalservice.lifecycle.LifeCycleSe
 import org.openo.commontosca.catalog.common.ToolUtil;\r
 import org.openo.commontosca.catalog.db.entity.PackageData;\r
 import org.openo.commontosca.catalog.entity.CSARPackage;\r
+import org.openo.commontosca.catalog.entity.EnumOnboardState;\r
 import org.openo.commontosca.catalog.entity.EnumOperationalState;\r
 import org.openo.commontosca.catalog.entity.EnumUsageState;\r
 import org.openo.commontosca.catalog.entity.response.PackageMeta;\r
@@ -146,7 +147,7 @@ public class PackageWrapperUtil {
         packageMeta.setModifyTime(currentTime);\r
         packageMeta.setOperationalState(EnumOperationalState.Disabled);\r
         packageMeta.setUsageState(EnumUsageState.NotInUse);\r
-        packageMeta.setOnBoardState("false");\r
+        packageMeta.setOnBoardState(EnumOnboardState.nonOnBoarded.getValue());\r
         packageMeta.setProcessState(EnumProcessState.normal);\r
         return packageMeta;\r
     }\r
@@ -292,6 +293,14 @@ public class PackageWrapperUtil {
         }\r
         return metas;\r
     }\r
+    \r
+    public static EnumOnboardState getEnumByValue(String value) {\r
+        if(value == "non-onBoarded") {\r
+            return EnumOnboardState.nonOnBoarded;\r
+        } else {\r
+            return EnumOnboardState.onBoarded;\r
+        }\r
+    }\r
 \r
     private static PackageMeta packageData2PackageMeta(PackageData packageData) {\r
         PackageMeta meta = new PackageMeta();\r

diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java
index 066710c..f41a8cf 100644 (file)
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java
@@ -44,6 +44,7 @@ import org.openo.commontosca.catalog.db.dao.DaoManager;
 import org.openo.commontosca.catalog.db.entity.PackageData;\r
 import org.openo.commontosca.catalog.db.util.H2DbServer;\r
 import org.openo.commontosca.catalog.db.util.HibernateSession;\r
+import org.openo.commontosca.catalog.entity.EnumOnboardState;\r
 import org.openo.commontosca.catalog.entity.EnumOperationalState;\r
 import org.openo.commontosca.catalog.entity.EnumProcessState;\r
 import org.openo.commontosca.catalog.entity.EnumUsageState;\r
@@ -274,7 +275,7 @@ public class PackageWrapperTest {
         packageData.setFormat("yml");\r
         packageData.setModifyTime("2016-06-29 03:33:15");\r
         packageData.setName("NanocellGW");\r
-        packageData.setOnBoardState("false");\r
+        packageData.setOnBoardState("non-onBoarded");\r
         packageData.setOperationalState("Disabled");\r
         packageData.setProvider("ZTE");\r
         packageData.setSize("0.93M");\r
@@ -310,7 +311,7 @@ public class PackageWrapperTest {
         meta.setType("NSAR");\r
         meta.setUsageState(EnumUsageState.valueOf("InUse"));\r
         meta.setVersion("V1.0");\r
-        meta.setOnBoardState("false");\r
+        meta.setOnBoardState(EnumOnboardState.nonOnBoarded.getValue());\r
         meta.setProcessState(EnumProcessState.valueOf("normal"));\r
         metas.add(meta);\r
         return metas;\r