More logging, change test

dotnet · Oct 31, 2017 · 7e7f26e · 7e7f26e
1 parent 2746dc3
commit 7e7f26e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/System.Diagnostics.PerformanceCounter/tests/PerformanceCounterCategoryTests.cs b/src/System.Diagnostics.PerformanceCounter/tests/PerformanceCounterCategoryTests.cs
@@ -300,7 +300,7 @@ public static void PerformanceCounterCategory_ReadCategory()
 
             InstanceDataCollectionCollection idColCol = pcc.ReadCategory();
 
-            Assert.True(idColCol.Count > 0);
+            Assert.NotNull(idColCol);
         }
 
         [ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]

diff --git a/src/System.Diagnostics.PerformanceCounter/tests/PerformanceCounterTests.cs b/src/System.Diagnostics.PerformanceCounter/tests/PerformanceCounterTests.cs
@@ -53,10 +53,11 @@ public static void PerformanceCounter_CreateCounter_ProcessorCounter()
         public static void PerformanceCounter_CreateCounter_MultiInstanceReadOnly()
         {
             var name = nameof(PerformanceCounter_CreateCounter_MultiInstanceReadOnly) + "_Counter";
-            var category = name + "_Category";
             var instance = name + "_Instance";
 
-            CreateCategory(name, PerformanceCounterCategoryType.MultiInstance);
+            var category = CreateCategory(name, PerformanceCounterCategoryType.MultiInstance);
+
+            Console.WriteLine("{0} exists: {1}", category, PerformanceCounterCategory.Exists(category));
 
             using (PerformanceCounter counterSample = new PerformanceCounter(category, name, instance))
             {
@@ -73,9 +74,8 @@ public static void PerformanceCounter_CreateCounter_MultiInstanceReadOnly()
         public static void PerformanceCounter_CreateCounter_SetReadOnly()
         {
             var name = nameof(PerformanceCounter_CreateCounter_SetReadOnly) + "_Counter";
-            var category = name + "_Category";
 
-            CreateCategory(name, PerformanceCounterCategoryType.SingleInstance);
+            var category = CreateCategory(name, PerformanceCounterCategoryType.SingleInstance);
 
             using (PerformanceCounter counterSample = new PerformanceCounter(category, name))
             {
@@ -276,10 +276,9 @@ public static void PerformanceCounter_RemoveInstance()
         public static void PerformanceCounter_NextSample_MultiInstance()
         {
             var name = nameof(PerformanceCounter_NextSample_MultiInstance) + "_Counter";
-            var category = name + "_Category";
             var instance = name + "_Instance";
 
-            CreateCategory(name, PerformanceCounterCategoryType.MultiInstance);
+            var category = CreateCategory(name, PerformanceCounterCategoryType.MultiInstance);
 
             using (PerformanceCounter counterSample = new PerformanceCounter(category, name, instance, false))
             {
@@ -293,16 +292,14 @@ public static void PerformanceCounter_NextSample_MultiInstance()
 
         public static PerformanceCounter CreateCounterWithCategory(string name, bool readOnly, PerformanceCounterCategoryType categoryType )
         {
-            var category = name + "_Category";
-
-            CreateCategory(name, categoryType);
+            var category = CreateCategory(name, categoryType);
 
             PerformanceCounter counterSample = new PerformanceCounter(category, name, readOnly);
 
             return counterSample;
         }
 
-        public static void CreateCategory(string name, PerformanceCounterCategoryType categoryType)
+        public static string CreateCategory(string name, PerformanceCounterCategoryType categoryType)
         {
             var category = name + "_Category";
 
@@ -318,6 +315,7 @@ public static void CreateCategory(string name, PerformanceCounterCategoryType ca
             }
 
             Console.WriteLine("PerformanceCounterTests: {0} exists: {1}; tries: {2}", category, PerformanceCounterCategory.Exists(category), tries);
+            return category;
         }
 
         public static void DeleteCategory(string name)