Skip to content

Commit

Permalink
- fixing cut & paste error in null reference check
Browse files Browse the repository at this point in the history
- thanks to @GraemeF, @hhariri
  • Loading branch information
mckamey committed Dec 29, 2010
1 parent 4453f91 commit fe3947a
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 1 deletion.
44 changes: 44 additions & 0 deletions src/JsonFx.Tests/Json/JsonReaderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -206,5 +206,49 @@ public void ReadMany_ObjectExtraValueAfterClose_DeserializesStreamOfObject()
}

#endregion Object Tests

#region Enum Tests

public class Foo
{
public Bar Baz { get; set; }

public override bool Equals(object obj)
{
Foo that = obj as Foo;
if (that == null)
{
return false;
}

return this.Baz.Equals(that.Baz);
}

public override int GetHashCode()
{
return base.GetHashCode();
}
}

public enum Bar
{
First,
Second,
Third
}

[Fact]
[Trait(TraitName, TraitValue)]
public void Read_ObjectContainingEnum_DeserializesObject()
{
var input = "{\"Baz\":\"First\"}";
var expected = new Foo { Baz = Bar.First };

var actual = new JsonReader().Read<Foo>(input);

Assert.Equal(expected, actual);
}

#endregion Enum Tests
}
}
44 changes: 44 additions & 0 deletions src/JsonFx.Tests/Json/JsonWriterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,49 @@ public void Write_RecognizesMultipleDateTimeFiltersAjaxFirst_SerializesMSAjaxDat
}

#endregion Array Tests

#region Enum Tests

public class Foo
{
public Bar Baz { get; set; }

public override bool Equals(object obj)
{
Foo that = obj as Foo;
if (that == null)
{
return false;
}

return this.Baz.Equals(that.Baz);
}

public override int GetHashCode()
{
return base.GetHashCode();
}
}

public enum Bar
{
First,
Second,
Third
}

[Fact]
[Trait(TraitName, TraitValue)]
public void Write_ObjectContainingEnum_SerializesObject()
{
var input = new Foo { Baz = Bar.First };
var expected = "{\"Baz\":\"First\"}";

var actual = new JsonWriter().Write(input);

Assert.Equal(expected, actual);
}

#endregion Enum Tests
}
}
2 changes: 1 addition & 1 deletion src/JsonFx/Serialization/Resolvers/ResolverCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ private IDictionary<string, MemberMap> BuildEnumMap(Type enumType, out IDictiona
{
hasName = false;
IEnumerable<DataName> names = this.Strategy.GetName(info);
if (typeNames != null)
if (names != null)
{
foreach (DataName name in names)
{
Expand Down

0 comments on commit fe3947a

Please sign in to comment.