From 2420c9141c4608295925c5cb7e5806380f39b0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 31 Aug 2018 08:46:56 +0200
Subject: [PATCH] Unbind subjects after unit tests

---
 .../sonia/scm/api/v2/resources/BranchRootResourceTest.java  | 6 ++++++
 .../scm/api/v2/resources/ChangesetRootResourceTest.java     | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
index c7f0b128df..e23d3dc39b 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
@@ -10,6 +10,7 @@ import org.jboss.resteasy.core.Dispatcher;
 import org.jboss.resteasy.mock.MockDispatcherFactory;
 import org.jboss.resteasy.mock.MockHttpRequest;
 import org.jboss.resteasy.mock.MockHttpResponse;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -105,6 +106,11 @@ public class BranchRootResourceTest {
     when(subject.isPermitted(any(String.class))).thenReturn(true);
   }
 
+  @After
+  public void cleanupContext() {
+    ThreadContext.unbindSubject();
+  }
+
   @Test
   public void shouldHandleMissingBranch() throws Exception {
     when(branchesCommandBuilder.getBranches()).thenReturn(new Branches());
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
index cb9c545041..8be8866395 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
@@ -11,6 +11,7 @@ import org.jboss.resteasy.core.Dispatcher;
 import org.jboss.resteasy.mock.MockDispatcherFactory;
 import org.jboss.resteasy.mock.MockHttpRequest;
 import org.jboss.resteasy.mock.MockHttpResponse;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -103,6 +104,11 @@ public class ChangesetRootResourceTest {
     when(subject.isPermitted(any(String.class))).thenReturn(true);
   }
 
+  @After
+  public void cleanupContext() {
+    ThreadContext.unbindSubject();
+  }
+
   @Test
   public void shouldGetChangeSets() throws Exception {
     String id = "revision_123";