Security/ Package Name changes

[portal.git] / ecomp-portal-BE-common / src / test / java / org / onap / portalapp / portal / transport / CentralUserTest.java

diff --git a/ecomp-portal-BE-common/src/test/java/org/openecomp/portalapp/portal/transport/CentralUserTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserTest.java
similarity index 70%
rename from ecomp-portal-BE-common/src/test/java/org/openecomp/portalapp/portal/transport/CentralUserTest.java
rename to ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserTest.java
index aad881b..67c6ee0 100644 (file)
--- a/ecomp-portal-BE-common/src/test/java/org/openecomp/portalapp/portal/transport/CentralUserTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserTest.java
@@ -2,11 +2,11 @@
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================

- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed

- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");

  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *


@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *


@@ -35,7 +35,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */

-package org.openecomp.portalapp.portal.transport;
+package org.onap.portalapp.portal.transport;

 
 import static org.junit.Assert.*;
 
 
 import static org.junit.Assert.*;
 


@@ -43,16 +43,16 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Test;
 import java.util.Set;
 
 import org.junit.Test;

-import org.openecomp.portalapp.portal.transport.CentralRole;
-import org.openecomp.portalapp.portal.transport.CentralUser;
-import org.openecomp.portalapp.portal.transport.CentralUserApp;
+import org.onap.portalapp.portal.transport.CentralV2Role;
+import org.onap.portalapp.portal.transport.CentralV2User;
+import org.onap.portalapp.portal.transport.CentralV2UserApp;

 
 public class CentralUserTest {
 
 
 public class CentralUserTest {
 

-       public CentralUser mockCentralUser(){
-               Set<CentralUserApp> userApps = new HashSet<CentralUserApp>();
-               Set<CentralRole> pseudoRoles = new HashSet<CentralRole>();
-               CentralUser centralUser = new CentralUser((long)1, null, null, (long)1, (long)1, (long)1, (long)1,
+       public CentralV2User mockCentralUser(){
+               Set<CentralV2UserApp> userApps = new HashSet<CentralV2UserApp>();
+               Set<CentralV2Role> pseudoRoles = new HashSet<CentralV2Role>();
+               CentralV2User centralV2User = new CentralV2User((long)1, null, null, (long)1, (long)1, (long)1, (long)1,

                                (long)1, "test", "test", "test", "test", "test",
                                "test", "test", (long)1, "test", "test", "test",
                                "test", "test", "test", "test", "test", "test", "test",
                                (long)1, "test", "test", "test", "test", "test",
                                "test", "test", (long)1, "test", "test", "test",
                                "test", "test", "test", "test", "test", "test", "test",


@@ -62,16 +62,16 @@ public class CentralUserTest {
                                "test", "test", "test", "test", null,
                                false, false, (long)1, (long)1, false, "test", userApps, pseudoRoles);
                
                                "test", "test", "test", "test", null,
                                false, false, (long)1, (long)1, false, "test", userApps, pseudoRoles);
                

-               return centralUser;
+               return centralV2User;

        }
        
        @Test
        public void centralRoleTest(){
        }
        
        @Test
        public void centralRoleTest(){

-               CentralUser centralUser = mockCentralUser();
+               CentralV2User centralV2User = mockCentralUser();

                
                

-               Set<CentralUserApp> userApps = new HashSet<CentralUserApp>();
-               Set<CentralRole> pseudoRoles = new HashSet<CentralRole>();
-               CentralUser centralUser1 = new CentralUser((long)1, null, null, (long)1, (long)1, (long)1, (long)1,
+               Set<CentralV2UserApp> userApps = new HashSet<CentralV2UserApp>();
+               Set<CentralV2Role> pseudoRoles = new HashSet<CentralV2Role>();
+               CentralV2User centralV2User1 = new CentralV2User((long)1, null, null, (long)1, (long)1, (long)1, (long)1,

                                (long)1, "test", "test", "test", "test", "test",
                                "test", "test", (long)1, "test", "test", "test",
                                "test", "test", "test", "test", "test", "test", "test",
                                (long)1, "test", "test", "test", "test", "test",
                                "test", "test", (long)1, "test", "test", "test",
                                "test", "test", "test", "test", "test", "test", "test",


@@ -82,8 +82,8 @@ public class CentralUserTest {
                                false, false, (long)1, (long)1, false, "test", userApps, pseudoRoles);
                
                
                                false, false, (long)1, (long)1, false, "test", userApps, pseudoRoles);
                
                

-               assertEquals(centralUser, centralUser1);
-               assertEquals(centralUser.hashCode(), centralUser1.hashCode());
-               assertTrue(centralUser.equals(centralUser1));
+               assertEquals(centralV2User, centralV2User1);
+               assertEquals(centralV2User.hashCode(), centralV2User1.hashCode());
+               assertTrue(centralV2User.equals(centralV2User1));

        }
 }
        }
 }