Skip to content

[AMBARI-22996] ViewInstanceResourceProviderTest, ViewPermissionResourceProviderTest, and ViewURLResourceProviderTest fail unexpectedly #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 2 commits into from
Feb 20, 2018
Merged

[AMBARI-22996] ViewInstanceResourceProviderTest, ViewPermissionResourceProviderTest, and ViewURLResourceProviderTest fail unexpectedly #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ecd4cd
Fixed tests in ViewInstanceResourceProviderTest, ViewPermissionResour…
ReedOei Feb 14, 2018
d780cfc
[AMBARI-22996] Remove unnecessary static initializer block in ViewIns…
ReedOei Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ...t/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
5 changes: 1 addition & 4 deletions ...java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,14 @@ 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);
}

@Before
public void resetGlobalMocks() {
ViewRegistry.initInstance(viewRegistry);
reset(dao, viewRegistry);
}

Expand Down
5 changes: 1 addition & 4 deletions ...c/test/java/org/apache/ambari/server/controller/internal/ViewURLResourceProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down