diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java index 3d967d8dc56..34bf3cfaa3a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java @@ -65,12 +65,9 @@ public class ViewInstanceResourceProviderTest { private static final ViewRegistry viewregistry = createMock(ViewRegistry.class); - static { - ViewRegistry.initInstance(viewregistry); - } - @Before public void before() { + ViewRegistry.initInstance(viewregistry); reset(viewregistry); } diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProviderTest.java index b8ca2ab0b9e..7ccfd920721 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProviderTest.java @@ -50,10 +50,6 @@ public class ViewPermissionResourceProviderTest { private final static PermissionDAO dao = createStrictMock(PermissionDAO.class); private static final ViewRegistry viewRegistry = createMock(ViewRegistry.class); - static { - ViewRegistry.initInstance(viewRegistry); - } - @BeforeClass public static void initClass() { ViewPermissionResourceProvider.init(dao); @@ -61,6 +57,7 @@ public static void initClass() { @Before public void resetGlobalMocks() { + ViewRegistry.initInstance(viewRegistry); reset(dao, viewRegistry); } diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewURLResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewURLResourceProviderTest.java index 8a2af27acba..e3cd84df6ad 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewURLResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewURLResourceProviderTest.java @@ -59,12 +59,9 @@ public class ViewURLResourceProviderTest { private static final ViewRegistry viewregistry = createMock(ViewRegistry.class); - static { - ViewRegistry.initInstance(viewregistry); - } - @Before public void before() throws Exception { + ViewRegistry.initInstance(viewregistry); reset(viewregistry); }