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

Unbind subjects after test

Browse Source
This commit is contained in:
René Pfeuffer
2018-08-29 10:16:02 +02:00
parent 9911b3ade1
commit 686dd08d3c
3 changed files with 17 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/BrowserResultToBrowserResultDtoMapperTest.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.mockito.InjectMocks; import org.mockito.InjectMocks;
@@ -61,6 +62,11 @@ public class BrowserResultToBrowserResultDtoMapperTest {
fileObject2.setDirectory(true); fileObject2.setDirectory(true);
} }
@After
public void unbind() {
ThreadContext.unbindSubject();
}
@Test @Test
public void shouldMapAttributesCorrectly() { public void shouldMapAttributesCorrectly() {
BrowserResult browserResult = createBrowserResult(); BrowserResult browserResult = createBrowserResult();

5
scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.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.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -40,6 +41,10 @@ public class FileObjectToFileObjectDtoMapperTest {
ThreadContext.bind(subject); ThreadContext.bind(subject);
} }
@After
public void unbind() {
ThreadContext.unbindSubject();
}
@Test @Test
public void shouldMapAttributesCorrectly() { public void shouldMapAttributesCorrectly() {

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

@@ -18,6 +18,7 @@ import org.jboss.resteasy.mock.MockDispatcherFactory;
import org.jboss.resteasy.mock.MockHttpRequest; import org.jboss.resteasy.mock.MockHttpRequest;
import org.jboss.resteasy.mock.MockHttpResponse; import org.jboss.resteasy.mock.MockHttpResponse;
import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.HttpRequest;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@@ -146,6 +147,11 @@ public class PermissionRootResourceTest {
dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class); dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
} }
@After
public void unbind() {
ThreadContext.unbindSubject();
}
@TestFactory @TestFactory
@DisplayName("test endpoints on missing repository") @DisplayName("test endpoints on missing repository")
Stream<DynamicTest> missedRepositoryTestFactory() { Stream<DynamicTest> missedRepositoryTestFactory() {