From 3afbe236f240c3f35093d58999f8b5882cd9dd2e Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Mon, 30 Sep 2013 11:57:18 -0700 Subject: [PATCH] Fix build failure in usermanager.implementation ISSUE: Current usermanager.implementation junit code assumes test functions are run in order. There is a add function and then a remove function to add/remove an object from a map. In some machines consistently the remove function is invoked by junit first. This leads to a failure/succes/failure/success... pattern for usermanager.implementation builds. Change-Id: Ie5041c6980f9dad0aeb1f11a27c0c3e9bab9dbcf Signed-off-by: Alessandro Boch --- .../internal/UserManagerImplTest.java | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java b/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java index 67c273b73f..f2cbe784fc 100644 --- a/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java +++ b/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java @@ -104,15 +104,9 @@ public class UserManagerImplTest { } } - /** - * Test method for - * {@link org.opendaylight.controller.usermanager.internal.UserManager#addAAAProvider(org.opendaylight.controller.usermanager.IAAAProvider)} - * . - */ - @Test - public void testAddAAAProvider() { + private IAAAProvider getAnonymousAAAProvider(final String providerName) { // instantiate an anonymous AAAProvider - IAAAProvider a3p = new IAAAProvider() { + return new IAAAProvider() { @Override public AuthResponse authService(String userName, String password, @@ -122,25 +116,26 @@ public class UserManagerImplTest { @Override public String getName() { - return "dummyAAAProvider"; + return providerName; } }; - - um.addAAAProvider(a3p); - assertEquals(a3p, um.getAAAProvider("dummyAAAProvider")); - } /** * Test method for + * {@link org.opendaylight.controller.usermanager.internal.UserManager#addAAAProvider(org.opendaylight.controller.usermanager.IAAAProvider)} + * and for * {@link org.opendaylight.controller.usermanager.internal.UserManager#removeAAAProvider(org.opendaylight.controller.usermanager.IAAAProvider)} - * and for for + * and * {@link org.opendaylight.controller.usermanager.internal.UserManager#getAAAProvider(java.lang.String)} - * . */ @Test - public void testRemoveAAAProvider() { - um.removeAAAProvider(um.getAAAProvider("dummyAAAProvider")); + public void testAddGetRemoveAAAProvider() { + final String providerName = "dummyAAAProvider"; + IAAAProvider a3p = getAnonymousAAAProvider(providerName); + um.addAAAProvider(a3p); + assertEquals(a3p, um.getAAAProvider(providerName)); + um.removeAAAProvider(um.getAAAProvider(providerName)); assertTrue(um.getAAAProviderNames().isEmpty()); } -- 2.36.6