-Increment version to 4.0.7

-Fixed circular reference error when serializing nullable structs -Fixed JsonReader.ReadAsXXX methods not converting string values
2012-01-24 09:12:32 +00:00
parent b82d26028d
commit 3d43fc9c4f
13 changed files with 590 additions and 128 deletions
@@ -1302,6 +1302,23 @@ bye", reader.Value);
      Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
    }

+    [Test]
+    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Could not convert string to DateTimeOffset: blablahbla. Line 1, position 22.")]
+    public void ReadAsDateTimeOffsetBadString()
+    {
+      string json = @"{""Offset"":""blablahbla""}";
+
+      JsonTextReader reader = new JsonTextReader(new StringReader(json));
+
+      Assert.IsTrue(reader.Read());
+      Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
+
+      Assert.IsTrue(reader.Read());
+      Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+
+      reader.ReadAsDateTimeOffset();
+    }
+
    [Test]
    public void ReadAsDateTimeOffsetHoursOnly()
    {
@@ -1346,46 +1363,6 @@ bye", reader.Value);
      Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
    }

-    [Test]
-    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error parsing null value. Line 0, position 0.")]
-    public void MatchWithInsufficentCharacters()
-    {
-      JsonTextReader reader = new JsonTextReader(new StringReader(@"nul"));
-      reader.Read();
-    }
-
-    [Test]
-    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error parsing null value. Line 0, position 0.")]
-    public void MatchWithWrongCharacters()
-    {
-      JsonTextReader reader = new JsonTextReader(new StringReader(@"nulz"));
-      reader.Read();
-    }
-
-    [Test]
-    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error parsing null value. Line 1, position 4.")]
-    public void MatchWithNoTrailingSeperator()
-    {
-      JsonTextReader reader = new JsonTextReader(new StringReader(@"nullz"));
-      reader.Read();
-    }
-
-    [Test]
-    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Unexpected end while parsing comment. Line 1, position 6.")]
-    public void UnclosedComment()
-    {
-      JsonTextReader reader = new JsonTextReader(new StringReader(@"/* sdf"));
-      reader.Read();
-    }
-
-    [Test]
-    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error parsing comment. Expected: *, got s. Line 1, position 1.")]
-    public void BadCommentStart()
-    {
-      JsonTextReader reader = new JsonTextReader(new StringReader(@"/sdf"));
-      reader.Read();
-    }
-
    [Test]
    public void ReadAsDateTimeOffsetIsoDate()
    {
@@ -1459,6 +1436,85 @@ bye", reader.Value);
    }
 #endif

+    [Test]
+    public void ReadAsDecimalInt()
+    {
+      string json = @"{""Name"":1}";
+
+      JsonTextReader reader = new JsonTextReader(new StringReader(json));
+
+      Assert.IsTrue(reader.Read());
+      Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
+
+      Assert.IsTrue(reader.Read());
+      Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+
+      reader.ReadAsDecimal();
+      Assert.AreEqual(JsonToken.Float, reader.TokenType);
+      Assert.AreEqual(typeof(decimal), reader.ValueType);
+      Assert.AreEqual(1, reader.Value);
+    }
+
+    [Test]
+    [ExpectedException(typeof(FormatException), ExpectedMessage = "Input string was not in a correct format.")]
+    public void ReadAsIntDecimal()
+    {
+      string json = @"{""Name"": 1.1}";
+
+      JsonTextReader reader = new JsonTextReader(new StringReader(json));
+
+      Assert.IsTrue(reader.Read());
+      Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
+
+      Assert.IsTrue(reader.Read());
+      Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+
+      reader.ReadAsInt32();
+      Assert.AreEqual(JsonToken.Integer, reader.TokenType);
+      Assert.AreEqual(typeof(int), reader.ValueType);
+      Assert.AreEqual(1, reader.Value);
+    }
+
+    [Test]
+    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error parsing null value. Line 0, position 0.")]
+    public void MatchWithInsufficentCharacters()
+    {
+      JsonTextReader reader = new JsonTextReader(new StringReader(@"nul"));
+      reader.Read();
+    }
+
+    [Test]
+    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error parsing null value. Line 0, position 0.")]
+    public void MatchWithWrongCharacters()
+    {
+      JsonTextReader reader = new JsonTextReader(new StringReader(@"nulz"));
+      reader.Read();
+    }
+
+    [Test]
+    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error parsing null value. Line 1, position 4.")]
+    public void MatchWithNoTrailingSeperator()
+    {
+      JsonTextReader reader = new JsonTextReader(new StringReader(@"nullz"));
+      reader.Read();
+    }
+
+    [Test]
+    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Unexpected end while parsing comment. Line 1, position 6.")]
+    public void UnclosedComment()
+    {
+      JsonTextReader reader = new JsonTextReader(new StringReader(@"/* sdf"));
+      reader.Read();
+    }
+
+    [Test]
+    [ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error parsing comment. Expected: *, got s. Line 1, position 1.")]
+    public void BadCommentStart()
+    {
+      JsonTextReader reader = new JsonTextReader(new StringReader(@"/sdf"));
+      reader.Read();
+    }
+
    [Test]
    public void ReadAsDecimal()
    {