From 0ecd4cd1e9423ff1d3200b1cc38d2e08eebad091 Mon Sep 17 00:00:00 2001 From: Reed Oei Date: Wed, 14 Feb 2018 16:43:11 -0600 Subject: [PATCH 1/2] Fixed tests in ViewInstanceResourceProviderTest, ViewPermissionResourceProviderTest, and ViewURLResourceProviderTest. --- .../controller/internal/ViewInstanceResourceProviderTest.java | 1 + .../controller/internal/ViewPermissionResourceProviderTest.java | 1 + .../server/controller/internal/ViewURLResourceProviderTest.java | 1 + 3 files changed, 3 insertions(+) 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..e9ff5119afa 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 @@ -71,6 +71,7 @@ public class ViewInstanceResourceProviderTest { @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..9c80600b2cb 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 @@ -61,6 +61,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..3c7fc82055d 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 @@ -65,6 +65,7 @@ public class ViewURLResourceProviderTest { @Before public void before() throws Exception { + ViewRegistry.initInstance(viewregistry); reset(viewregistry); } From d780cfc43dbb7ff2475f467c2c650d952237b71f Mon Sep 17 00:00:00 2001 From: Reed Oei Date: Tue, 20 Feb 2018 12:45:40 -0600 Subject: [PATCH 2/2] [AMBARI-22996] Remove unnecessary static initializer block in ViewInstanceResourceProviderTest, ViewPermissionResourceProviderTest, and ViewURLResourceProviderTest. --- .../controller/internal/ViewInstanceResourceProviderTest.java | 4 ---- .../internal/ViewPermissionResourceProviderTest.java | 4 ---- .../controller/internal/ViewURLResourceProviderTest.java | 4 ---- 3 files changed, 12 deletions(-) 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 e9ff5119afa..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,10 +65,6 @@ public class ViewInstanceResourceProviderTest { private static final ViewRegistry viewregistry = createMock(ViewRegistry.class); - static { - ViewRegistry.initInstance(viewregistry); - } - @Before public void before() { ViewRegistry.initInstance(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 9c80600b2cb..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); 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 3c7fc82055d..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,10 +59,6 @@ public class ViewURLResourceProviderTest { private static final ViewRegistry viewregistry = createMock(ViewRegistry.class); - static { - ViewRegistry.initInstance(viewregistry); - } - @Before public void before() throws Exception { ViewRegistry.initInstance(viewregistry);