SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing unstable assertions for annotation

Browse Source 
This can be fixed by recording the wall time and the duration (using monotonic time) and calculating the end time using the duration (also converting them to the right units) but I think it does not worth the effort.
This commit is contained in:
Jonatan Ivanov
2021-08-27 13:12:10 -07:00
parent f781cea815
commit 15f7cc58c2
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/security/SpringSecurityTests.java
View File

@@ -19,7 +19,6 @@ package org.springframework.cloud.sleuth.instrument.security;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.junit.jupiter.api.BeforeEach;
@@ -64,17 +63,12 @@ public abstract class SpringSecurityTests {
@Test
void authenticated_user_should_trigger_events() {
long beforeStart = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis());
ResponseEntity<String> entity = restTemplate.withBasicAuth("user", "password").getForEntity("/", String.class);
long afterStop = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis());
then(entity.getStatusCode().is2xxSuccessful()).isTrue();
then(entity.getBody()).isEqualTo("authenticated");
List<Map.Entry<Long, String>> authEvents = getAuthEvents(testSpanHandler.reportedSpans());
then(authEvents).isNotEmpty()
.allSatisfy(authEvent -> then(authEvent.getKey()).isStrictlyBetween(beforeStart, afterStop));
for (int i = 0; i < authEvents.size(); i += 2) {
String setEvent = authEvents.get(i).getValue();
then(setEvent).isEqualTo("Authentication set UsernamePasswordAuthenticationToken[USER]");
@@ -84,18 +78,13 @@ public abstract class SpringSecurityTests {
}
@Test
void anonymous_should_trigger_events() {
long beforeStart = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis());
void anonymous_user_should_trigger_events() {
ResponseEntity<String> entity = restTemplate.getForEntity("/", String.class);
long afterStop = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis());
then(entity.getStatusCode().is2xxSuccessful()).isTrue();
then(entity.getBody()).contains("html", "form");
List<Map.Entry<Long, String>> authEvents = getAuthEvents(testSpanHandler.reportedSpans());
then(authEvents).isNotEmpty()
.allSatisfy(authEvent -> then(authEvent.getKey()).isStrictlyBetween(beforeStart, afterStop));
for (int i = 0; i < authEvents.size(); i += 2) {
String setEvent = authEvents.get(i).getValue();
then(setEvent).isEqualTo("Authentication set AnonymousAuthenticationToken[ROLE_ANONYMOUS]");