You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2018/02/20 22:26:49 UTC
[ambari] branch trunk updated: [AMBARI-22996]
ViewInstanceResourceProviderTest, ViewPermissionResourceProviderTest,
and ViewURLResourceProviderTest fail unexpectedly (#367)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 78df59c [AMBARI-22996] ViewInstanceResourceProviderTest, ViewPermissionResourceProviderTest, and ViewURLResourceProviderTest fail unexpectedly (#367)
78df59c is described below
commit 78df59c1380d770dbc053063b0368ce89b8907ea
Author: Reed Oei <oe...@gmail.com>
AuthorDate: Tue Feb 20 16:26:47 2018 -0600
[AMBARI-22996] ViewInstanceResourceProviderTest, ViewPermissionResourceProviderTest, and ViewURLResourceProviderTest fail unexpectedly (#367)
---
.../server/controller/internal/ViewInstanceResourceProviderTest.java | 5 +----
.../controller/internal/ViewPermissionResourceProviderTest.java | 5 +----
.../server/controller/internal/ViewURLResourceProviderTest.java | 5 +----
3 files changed, 3 insertions(+), 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 3d967d8..34bf3cf 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 b8ca2ab..7ccfd92 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 class ViewPermissionResourceProviderTest {
@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 8a2af27..e3cd84d 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);
}
--
To stop receiving notification emails like this one, please contact
adoroszlai@apache.org.