convert to java

Author: zeitlinger

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFileTest.java

@@ -7,33 +7,28 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Map;
 import org.junit.Rule;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Properties;
-
 class ConfigurationFileTest {
 
-  @TempDir
-  File tmpDir;
+  @TempDir File tmpDir;
 
-  @Rule
-  public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
+  @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
 
   private String originalSystemProperty;
-  private String originalEnvironmentVariable;
 
   @BeforeEach
   void setUp() {
     originalSystemProperty = System.getProperty("otel.javaagent.configuration-file");
-    originalEnvironmentVariable = System.getenv("OTEL_JAVAAGENT_CONFIGURATION_FILE");
     System.clearProperty("otel.javaagent.configuration-file");
   }
 
@@ -49,47 +44,47 @@ void tearDown() {
   @Test
   void shouldUseEnvVar() throws IOException {
     String path = createFile("config", "property1=val-env");
-    environmentVariables.set("OTEL_JAVAAGENT_CONFIGURATION_FILE", path)
+    environmentVariables.set("OTEL_JAVAAGENT_CONFIGURATION_FILE", path);
 
-    Properties properties = ConfigurationFile.loadConfigFile();
+    Map<String, String> properties = ConfigurationFile.loadConfigFile();
 
-    assertThat(properties.get("property1")).isEqualTo("val-env");
+    assertThat(properties).containsEntry("property1", "val-env");
   }
 
   @Test
   void shouldUseSystemProperty() throws IOException {
     String path = createFile("config", "property1=val-sys");
     System.setProperty("otel.javaagent.configuration-file", path);
 
-    Properties properties = ConfigurationFile.loadConfigFile();
+    Map<String, String> properties = ConfigurationFile.loadConfigFile();
 
-    assertThat(properties.get("property1")).isEqualTo("val-sys");
+    assertThat(properties).containsEntry("property1", "val-sys");
   }
 
   @Test
   void shouldUseSystemPropertyOverEnvVar() throws IOException {
-    def pathEnv = createFile("configEnv", "property1=val-env")
+    String pathEnv = createFile("configEnv", "property1=val-env");
     String path = createFile("config", "property1=val-sys");
     System.setProperty("otel.javaagent.configuration-file", path);
-    environmentVariables.set("OTEL_JAVAAGENT_CONFIGURATION_FILE", pathEnv)
+    environmentVariables.set("OTEL_JAVAAGENT_CONFIGURATION_FILE", pathEnv);
 
-    Properties properties = ConfigurationFile.loadConfigFile();
+    Map<String, String> properties = ConfigurationFile.loadConfigFile();
 
-    assertThat(properties.get("property1")).isEqualTo("val-sys");
+    assertThat(properties).containsEntry("property1", "val-sys");
   }
 
   @Test
   void shouldReturnEmptyPropertiesIfFileDoesNotExist() {
     System.setProperty("otel.javaagent.configuration-file", "somePath");
 
-    Properties properties = ConfigurationFile.loadConfigFile();
+    Map<String, String> properties = ConfigurationFile.loadConfigFile();
 
     assertThat(properties).isEmpty();
   }
 
   @Test
   void shouldReturnEmptyPropertiesIfPropertyIsNotSet() {
-    Properties properties = ConfigurationFile.loadConfigFile();
+    Map<String, String> properties = ConfigurationFile.loadConfigFile();
 
     assertThat(properties).isEmpty();
   }

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/MethodsConfigurationParserTest.java

@@ -8,16 +8,15 @@
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 class MethodsConfigurationParserTest {
 
@@ -33,26 +32,30 @@ static Stream<Arguments> configurationTestData() {
     return Stream.of(
         Arguments.of(null, emptyMap()),
         Arguments.of(" ", emptyMap()),
-        Arguments.of("some.package.ClassName",
-            Collections.<String, Set<String>>singletonMap("some.package.ClassName",
-                Collections.emptySet())),
+        Arguments.of(
+            "some.package.ClassName",
+            Collections.<String, Set<String>>singletonMap(
+                "some.package.ClassName", Collections.emptySet())),
         Arguments.of("some.package.ClassName[ , ]", emptyMap()),
         Arguments.of("some.package.ClassName[ , method]", emptyMap()),
-        Arguments.of("some.package.Class$Name[ method , ]",
+        Arguments.of(
+            "some.package.Class$Name[ method , ]",
             Collections.singletonMap("some.package.Class$Name", createSet("method"))),
-        Arguments.of("ClassName[ method1,]",
-            Collections.singletonMap("ClassName", createSet("method1"))),
-        Arguments.of("ClassName[method1 , method2]",
+        Arguments.of(
+            "ClassName[ method1,]", Collections.singletonMap("ClassName", createSet("method1"))),
+        Arguments.of(
+            "ClassName[method1 , method2]",
             Collections.singletonMap("ClassName", createSet("method1", "method2"))),
-        Arguments.of("Class$1[method1 ] ; Class$2[ method2];",
+        Arguments.of(
+            "Class$1[method1 ] ; Class$2[ method2];",
             createTwoEntryMap("Class$1", createSet("method1"), "Class$2", createSet("method2"))),
-        Arguments.of("Duplicate[method1] ; Duplicate[method2]  ;Duplicate[method3];",
-            Collections.singletonMap("Duplicate", createSet("method3")))
-    );
+        Arguments.of(
+            "Duplicate[method1] ; Duplicate[method2]  ;Duplicate[method3];",
+            Collections.singletonMap("Duplicate", createSet("method3"))));
   }
 
-  private static Map<String, Set<String>> createTwoEntryMap(String key1, Set<String> value1,
-      String key2, Set<String> value2) {
+  private static Map<String, Set<String>> createTwoEntryMap(
+      String key1, Set<String> value1, String key2, Set<String> value2) {
     Map<String, Set<String>> map = new HashMap<>();
     map.put(key1, value1);
     map.put(key2, value2);