Update RawView debugger tests

Now that we display more properties.

Author: andyleejordan

test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs

@@ -918,21 +918,45 @@ public async Task DebuggerEnumerableShowsRawView()
             Assert.NotNull(rawDetailsView);
             Assert.Empty(rawDetailsView.Type);
             Assert.Empty(rawDetailsView.ValueString);
-            VariableDetailsBase[] rawViewChildren = rawDetailsView.GetChildren(NullLogger.Instance);
-            Assert.Equal(7, rawViewChildren.Length);
-            Assert.Equal("Length", rawViewChildren[0].Name);
-            Assert.Equal("4", rawViewChildren[0].ValueString);
-            Assert.Equal("LongLength", rawViewChildren[1].Name);
-            Assert.Equal("4", rawViewChildren[1].ValueString);
-            Assert.Equal("Rank", rawViewChildren[2].Name);
-            Assert.Equal("1", rawViewChildren[2].ValueString);
-            Assert.Equal("SyncRoot", rawViewChildren[3].Name);
-            Assert.Equal("IsReadOnly", rawViewChildren[4].Name);
-            Assert.Equal("$false", rawViewChildren[4].ValueString);
-            Assert.Equal("IsFixedSize", rawViewChildren[5].Name);
-            Assert.Equal("$true", rawViewChildren[5].ValueString);
-            Assert.Equal("IsSynchronized", rawViewChildren[6].Name);
-            Assert.Equal("$false", rawViewChildren[6].ValueString);
+            Assert.Collection(rawDetailsView.GetChildren(NullLogger.Instance),
+                (i) =>
+                {
+                    Assert.Equal("Length", i.Name);
+                    Assert.Equal("4", i.ValueString);
+                },
+                (i) =>
+                {
+                    Assert.Equal("NativeLength", i.Name);
+                    Assert.Equal("4", i.ValueString);
+                },
+                (i) =>
+                {
+                    Assert.Equal("LongLength", i.Name);
+                    Assert.Equal("4", i.ValueString);
+                },
+                (i) =>
+                {
+                    Assert.Equal("Rank", i.Name);
+                    Assert.Equal("1", i.ValueString);
+                },
+                (i) =>
+                {
+                    Assert.Equal("SyncRoot", i.Name);
+                    Assert.True(i.IsExpandable);
+                },
+                (i) =>
+                {
+                    Assert.Equal("IsReadOnly", i.Name);
+                    Assert.Equal("$false", i.ValueString);
+                }, (i) =>
+                {
+                    Assert.Equal("IsFixedSize", i.Name);
+                    Assert.Equal("$true", i.ValueString);
+                }, (i) =>
+                {
+                    Assert.Equal("IsSynchronized", i.Name);
+                    Assert.Equal("$false", i.ValueString);
+                });
         }
 
         [Fact]
@@ -955,20 +979,38 @@ public async Task DebuggerDictionaryShowsRawView()
             Assert.NotNull(rawDetailsView);
             Assert.Empty(rawDetailsView.Type);
             Assert.Empty(rawDetailsView.ValueString);
-            VariableDetailsBase[] rawViewChildren = rawDetailsView.GetChildren(NullLogger.Instance);
-            Assert.Equal(7, rawViewChildren.Length);
-            Assert.Equal("IsReadOnly", rawViewChildren[0].Name);
-            Assert.Equal("$false", rawViewChildren[0].ValueString);
-            Assert.Equal("IsFixedSize", rawViewChildren[1].Name);
-            Assert.Equal("$false", rawViewChildren[1].ValueString);
-            Assert.Equal("IsSynchronized", rawViewChildren[2].Name);
-            Assert.Equal("$false", rawViewChildren[2].ValueString);
-            Assert.Equal("Keys", rawViewChildren[3].Name);
-            Assert.Equal("Values", rawViewChildren[4].Name);
-            Assert.Equal("[ValueCollection: 4]", rawViewChildren[4].ValueString);
-            Assert.Equal("SyncRoot", rawViewChildren[5].Name);
-            Assert.Equal("Count", rawViewChildren[6].Name);
-            Assert.Equal("4", rawViewChildren[6].ValueString);
+            Assert.Collection(rawDetailsView.GetChildren(NullLogger.Instance),
+                (i) => Assert.Equal("hcp", i.Name),
+                (i) => Assert.Equal("comparer", i.Name),
+                (i) => Assert.Equal("EqualityComparer", i.Name),
+                (i) => {
+                    Assert.Equal("IsReadOnly", i.Name);
+                    Assert.Equal("$false", i.ValueString);
+                },
+                (i) => {
+                    Assert.Equal("IsFixedSize", i.Name);
+                    Assert.Equal("$false", i.ValueString);
+                },
+                (i) => {
+                    Assert.Equal("IsSynchronized", i.Name);
+                    Assert.Equal("$false", i.ValueString);
+                },
+                (i) => {
+                    Assert.Equal("Keys", i.Name);
+                    Assert.Equal("[KeyCollection: 4]", i.ValueString);
+                },
+                (i) => {
+                    Assert.Equal("Values", i.Name);
+                    Assert.Equal("[ValueCollection: 4]", i.ValueString);
+                },
+                (i) => {
+                    Assert.Equal("SyncRoot", i.Name);
+                    Assert.Equal("[Hashtable: 4]", i.ValueString);
+                },
+                (i) => {
+                    Assert.Equal("Count", i.Name);
+                    Assert.Equal("4", i.ValueString);
+                });
         }
 
         [Fact]
@@ -995,7 +1037,7 @@ public async Task DebuggerDerivedDictionaryPropertyInRawView()
             Assert.Empty(rawDetailsView.Type);
             Assert.Empty(rawDetailsView.ValueString);
             VariableDetailsBase[] rawViewChildren = rawDetailsView.GetChildren(NullLogger.Instance);
-            Assert.Equal(4, rawViewChildren.Length);
+            Assert.Equal(15, rawViewChildren.Length);
             Assert.NotNull(Array.Find(rawViewChildren, v => v.Name == "Comparer"));
         }
 

test/PowerShellEditorServices.Test/Session/PsesInternalHostTests.cs

@@ -180,7 +180,7 @@ public async Task CanRunOnIdleTask()
                 new PSCommand().AddScript("$handled"),
                 CancellationToken.None).ConfigureAwait(true);
 
-            Assert.Collection(handled, (p) => Assert.False(p));
+            Assert.Collection(handled, Assert.False);
 
             await psesHost.ExecuteDelegateAsync(
                 nameof(psesHost.OnPowerShellIdle),
@@ -195,7 +195,7 @@ await psesHost.ExecuteDelegateAsync(
                 new PSCommand().AddScript("$handled"),
                 CancellationToken.None).ConfigureAwait(true);
 
-            Assert.Collection(handled, (p) => Assert.True(p));
+            Assert.Collection(handled, Assert.True);
         }
 
         [Fact]
@@ -301,7 +301,7 @@ await psesHost.ExecuteDelegateAsync(
                 new PSCommand().AddScript("$handledInProfile"),
                 CancellationToken.None).ConfigureAwait(true);
 
-            Assert.Collection(handled, (p) => Assert.True(p));
+            Assert.Collection(handled, Assert.True);
         }
     }
 }