Skip to content

Commit 224c395

Browse files
authored
Convert tooling tests to java (rest) (#14919)
1 parent ce54afb commit 224c395

File tree

5 files changed

+63
-85
lines changed

5 files changed

+63
-85
lines changed

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/Utils.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,6 @@ public static String getResourceName(String className) {
4141
return className.replace('.', '/') + ".class";
4242
}
4343

44-
/** com/foo/Bar to com.foo.Bar */
45-
public static String getClassName(String internalName) {
46-
return internalName.replace('/', '.');
47-
}
48-
49-
/** com.foo.Bar to com/foo/Bar */
50-
public static String getInternalName(Class<?> clazz) {
51-
return clazz.getName().replace('.', '/');
52-
}
53-
5444
/**
5545
* Get method definition for given {@link TypeDefinition} and method name.
5646
*

javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/UtilsTest.groovy

Lines changed: 0 additions & 33 deletions
This file was deleted.

javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/muzzle/HelperClassPredicateTest.groovy

Lines changed: 0 additions & 42 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.javaagent.tooling;
7+
8+
import static org.assertj.core.api.Assertions.assertThat;
9+
10+
import org.junit.jupiter.api.Test;
11+
12+
class UtilsTest {
13+
14+
@Test
15+
void getResourceNameAddsSuffixAndConvertDotsToSlashes() {
16+
String result = Utils.getResourceName("com.example.Something");
17+
18+
assertThat(result).isEqualTo("com/example/Something.class");
19+
}
20+
}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.javaagent.tooling.muzzle;
7+
8+
import static org.assertj.core.api.Assertions.assertThat;
9+
10+
import java.util.function.Predicate;
11+
import org.junit.jupiter.params.ParameterizedTest;
12+
import org.junit.jupiter.params.provider.CsvSource;
13+
14+
class HelperClassPredicateTest {
15+
16+
@ParameterizedTest(name = "should collect references for {0}")
17+
@CsvSource({
18+
"javaagent instrumentation class, io.opentelemetry.javaagent.instrumentation.some_instrumentation.Advice",
19+
"library instrumentation class, io.opentelemetry.instrumentation.LibraryClass",
20+
"additional library instrumentation class, com.example.instrumentation.library.ThirdPartyExternalInstrumentation"
21+
})
22+
void shouldCollectReferencesFor(String desc, String className) {
23+
Predicate<String> additionalLibraryPredicate =
24+
name -> name.startsWith("com.example.instrumentation.library");
25+
HelperClassPredicate predicate = new HelperClassPredicate(additionalLibraryPredicate);
26+
27+
assertThat(predicate.isHelperClass(className)).isTrue();
28+
}
29+
30+
@ParameterizedTest(name = "should not collect references for {0}")
31+
@CsvSource({
32+
"Java SDK class, java.util.ArrayList",
33+
"javaagent-tooling class, io.opentelemetry.javaagent.tooling.Constants",
34+
"instrumentation-api class, io.opentelemetry.instrumentation.api.instrumenter.Instrumenter",
35+
"bootstrap class, io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge"
36+
})
37+
void shouldNotCollectReferencesFor(String desc, String className) {
38+
Predicate<String> alwaysFalsePredicate = name -> false;
39+
HelperClassPredicate predicate = new HelperClassPredicate(alwaysFalsePredicate);
40+
41+
assertThat(predicate.isHelperClass(className)).isFalse();
42+
}
43+
}

0 commit comments

Comments
 (0)