[Bot-ApplicationInsights] Fix disparities (#1217)

Batta32 · web-flow · commit 774076598425 · 2021-06-03T09:53:07.000-05:00
* Remove test scope of botbuilder package

* Send correct typo of telemetry depending unit test type

* Add missing unit test checking null context for onTurn middleware

* Set timestamp to AvailabilityTelemetry

* Add Assert and Act comments in unit tests
diff --git a/libraries/bot-applicationinsights/pom.xml b/libraries/bot-applicationinsights/pom.xml
@@ -75,7 +75,6 @@
       <artifactId>bot-builder</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/libraries/bot-applicationinsights/src/main/java/com/microsoft/bot/applicationinsights/ApplicationInsightsBotTelemetryClient.java b/libraries/bot-applicationinsights/src/main/java/com/microsoft/bot/applicationinsights/ApplicationInsightsBotTelemetryClient.java
@@ -93,6 +93,7 @@ public void trackAvailability(
             concurrentMetrics,
             concurrentProperties
         );
+        telemetry.setTimestamp(new Date(timeStamp.toInstant().toEpochMilli()));
         if (properties != null) {
             for (Map.Entry<String, String> pair : properties.entrySet()) {
                 telemetry.getProperties().put(pair.getKey(), pair.getValue());
diff --git a/libraries/bot-applicationinsights/src/test/java/com/microsoft/bot/applicationinsights/BotTelemetryClientTests.java b/libraries/bot-applicationinsights/src/test/java/com/microsoft/bot/applicationinsights/BotTelemetryClientTests.java
@@ -100,7 +100,7 @@ public void trackEventTest() {
             Assert.assertEquals("test", eventTelemetry.getName());
             Assert.assertEquals("value", eventTelemetry.getProperties().get("hello"));
             Assert.assertEquals(0, Double.compare(0.6, eventTelemetry.getMetrics().get("metric")));
-        }).send(Mockito.any(AvailabilityTelemetry.class));
+        }).send(Mockito.any(EventTelemetry.class));
     }
 
     @Test
@@ -112,7 +112,8 @@ public void trackDependencyTest() {
             "data",
             OffsetDateTime.now(),
             Duration.ofNanos(1000),
-            "result", false);
+            "result",
+            false);
 
         Mockito.verify(mockTelemetryChannel, invocations -> {
             RemoteDependencyTelemetry remoteDependencyTelemetry = invocations.getAllInvocations().get(0).getArgument(0);
@@ -122,7 +123,7 @@ public void trackDependencyTest() {
             Assert.assertEquals("dependencyname", remoteDependencyTelemetry.getName());
             Assert.assertEquals("result", remoteDependencyTelemetry.getResultCode());
             Assert.assertFalse(remoteDependencyTelemetry.getSuccess());
-        }).send(Mockito.any(AvailabilityTelemetry.class));
+        }).send(Mockito.any(RemoteDependencyTelemetry.class));
     }
 
     @Test
diff --git a/libraries/bot-applicationinsights/src/test/java/com/microsoft/bot/applicationinsights/TelemetryInitializerTests.java b/libraries/bot-applicationinsights/src/test/java/com/microsoft/bot/applicationinsights/TelemetryInitializerTests.java
@@ -129,4 +129,17 @@ public void telemetryInitializerMiddlewareNotLogActivitiesDisabled() {
         List<String> eventNames = eventNameCaptor.getAllValues();
         Assert.assertEquals(0, eventNames.size());
 	}
+
+	@Test
+    public void telemetryInitializerMiddlewareWithUndefinedContext() {
+        // Arrange
+        BotTelemetryClient mockTelemetryClient = Mockito.mock(BotTelemetryClient.class);
+        TelemetryLoggerMiddleware telemetryLoggerMiddleware = new TelemetryLoggerMiddleware(mockTelemetryClient, false);
+        TelemetryInitializerMiddleware telemetryInitializerMiddleware = new TelemetryInitializerMiddleware(telemetryLoggerMiddleware, true);
+        // Assert
+        Assert.assertThrows(IllegalArgumentException.class, () -> {
+            // Act
+            telemetryInitializerMiddleware.onTurn(null, () -> null);
+        });
+    }
 }
