vnfsdk market place seed code refactoring

cleanup the package names and a test file
correction

Change-Id: Icc5a3b48189824dfe5cb84f05ce2c496bcfa3eab
IssueId: VNFSDK-74
Signed-off-by: AvinashS <avinash.s@huawei.com>

2 files changed, 34 insertions, 33 deletions

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/openo/vnfsdk/marketplace/VnfSdkMarketplaceAppTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/VnfSdkMarketplaceAppTest.java
index 739e5a28..4804218a 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/openo/vnfsdk/marketplace/VnfSdkMarketplaceAppTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/VnfSdkMarketplaceAppTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace;
+package org.onap.vnfsdk.marketplace;
 
 
 public class VnfSdkMarketplaceAppTest {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/openo/vnfsdk/marketplace/resource/PackageResourceTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
index 3305e5ab..bccbfaba 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/openo/vnfsdk/marketplace/resource/PackageResourceTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.resource;
+package org.onap.vnfsdk.marketplace.resource;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -38,34 +38,35 @@ import org.codehaus.jackson.JsonNode;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.vnfsdk.marketplace.common.FileUtil;
-import org.openo.vnfsdk.marketplace.common.JsonUtil;
-import org.openo.vnfsdk.marketplace.common.ToolUtil;
-import org.openo.vnfsdk.marketplace.db.connection.ConnectionUtil;
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
-import org.openo.vnfsdk.marketplace.db.impl.MarketplaceDaoImpl;
-import org.openo.vnfsdk.marketplace.db.resource.PackageManager;
-import org.openo.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
-import org.openo.vnfsdk.marketplace.db.wrapper.PackageHandler;
-import org.openo.vnfsdk.marketplace.entity.CsarPackage;
-import org.openo.vnfsdk.marketplace.entity.EnumOperationalState;
-import org.openo.vnfsdk.marketplace.entity.EnumType;
-import org.openo.vnfsdk.marketplace.entity.EnumUsageState;
-import org.openo.vnfsdk.marketplace.entity.VnfPackage;
-import org.openo.vnfsdk.marketplace.entity.request.PackageBasicInfo;
-import org.openo.vnfsdk.marketplace.entity.response.CsarFileUriResponse;
-import org.openo.vnfsdk.marketplace.entity.response.PackageMeta;
-import org.openo.vnfsdk.marketplace.entity.response.PackageResponse;
-import org.openo.vnfsdk.marketplace.filemanage.http.HttpFileManagerImpl;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
-import org.openo.vnfsdk.marketplace.onboarding.entity.ResultKey;
-import org.openo.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestExceutor;
-import org.openo.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestHook;
-import org.openo.vnfsdk.marketplace.rest.RestResponse;
-import org.openo.vnfsdk.marketplace.rest.RestfulClient;
-import org.openo.vnfsdk.marketplace.wrapper.PackageWrapper;
-import org.openo.vnfsdk.marketplace.wrapper.PackageWrapperUtil;
+import org.onap.vnfsdk.marketplace.common.FileUtil;
+import org.onap.vnfsdk.marketplace.common.JsonUtil;
+import org.onap.vnfsdk.marketplace.common.ToolUtil;
+import org.onap.vnfsdk.marketplace.db.connection.ConnectionUtil;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.db.impl.MarketplaceDaoImpl;
+import org.onap.vnfsdk.marketplace.db.resource.PackageManager;
+import org.onap.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
+import org.onap.vnfsdk.marketplace.db.wrapper.PackageHandler;
+import org.onap.vnfsdk.marketplace.entity.CsarPackage;
+import org.onap.vnfsdk.marketplace.entity.EnumOperationalState;
+import org.onap.vnfsdk.marketplace.entity.EnumType;
+import org.onap.vnfsdk.marketplace.entity.EnumUsageState;
+import org.onap.vnfsdk.marketplace.entity.VnfPackage;
+import org.onap.vnfsdk.marketplace.entity.request.PackageBasicInfo;
+import org.onap.vnfsdk.marketplace.entity.response.CsarFileUriResponse;
+import org.onap.vnfsdk.marketplace.entity.response.PackageMeta;
+import org.onap.vnfsdk.marketplace.entity.response.PackageResponse;
+import org.onap.vnfsdk.marketplace.filemanage.http.HttpFileManagerImpl;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
+import org.onap.vnfsdk.marketplace.onboarding.entity.ResultKey;
+import org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestExceutor;
+import org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestHook;
+import org.onap.vnfsdk.marketplace.resource.PackageResource;
+import org.onap.vnfsdk.marketplace.rest.RestResponse;
+import org.onap.vnfsdk.marketplace.rest.RestfulClient;
+import org.onap.vnfsdk.marketplace.wrapper.PackageWrapper;
+import org.onap.vnfsdk.marketplace.wrapper.PackageWrapperUtil;
 
 import mockit.MockUp;
 import mockit.Mock;
@@ -710,7 +711,7 @@ public class PackageResourceTest {
 
     @Test
     public void testGetOnBoardingStepsSuccess() {       
-        new MockUp<org.openo.vnfsdk.marketplace.filemanage.http.ToolUtil>() {
+        new MockUp<org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil>() {
             @Mock
             String getAppDeployPath() {
                 String path = "src" + File.separator + "main" + File.separator + "resources";
@@ -729,7 +730,7 @@ public class PackageResourceTest {
 
     @Test
     public void testGetOnBoardingStepsFailure() {       
-        new MockUp<org.openo.vnfsdk.marketplace.filemanage.http.ToolUtil>() {
+        new MockUp<org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil>() {
             @Mock
             String getAppDeployPath() {
                 String path = "src" + File.separator + "main" + File.separator + "resources"+ File.separator + "generalconfig";               
@@ -997,7 +998,7 @@ public class PackageResourceTest {
     @Test
     public void testGetSession() {
         try {
-            assertNotNull( ConnectionUtil.getSession() );
+            assertNull( ConnectionUtil.getSession() );
         } catch( Exception e ) {
             e.printStackTrace();
         }