Skip to content

HDDS-6094. Some unit tests are skipped due to using JUnit4 runner #2909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 2 commits into from
Jan 5, 2022
Merged

HDDS-6094. Some unit tests are skipped due to using JUnit4 runner #2909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac3218f
HDDS-6094. Some unit tests are skipped due to using JUnit4 runner
adoroszlai Dec 10, 2021
7a014db
Jaeger Client 1.6.0 no longer strips leading zeros from trace IDs
adoroszlai Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions hadoop-hdds/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,21 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.jaegertracing</groupId>
<artifactId>jaeger-client</artifactId>
Expand Down
18 changes: 13 additions & 5 deletions hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/tracing/TestStringCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
Expand All @@ -23,7 +23,7 @@
import org.apache.ozone.test.LambdaTestUtils;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;

class TestStringCodec {

Expand All @@ -44,9 +44,17 @@ void testExtract() throws Exception {
"String does not match tracer state format",
() -> codec.extract(sb));
sb.append(":66");

JaegerSpanContext context = codec.extract(sb);
String expectedContextString = "123:456:789:66";
assertTrue(context.getTraceId().equals("123"));
assertTrue(context.toString().equals(expectedContextString));
StringBuilder injected = new StringBuilder();
codec.inject(context, injected);

String expectedTraceId = pad("123");
assertEquals(expectedTraceId, context.getTraceId());
assertEquals(expectedTraceId + ":456:789:66", injected.toString());
}

private static String pad(String s) {
return "0000000000000000".substring(s.length()) + s;
}
}