Fix unit tests

heyams · heyams · commit 4f264b8b9e94 · 2020-11-02T13:57:38.000-08:00
diff --git a/core/src/test/java/com/microsoft/applicationinsights/internal/perfcounter/ProcessCpuPerformanceCounterTest.java b/core/src/test/java/com/microsoft/applicationinsights/internal/perfcounter/ProcessCpuPerformanceCounterTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.internal.perfcounter;
 
 import com.microsoft.applicationinsights.TelemetryClient;
+import com.microsoft.applicationinsights.telemetry.MetricTelemetry;
 import com.microsoft.applicationinsights.telemetry.PerformanceCounterTelemetry;
 import com.microsoft.applicationinsights.telemetry.Telemetry;
 import org.junit.Test;
@@ -37,14 +38,12 @@ public TelemetryClassStub(PerformanceCounter performanceCounter) {
         }
 
         public void track(Telemetry telemetry) {
-            if (!(telemetry instanceof PerformanceCounterTelemetry)) {
+            if (!(telemetry instanceof MetricTelemetry)) {
                 assertFalse(true);
             }
 
-            PerformanceCounterTelemetry pct = (PerformanceCounterTelemetry)telemetry;
-            assertTrue(pct.getCategoryName().startsWith("Process("));
-            assertEquals(Constants.PROCESS_MEM_PC_COUNTER_NAME, pct.getCounterName());
-            assertEquals("", pct.getInstanceName());
+            MetricTelemetry pct = (MetricTelemetry) telemetry;
+            assertEquals(Constants.PROCESS_MEM_PC_METRICS_NAME, pct.getName());
         }
     }
 
diff --git a/core/src/test/java/com/microsoft/applicationinsights/internal/perfcounter/ProcessMemoryPerformanceCounterTest.java b/core/src/test/java/com/microsoft/applicationinsights/internal/perfcounter/ProcessMemoryPerformanceCounterTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.internal.perfcounter;
 
 import com.microsoft.applicationinsights.TelemetryClient;
+import com.microsoft.applicationinsights.telemetry.MetricTelemetry;
 import com.microsoft.applicationinsights.telemetry.PerformanceCounterTelemetry;
 import com.microsoft.applicationinsights.telemetry.Telemetry;
 import org.junit.Test;
@@ -32,12 +33,12 @@
 public final class ProcessMemoryPerformanceCounterTest {
     private static final class TelemetryClassStub extends TelemetryClient {
         public void track(Telemetry telemetry) {
-            if (!(telemetry instanceof PerformanceCounterTelemetry)) {
+            if (!(telemetry instanceof MetricTelemetry)) {
                 assertFalse(true);
             }
 
-            PerformanceCounterTelemetry pct = (PerformanceCounterTelemetry)telemetry;
-            assertEquals(Constants.PROCESS_MEM_PC_COUNTER_NAME, pct.getCounterName());
+            MetricTelemetry pct = (MetricTelemetry) telemetry;
+            assertEquals(Constants.PROCESS_MEM_PC_METRICS_NAME, pct.getName());
         }
     }
 
diff --git a/core/src/test/java/com/microsoft/applicationinsights/internal/perfcounter/WindowsPerformanceCounterDataTest.java b/core/src/test/java/com/microsoft/applicationinsights/internal/perfcounter/WindowsPerformanceCounterDataTest.java

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`package com.microsoft.applicationinsights.internal.perfcounter;`
`23`	`23`
`24`	`24`	`import com.microsoft.applicationinsights.TelemetryClient;`
	`25`	`+import com.microsoft.applicationinsights.telemetry.MetricTelemetry;`
`25`	`26`	`import com.microsoft.applicationinsights.telemetry.PerformanceCounterTelemetry;`
`26`	`27`	`import com.microsoft.applicationinsights.telemetry.Telemetry;`
`27`	`28`	`import org.junit.Test;`
`@@ -37,14 +38,12 @@ public TelemetryClassStub(PerformanceCounter performanceCounter) {`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`public void track(Telemetry telemetry) {`
`40`		`- if (!(telemetry instanceof PerformanceCounterTelemetry)) {`
	`41`	`+ if (!(telemetry instanceof MetricTelemetry)) {`
`41`	`42`	`assertFalse(true);`
`42`	`43`	`}`
`43`	`44`
`44`		`- PerformanceCounterTelemetry pct = (PerformanceCounterTelemetry)telemetry;`
`45`		`- assertTrue(pct.getCategoryName().startsWith("Process("));`
`46`		`- assertEquals(Constants.PROCESS_MEM_PC_COUNTER_NAME, pct.getCounterName());`
`47`		`- assertEquals("", pct.getInstanceName());`
	`45`	`+ MetricTelemetry pct = (MetricTelemetry) telemetry;`
	`46`	`+ assertEquals(Constants.PROCESS_MEM_PC_METRICS_NAME, pct.getName());`
`48`	`47`	`}`
`49`	`48`	`}`
`50`	`49`