Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 18:51:10 +01:00
Code Issues Packages Projects Releases Activity

Cleanup shiro after test

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-08 10:56:46 +02:00
parent 38ad423f3d
commit fb27c0d40c
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java
View File

@@ -4,6 +4,7 @@ import org.apache.shiro.subject.Subject;
import org.apache.shiro.subject.support.SubjectThreadState; import org.apache.shiro.subject.support.SubjectThreadState;
import org.apache.shiro.util.ThreadContext; import org.apache.shiro.util.ThreadContext;
import org.apache.shiro.util.ThreadState; import org.apache.shiro.util.ThreadState;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
@@ -38,6 +39,11 @@ public class User2UserDtoMapperTest {
ThreadContext.bind(subject); ThreadContext.bind(subject);
} }
@After
public void unbindSubject() {
ThreadContext.unbindSubject();
}
@Test @Test
public void shouldMapLinks_forUpdate() { public void shouldMapLinks_forUpdate() {
User user = createDefaultUser(); User user = createDefaultUser();

6
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollection2DtoMapperTest.java
View File

@@ -5,6 +5,7 @@ import org.apache.shiro.subject.Subject;
import org.apache.shiro.subject.support.SubjectThreadState; import org.apache.shiro.subject.support.SubjectThreadState;
import org.apache.shiro.util.ThreadContext; import org.apache.shiro.util.ThreadContext;
import org.apache.shiro.util.ThreadState; import org.apache.shiro.util.ThreadState;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import sonia.scm.PageResult; import sonia.scm.PageResult;
@@ -42,6 +43,11 @@ public class UserCollection2DtoMapperTest {
ThreadContext.bind(subject); ThreadContext.bind(subject);
} }
@After
public void unbindSubject() {
ThreadContext.unbindSubject();
}
@Test @Test
public void shouldSetPageNumber() { public void shouldSetPageNumber() {
PageResult<User> pageResult = mockPageResult(true, "Hannes"); PageResult<User> pageResult = mockPageResult(true, "Hannes");