mirror of
				https://github.com/spring-projects/spring-security.git
				synced 2025-10-31 14:48:54 +00:00 
			
		
		
		
	Fix JDK 10+
Issue gh-7265
This commit is contained in:
		
							parent
							
								
									0c6bff4afb
								
							
						
					
					
						commit
						9d63c36f93
					
				| @ -44,7 +44,7 @@ import org.springframework.security.web.context.SecurityContextRepository; | |||||||
| 
 | 
 | ||||||
| @RunWith(PowerMockRunner.class) | @RunWith(PowerMockRunner.class) | ||||||
| @PrepareOnlyThisForTest(WebTestUtils.class) | @PrepareOnlyThisForTest(WebTestUtils.class) | ||||||
| @PowerMockIgnore("javax.security.auth.*") | @PowerMockIgnore({"javax.security.auth.*", "org.w3c.dom.*", "org.xml.sax.*", "org.apache.xerces.*", "javax.xml.parsers.*"}) | ||||||
| public class SecurityMockMvcRequestPostProcessorsAuthenticationTests { | public class SecurityMockMvcRequestPostProcessorsAuthenticationTests { | ||||||
| 	@Captor | 	@Captor | ||||||
| 	private ArgumentCaptor<SecurityContext> contextCaptor; | 	private ArgumentCaptor<SecurityContext> contextCaptor; | ||||||
|  | |||||||
| @ -32,6 +32,7 @@ import org.junit.runner.RunWith; | |||||||
| import org.mockito.ArgumentCaptor; | import org.mockito.ArgumentCaptor; | ||||||
| import org.mockito.Captor; | import org.mockito.Captor; | ||||||
| import org.mockito.Mock; | import org.mockito.Mock; | ||||||
|  | import org.powermock.core.classloader.annotations.PowerMockIgnore; | ||||||
| import org.powermock.core.classloader.annotations.PrepareOnlyThisForTest; | import org.powermock.core.classloader.annotations.PrepareOnlyThisForTest; | ||||||
| import org.powermock.modules.junit4.PowerMockRunner; | import org.powermock.modules.junit4.PowerMockRunner; | ||||||
| import org.springframework.mock.web.MockHttpServletRequest; | import org.springframework.mock.web.MockHttpServletRequest; | ||||||
| @ -42,6 +43,7 @@ import org.springframework.security.web.context.SecurityContextRepository; | |||||||
| 
 | 
 | ||||||
| @RunWith(PowerMockRunner.class) | @RunWith(PowerMockRunner.class) | ||||||
| @PrepareOnlyThisForTest(WebTestUtils.class) | @PrepareOnlyThisForTest(WebTestUtils.class) | ||||||
|  | @PowerMockIgnore({"javax.security.auth.*", "org.w3c.dom.*", "org.xml.sax.*", "org.apache.xerces.*", "javax.xml.parsers.*"}) | ||||||
| public class SecurityMockMvcRequestPostProcessorsSecurityContextTests { | public class SecurityMockMvcRequestPostProcessorsSecurityContextTests { | ||||||
| 	@Captor | 	@Captor | ||||||
| 	private ArgumentCaptor<SecurityContext> contextCaptor; | 	private ArgumentCaptor<SecurityContext> contextCaptor; | ||||||
|  | |||||||
| @ -29,6 +29,7 @@ import org.junit.Before; | |||||||
| import org.junit.Test; | import org.junit.Test; | ||||||
| import org.junit.runner.RunWith; | import org.junit.runner.RunWith; | ||||||
| import org.mockito.Mock; | import org.mockito.Mock; | ||||||
|  | import org.powermock.core.classloader.annotations.PowerMockIgnore; | ||||||
| import org.powermock.core.classloader.annotations.PrepareOnlyThisForTest; | import org.powermock.core.classloader.annotations.PrepareOnlyThisForTest; | ||||||
| import org.powermock.modules.junit4.PowerMockRunner; | import org.powermock.modules.junit4.PowerMockRunner; | ||||||
| import org.springframework.mock.web.MockHttpServletRequest; | import org.springframework.mock.web.MockHttpServletRequest; | ||||||
| @ -39,6 +40,7 @@ import org.springframework.security.web.context.SecurityContextRepository; | |||||||
| 
 | 
 | ||||||
| @RunWith(PowerMockRunner.class) | @RunWith(PowerMockRunner.class) | ||||||
| @PrepareOnlyThisForTest(WebTestUtils.class) | @PrepareOnlyThisForTest(WebTestUtils.class) | ||||||
|  | @PowerMockIgnore({"javax.security.auth.*", "org.w3c.dom.*", "org.xml.sax.*", "org.apache.xerces.*", "javax.xml.parsers.*"}) | ||||||
| public class SecurityMockMvcRequestPostProcessorsTestSecurityContextTests { | public class SecurityMockMvcRequestPostProcessorsTestSecurityContextTests { | ||||||
| 	@Mock | 	@Mock | ||||||
| 	private SecurityContext context; | 	private SecurityContext context; | ||||||
| @ -81,4 +83,4 @@ public class SecurityMockMvcRequestPostProcessorsTestSecurityContextTests { | |||||||
| 		spy(WebTestUtils.class); | 		spy(WebTestUtils.class); | ||||||
| 		when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository); | 		when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository); | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  | |||||||
| @ -32,6 +32,7 @@ import org.junit.runner.RunWith; | |||||||
| import org.mockito.ArgumentCaptor; | import org.mockito.ArgumentCaptor; | ||||||
| import org.mockito.Captor; | import org.mockito.Captor; | ||||||
| import org.mockito.Mock; | import org.mockito.Mock; | ||||||
|  | import org.powermock.core.classloader.annotations.PowerMockIgnore; | ||||||
| import org.powermock.core.classloader.annotations.PrepareOnlyThisForTest; | import org.powermock.core.classloader.annotations.PrepareOnlyThisForTest; | ||||||
| import org.powermock.modules.junit4.PowerMockRunner; | import org.powermock.modules.junit4.PowerMockRunner; | ||||||
| import org.springframework.mock.web.MockHttpServletRequest; | import org.springframework.mock.web.MockHttpServletRequest; | ||||||
| @ -44,6 +45,7 @@ import org.springframework.security.web.context.SecurityContextRepository; | |||||||
| 
 | 
 | ||||||
| @RunWith(PowerMockRunner.class) | @RunWith(PowerMockRunner.class) | ||||||
| @PrepareOnlyThisForTest(WebTestUtils.class) | @PrepareOnlyThisForTest(WebTestUtils.class) | ||||||
|  | @PowerMockIgnore({"javax.security.auth.*", "org.w3c.dom.*", "org.xml.sax.*", "org.apache.xerces.*", "javax.xml.parsers.*"}) | ||||||
| public class SecurityMockMvcRequestPostProcessorsUserDetailsTests { | public class SecurityMockMvcRequestPostProcessorsUserDetailsTests { | ||||||
| 	@Captor | 	@Captor | ||||||
| 	private ArgumentCaptor<SecurityContext> contextCaptor; | 	private ArgumentCaptor<SecurityContext> contextCaptor; | ||||||
|  | |||||||
| @ -35,6 +35,7 @@ import org.junit.runner.RunWith; | |||||||
| import org.mockito.ArgumentCaptor; | import org.mockito.ArgumentCaptor; | ||||||
| import org.mockito.Captor; | import org.mockito.Captor; | ||||||
| import org.mockito.Mock; | import org.mockito.Mock; | ||||||
|  | import org.powermock.core.classloader.annotations.PowerMockIgnore; | ||||||
| import org.powermock.core.classloader.annotations.PrepareOnlyThisForTest; | import org.powermock.core.classloader.annotations.PrepareOnlyThisForTest; | ||||||
| import org.powermock.modules.junit4.PowerMockRunner; | import org.powermock.modules.junit4.PowerMockRunner; | ||||||
| import org.springframework.mock.web.MockHttpServletRequest; | import org.springframework.mock.web.MockHttpServletRequest; | ||||||
| @ -47,6 +48,7 @@ import org.springframework.security.web.context.SecurityContextRepository; | |||||||
| 
 | 
 | ||||||
| @RunWith(PowerMockRunner.class) | @RunWith(PowerMockRunner.class) | ||||||
| @PrepareOnlyThisForTest(WebTestUtils.class) | @PrepareOnlyThisForTest(WebTestUtils.class) | ||||||
|  | @PowerMockIgnore({"javax.security.auth.*", "org.w3c.dom.*", "org.xml.sax.*", "org.apache.xerces.*", "javax.xml.parsers.*"}) | ||||||
| public class SecurityMockMvcRequestPostProcessorsUserTests { | public class SecurityMockMvcRequestPostProcessorsUserTests { | ||||||
| 	@Captor | 	@Captor | ||||||
| 	private ArgumentCaptor<SecurityContext> contextCaptor; | 	private ArgumentCaptor<SecurityContext> contextCaptor; | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user