Add test for RpConfiguration (#1663)

Author: trask

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/wasbootstrap/configuration/ConfigurationBuilder.java

@@ -280,7 +280,8 @@ public static void applySamplingPercentageRounding(Configuration config) {
         }
     }
 
-    private static void overlayRpConfiguration(Configuration config, RpConfiguration rpConfiguration)  {
+    // visible for testing
+    static void overlayRpConfiguration(Configuration config, RpConfiguration rpConfiguration)  {
         String connectionString = rpConfiguration.connectionString;
         if (!isTrimEmpty(connectionString)) {
             config.connectionString = connectionString;

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/wasbootstrap/configuration/ConfigurationTest.java

@@ -487,6 +487,32 @@ public void shouldOverrideInstrumentationSpringSchedulingEnabled() throws IOExce
         assertFalse(configuration.instrumentation.springScheduling.enabled);
     }
 
+    @Test
+    public void shouldUseRpConfigRole() {
+        Configuration configuration = new Configuration();
+        RpConfiguration rpConfiguration = new RpConfiguration();
+        rpConfiguration.role.name = "role-name-from-rp";
+        rpConfiguration.role.instance = "role-instance-from-rp";
+        ConfigurationBuilder.overlayRpConfiguration(configuration, rpConfiguration);
+
+        assertEquals("role-name-from-rp", configuration.role.name);
+        assertEquals("role-instance-from-rp", configuration.role.instance);
+    }
+
+    @Test
+    public void shouldNotUseRpConfigRole() {
+        Configuration configuration = new Configuration();
+        configuration.role.name = "role-name";
+        configuration.role.instance = "role-instance";
+        RpConfiguration rpConfiguration = new RpConfiguration();
+        rpConfiguration.role.name = "role-name-from-rp";
+        rpConfiguration.role.instance = "role-instance-from-rp";
+        ConfigurationBuilder.overlayRpConfiguration(configuration, rpConfiguration);
+
+        assertEquals("role-name", configuration.role.name);
+        assertEquals("role-instance", configuration.role.instance);
+    }
+
     @Test(expected = JsonDataException.class)
     public void shouldNotParseFaultyJson() throws IOException {
         loadConfiguration("applicationinsights_faulty.json");