From f3e415ee9b5daba714d300da3b4ad26b7514f7e2 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 7 Jan 2016 10:35:57 -0800 Subject: [PATCH] Fix incorrect package names Fix Eclipse compilation errors caused by incorrect or mismatching package names Change-Id: Ic50398b5193041df95f68a4a6606638aea0b0398 Signed-off-by: Gary Wu --- .../org/opendaylight/nemo/user/tenantmanager/AAATest.java | 3 ++- .../nemo/user/tenantmanager/RegisterUserTest.java | 5 +++-- .../nemo/user/transactionmanager/TransactionBeginTest.java | 3 ++- .../nemo/user/transactionmanager/TransactionEndTest.java | 3 ++- .../vnspacemanager/languagestyle/LanguageIntentTest.java | 2 +- .../languagestyle/NEMOParse/SimpleCharStreamTest.java | 3 ++- .../openflow/physicalnetwork/PhyConfigLoaderTest.java | 3 ++- 7 files changed, 14 insertions(+), 8 deletions(-) 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 07070e3..7a4da7a 100644 --- 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 60f7fc4..36f5f44 100644 --- 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 4f4964d..ffc4d54 100644 --- 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, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package user.transactionmanager; +package org.opendaylight.nemo.user.transactionmanager; import junit.framework.TestCase; import org.junit.Assert; @@ -24,6 +24,7 @@ public class TransactionBeginTest extends TestCase { private AAA aaa; private BeginTransactionInput input; private TransactionBegin transactionBegin; + @Override @Before public void setUp() throws Exception { aaa = mock(AAA.class); 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 f90b499..cfde626 100644 --- 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, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package user.transactionmanager; +package org.opendaylight.nemo.user.transactionmanager; import junit.framework.TestCase; import org.junit.Assert; @@ -24,6 +24,7 @@ public class TransactionEndTest extends TestCase { private AAA aaa; private EndTransactionInput input; private TransactionEnd transactionEnd; + @Override @Before public void setUp() throws Exception { aaa = mock(AAA.class); 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 1859fc3..8d091b5 100644 --- 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 02a5fd2..97e4825 100644 --- 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 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 c9f6748..dab0458 100644 --- 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, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.nemo.renderer.openflow.phtysicalnetwork; +package org.opendaylight.nemo.renderer.openflow.physicalnetwork; import junit.framework.TestCase; import org.junit.Assert; @@ -57,6 +57,7 @@ import static org.mockito.Mockito.*; public class PhyConfigLoaderTest extends TestCase { private PhyConfigLoader phyConfigLoader; private DataBroker dataBroker; + @Override @Before public void setUp() throws Exception { dataBroker = mock(DataBroker.class); -- 2.36.6