[ambari] 02/02: AMBARI-22837. Remove mocked SecurityContext in AmbariAuthorizationFilterTest.

[rlevas]

This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 91462df2291e0cccccb5a1b66d006b9101307e9c
Author: Reed Oei <oei.r...@gmail.com>
AuthorDate: Fri Jan 26 10:14:14 2018 -0600

    AMBARI-22837. Remove mocked SecurityContext in 
AmbariAuthorizationFilterTest.
---
 .../authorization/AmbariAuthorizationFilterTest.java       | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java
index 9eaba06..112bea6 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java
@@ -44,10 +44,8 @@ import org.apache.ambari.server.state.stack.OsFamily;
 import org.apache.ambari.server.view.ViewRegistry;
 import org.easymock.EasyMock;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
@@ -61,11 +59,6 @@ import com.google.inject.Injector;
 import junit.framework.Assert;
 
 public class AmbariAuthorizationFilterTest {
-  @Before
-  public void setUp() {
-    SecurityContextHolder.getContext().setAuthentication(null);
-  }
-
   @After
   public void clearAuthentication() {
     SecurityContextHolder.getContext().setAuthentication(null);
@@ -362,7 +355,7 @@ public class AmbariAuthorizationFilterTest {
    * @throws Exception if an exception occurs
    */
   private void performGeneralDoFilterTest(Authentication authentication, 
Table<String, String, Boolean> urlTests, boolean expectRedirect) throws 
Exception {
-    final SecurityContext securityContext = 
createNiceMock(SecurityContext.class);
+    SecurityContextHolder.getContext().setAuthentication(authentication);
     final FilterConfig filterConfig = createNiceMock(FilterConfig.class);
 
     final Configuration configuration = 
EasyMock.createMock(Configuration.class);
@@ -385,12 +378,11 @@ public class AmbariAuthorizationFilterTest {
 
     
expect(filterConfig.getInitParameter("realm")).andReturn("AuthFilter").anyTimes();
 
-    expect(filter.getSecurityContext()).andReturn(securityContext).anyTimes();
+    
expect(filter.getSecurityContext()).andReturn(SecurityContextHolder.getContext()).anyTimes();
     expect(filter.getViewRegistry()).andReturn(viewRegistry).anyTimes();
-    
expect(securityContext.getAuthentication()).andReturn(authentication).anyTimes();
     expect(viewRegistry.checkPermission(EasyMock.eq("DeniedView"), 
EasyMock.anyObject(), EasyMock.anyObject(), 
EasyMock.anyBoolean())).andReturn(false).anyTimes();
 
-    replay(filterConfig, filter, securityContext, viewRegistry, configuration, 
auditLogger);
+    replay(filterConfig, filter, viewRegistry, configuration, auditLogger);
 
     for (final Cell<String, String, Boolean> urlTest: urlTests.cellSet()) {
       final FilterChain chain = EasyMock.createStrictMock(FilterChain.class);

-- 
To stop receiving notification emails like this one, please contact
rle...@apache.org.