Skip to content

Commit d5abba1

Browse files
committed
Fixed unit test
1 parent 972dfdf commit d5abba1

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

src/Resources/ResourceManager/Json/PSJsonSerializer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public static string Serialize(object value, SerializeContext context)
5555
// NOTE(jcotillo): JsonExtensions.ToJson() extension uses a custom serialization settings
5656
// that preserves DateTime values as string (DateParseHandling = DateParseHandling.None),
5757
// plus other custom settings.
58+
//return JsonConvert.SerializeObject(processed);
5859
return processed.ToJson();
5960
}
6061
catch (OperationCanceledException)

src/Resources/Resources.Test/Json/PSJsonSerializerTests.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Commands.Resources.Test.Json
1818
using System.Collections;
1919
using System.Collections.Generic;
2020
using System.Management.Automation;
21+
using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
2122
using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Json;
2223
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2324
using Newtonsoft.Json.Linq;
@@ -90,11 +91,15 @@ public void Serialize_Hashtable_Success()
9091

9192
string result = PSJsonSerializer.Serialize(hashtable);
9293

93-
JToken parsedResult = JToken.Parse(result);
94+
JToken parsedResult = result.FromJson<JToken>();
95+
96+
// NOTE(jcotillo): JsonExtensions is now camelCasing all property keys
97+
// therefore even though Bar was set as PascalCase, after serializing it
98+
// the key became camelCase.
9499
JToken expected = JToken.FromObject(new
95100
{
96101
foo = "fooValue",
97-
Bar = true,
102+
bar = true,
98103
nested = new
99104
{
100105
foo = "4d44fe86-f04a-4ba5-9900-abdec8cb11c1",

src/Resources/Resources.Test/Resources.Test.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24+
<ProjectReference Include="..\ResourceManager\ResourceManager.csproj" />
2425
<ProjectReference Include="..\Resources\Resources.csproj" />
2526
</ItemGroup>
2627

0 commit comments

Comments
 (0)