-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from aservo/feature/upgrade-confluence-and-oth…
…er-versions Upgrade Confluence and other versions, fix running JUnit 5 tests
- Loading branch information
Showing
26 changed files
with
1,748 additions
and
1,720 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/main/java/de/aservo/confapi/confluence/rest/PingResourceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,63 +5,67 @@ | |
| import com.atlassian.confluence.user.ConfluenceUserImpl; | ||
| import com.atlassian.plugins.rest.common.security.AuthenticationRequiredException; | ||
| import com.atlassian.plugins.rest.common.security.AuthorisationException; | ||
| import com.sun.jersey.spi.container.ContainerRequest; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.MockedStatic; | ||
| import org.mockito.junit.MockitoJUnitRunner; | ||
| import org.mockito.junit.jupiter.MockitoExtension; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertNull; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.Mockito.*; | ||
| import static org.junit.jupiter.api.Assertions.*; | ||
| import static org.mockito.Mockito.mockStatic; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class SysAdminOnlyResourceFilterTest { | ||
| @ExtendWith(MockitoExtension.class) | ||
| class SysAdminOnlyResourceFilterTest { | ||
|
|
||
| private ConfluenceUserImpl user; | ||
|
|
||
| @Mock | ||
| private PermissionManager permissionManager; | ||
| private SysAdminOnlyResourceFilter filter; | ||
|
|
||
| @Before | ||
| private SysAdminOnlyResourceFilter sysAdminOnlyResourceFilter; | ||
|
|
||
| @BeforeEach | ||
| public void setup() { | ||
| user = new ConfluenceUserImpl("test", "test test", "[email protected]"); | ||
| permissionManager = mock(PermissionManager.class); | ||
| filter = new SysAdminOnlyResourceFilter(permissionManager); | ||
| user = new ConfluenceUserImpl("test", "test test", "[email protected]"); | ||
| sysAdminOnlyResourceFilter = new SysAdminOnlyResourceFilter(permissionManager); | ||
| } | ||
|
|
||
| @Test | ||
| public void testFilterDefaults() { | ||
| assertNull(filter.getResponseFilter()); | ||
| assertEquals(filter, filter.getRequestFilter()); | ||
| void testFilterDefaults() { | ||
| assertNull(sysAdminOnlyResourceFilter.getResponseFilter()); | ||
| assertEquals(sysAdminOnlyResourceFilter, sysAdminOnlyResourceFilter.getRequestFilter()); | ||
| } | ||
|
|
||
| @Test(expected = AuthenticationRequiredException.class) | ||
| public void testAdminAccessNoUser() { | ||
| filter.filter(null); | ||
| @Test | ||
| void testAdminAccessNoUser() { | ||
| assertThrows(AuthenticationRequiredException.class, () -> { | ||
| sysAdminOnlyResourceFilter.filter(null); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSysAdminAccess() { | ||
| void testSysAdminAccess() { | ||
| when(permissionManager.isSystemAdministrator(user)).thenReturn(Boolean.TRUE); | ||
|
|
||
| try (MockedStatic<AuthenticatedUserThreadLocal> authenticatedUserThreadLocalMockedStatic = mockStatic(AuthenticatedUserThreadLocal.class)) { | ||
| authenticatedUserThreadLocalMockedStatic.when(AuthenticatedUserThreadLocal::get).thenReturn(user); | ||
|
|
||
| ContainerRequest filterResponse = filter.filter(null); | ||
| assertNull(filterResponse); | ||
| assertNull(sysAdminOnlyResourceFilter.filter(null)); | ||
| } | ||
| } | ||
|
|
||
| @Test(expected = AuthorisationException.class) | ||
| public void testNonSysAdminAccess() { | ||
| @Test | ||
| void testNonSysAdminAccess() { | ||
| when(permissionManager.isSystemAdministrator(user)).thenReturn(Boolean.FALSE); | ||
|
|
||
| try (MockedStatic<AuthenticatedUserThreadLocal> authenticatedUserThreadLocalMockedStatic = mockStatic(AuthenticatedUserThreadLocal.class)) { | ||
| authenticatedUserThreadLocalMockedStatic.when(AuthenticatedUserThreadLocal::get).thenReturn(user); | ||
|
|
||
| filter.filter(any(ContainerRequest.class)); | ||
| assertThrows(AuthorisationException.class, () -> { | ||
| sysAdminOnlyResourceFilter.filter(null); | ||
| }); | ||
| } | ||
| } | ||
| } | ||
14 changes: 7 additions & 7 deletions
14
src/test/java/de/aservo/confapi/confluence/model/type/DefaultAuthenticationScenarioTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.