From: nancylizi <li.zi30@zte.com.cn>
Date: Mon, 24 Oct 2016 01:48:17 +0000 (+0800)
Subject: Fix the bug TOSCA-135
X-Git-Tag: release/mercury~32
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8c845695a6807a7455597a825ef66dc51228f938;p=vfc%2Fnfvo%2Fcatalog.git

Fix the bug TOSCA-135

Change-Id: Ie5d0038da8dee0c00dd37e6f18921af505a9f213
Issue-id: TOSCA-135
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
---

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 93c7dc44..d672db1c 100644
--- 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
@@ -98,10 +98,22 @@ public class PackageWrapperTest {
         manager.deletePackage(packageOid);
       }
     }
-
-    PackageData packageData = new PackageData();
-    packageData = getPackageData();
-    manager.addPackage(packageData);
+    ArrayList<PackageData> packageList2 = manager.queryPackage(null, null, null, null, null);
+    if (packageList2 != null && packageList2.size() > 0) {
+      for (int j = 0; j < packageList2.size(); j++) {
+        if (packageList2.get(j).getCsarId().equals("123456")) {
+          manager.updatePackage(getPackageData(), "123456");
+        } else {
+          PackageData packageData = new PackageData();
+          packageData = getPackageData();
+          manager.addPackage(packageData);
+        }
+      }
+    } else {
+      PackageData packageData = new PackageData();
+      packageData = getPackageData();
+      manager.addPackage(packageData);
+    }
   }
 
   // @Ignore