Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update AssertJ to version 3.12.2 

Update the AssertJ dependency to version 3.12.2. Additionally fix
some tests not compiling due to API changes of AssertJ.

Fixes gh-6786
This commit is contained in:
Daniel Meier 2019-05-30 14:22:18 +02:00 committed by Josh Cummings
parent e66369f6c6
commit 56f1991240
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/dependency-management.gradle
View File

@ -143,7 +143,7 @@ dependencyManagement {
dependency 'org.aspectj:aspectjrt:1.9.3' dependency 'org.aspectj:aspectjrt:1.9.3'
dependency 'org.aspectj:aspectjtools:1.9.3' dependency 'org.aspectj:aspectjtools:1.9.3'
dependency 'org.aspectj:aspectjweaver:1.9.3' dependency 'org.aspectj:aspectjweaver:1.9.3'
dependency 'org.assertj:assertj-core:3.11.1' dependency 'org.assertj:assertj-core:3.12.2'
dependency 'org.attoparser:attoparser:2.0.4.RELEASE' dependency 'org.attoparser:attoparser:2.0.4.RELEASE'
dependency 'org.bouncycastle:bcpkix-jdk15on:1.61' dependency 'org.bouncycastle:bcpkix-jdk15on:1.61'
dependency 'org.bouncycastle:bcprov-jdk15on:1.61' dependency 'org.bouncycastle:bcprov-jdk15on:1.61'

4
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/InMemoryClientRegistrationRepositoryTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -91,6 +91,6 @@ public class InMemoryClientRegistrationRepositoryTests {
@Test @Test
public void iteratorWhenGetThenContainsAll() { public void iteratorWhenGetThenContainsAll() {
assertThat(this.clients.iterator()).containsOnly(this.registration); assertThat(this.clients).containsOnly(this.registration);
} }
} }

18
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/InMemoryReactiveClientRegistrationRepositoryTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,18 +16,17 @@
package org.springframework.security.oauth2.client.registration; package org.springframework.security.oauth2.client.registration;
import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.junit.Test;
import reactor.test.StepVerifier;
import java.util.HashMap;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.junit.Before; import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test; import static org.assertj.core.api.Assertions.assertThatThrownBy;
import reactor.test.StepVerifier;
/** /**
* @author Rob Winch * @author Rob Winch
@ -107,7 +106,6 @@ public class InMemoryReactiveClientRegistrationRepositoryTests {
@Test @Test
public void iteratorWhenContainsGithubThenContains() { public void iteratorWhenContainsGithubThenContains() {
assertThat(this.repository.iterator()) assertThat(this.repository).containsOnly(this.registration);
.containsOnly(this.registration);
} }
} }