Fix incorrect package names

Fix Eclipse compilation errors caused by incorrect
or mismatching package names

Change-Id: Ic50398b5193041df95f68a4a6606638aea0b0398
Signed-off-by: Gary Wu <gary.wu1@huawei.com>

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java
index 07070e33712056bf7936e6dd8d004722b96b303d..7a4da7ac635a3c8d231dfd35caa0ccc2211ca753 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package user.tenantmanager;
+package org.opendaylight.nemo.user.tenantmanager;
 
 import junit.framework.TestCase;
 import org.junit.Assert;
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.*;
 public class AAATest extends TestCase {
     private TenantManage tenantManage;
     private AAA aaa;
+    @Override
     @Before
     public void setUp() throws Exception {
         tenantManage = mock(TenantManage.class);

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/RegisterUserTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/RegisterUserTest.java
index 60f7fc4a8a295ea8605dd530b04e5b2b8da1fc68..36f5f442feb28beb8fc3860ac45828f1d1af0a3b 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/RegisterUserTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/RegisterUserTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package user.tenantmanager;
+package org.opendaylight.nemo.user.tenantmanager;
 
 import junit.framework.TestCase;
 import org.junit.Assert;
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.*;
 public class RegisterUserTest extends TestCase {
     private TenantManage tenantManage;
     private RegisterUser registerUser;
+    @Override
     @Before
     public void setUp() throws Exception {
         tenantManage = mock(TenantManage.class);
@@ -62,7 +63,7 @@ public class RegisterUserTest extends TestCase {
         Assert.assertTrue(registerUser.registerUser(input).equals("The role is not defined in the data store."));
         verify(input).getUserRole();
         Assert.assertTrue(!userRoles.containsKey(new UserRoleName("admin")));
-        
+
         users.put(userId,user);
         when(input.getUserId())
                 .thenReturn(userId)

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionBeginTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionBeginTest.java
index 4f4964dfd09f64cce878900bdbdc5a3fcfb30dfc..ffc4d544ae4a2ee1ea9e426e8f96b7780a17cbef 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionBeginTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionBeginTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package user.transactionmanager;\r
+package org.opendaylight.nemo.user.transactionmanager;\r
 \r
 import junit.framework.TestCase;\r
 import org.junit.Assert;\r
@@ -24,6 +24,7 @@ public class TransactionBeginTest extends TestCase {
     private AAA aaa;\r
     private BeginTransactionInput input;\r
     private TransactionBegin transactionBegin;\r
+    @Override\r
     @Before\r
     public void setUp() throws Exception {\r
         aaa = mock(AAA.class);\r

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionEndTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionEndTest.java
index f90b4994bce0baaf0d063e4b2fc8ef659f6aef76..cfde6262493acd18273c73ae27f4920eee9052f4 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionEndTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionEndTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package user.transactionmanager;\r
+package org.opendaylight.nemo.user.transactionmanager;\r
 \r
 import junit.framework.TestCase;\r
 import org.junit.Assert;\r
@@ -24,6 +24,7 @@ public class TransactionEndTest extends TestCase {
     private AAA aaa;\r
     private EndTransactionInput input;\r
     private TransactionEnd transactionEnd;\r
+    @Override\r
     @Before\r
     public void setUp() throws Exception {\r
         aaa = mock(AAA.class);\r

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/LanguageIntentTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/LanguageIntentTest.java
index 1859fc3df7f7f4be67aea875c245cb195368a87e..8d091b5798937bb22cd1f33b6bbdc19e024c0e60 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/LanguageIntentTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/LanguageIntentTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package user.vnspacemanager.languagestyle;
+package org.opendaylight.nemo.user.vnspacemanager.languagestyle;
 
 import org.opendaylight.nemo.user.vnspacemanager.languagestyle.LanguageIntent;
 

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/NEMOParse/SimpleCharStreamTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/NEMOParse/SimpleCharStreamTest.java
index 02a5fd223f5760f456dc75f2838b8f40ab3e6e77..97e4825a0bf8895b1bab9e684f8bf1e47463391f 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/NEMOParse/SimpleCharStreamTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/NEMOParse/SimpleCharStreamTest.java
@@ -7,7 +7,7 @@
  */
 /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 5.0 */
 /* JavaCCOptions:STATIC=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package user.vnspacemanager.languagestyle.NEMOParse;
+package org.opendaylight.nemo.user.vnspacemanager.languagestyle.NEMOParse;
 
 import junit.framework.TestCase;
 import org.junit.Assert;
@@ -32,6 +32,7 @@ public class SimpleCharStreamTest extends TestCase {
     private Reader reader_empty;
     private Class<SimpleCharStream> class1 ;
     private Field field;
+    @Override
     @Before
     public void setUp() throws Exception {
         class1 = SimpleCharStream.class;

diff --git a/nemo-renderers/openflow-renderer/src/test/java/org/opendaylight/nemo/renderer/openflow/physicalnetwork/PhyConfigLoaderTest.java b/nemo-renderers/openflow-renderer/src/test/java/org/opendaylight/nemo/renderer/openflow/physicalnetwork/PhyConfigLoaderTest.java
index c9f6748f840ed0f75b51380dae4258a3711f05b8..dab04583653f0ae8f56a5c4fbcdd0e2341b40045 100644 (file)
--- a/nemo-renderers/openflow-renderer/src/test/java/org/opendaylight/nemo/renderer/openflow/physicalnetwork/PhyConfigLoaderTest.java
+++ b/nemo-renderers/openflow-renderer/src/test/java/org/opendaylight/nemo/renderer/openflow/physicalnetwork/PhyConfigLoaderTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.nemo.renderer.openflow.phtysicalnetwork;\r
+package org.opendaylight.nemo.renderer.openflow.physicalnetwork;\r
 \r
 import junit.framework.TestCase;\r
 import org.junit.Assert;\r
@@ -57,6 +57,7 @@ import static org.mockito.Mockito.*;
 public class PhyConfigLoaderTest extends TestCase {\r
     private PhyConfigLoader phyConfigLoader;\r
     private DataBroker dataBroker;\r
+    @Override\r
     @Before\r
     public void setUp() throws Exception {\r
         dataBroker = mock(DataBroker.class);\r