-Added ReadAsBoolean
-Fixed reading booleans as strings -Fixed reading large integers as booleans
This commit is contained in:
@@ -2807,6 +2807,55 @@ new Date()"));
|
||||
Assert.IsTrue(reader.Read());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ReadAsString_Boolean()
|
||||
{
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader("{\"Test1\":false}"));
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.IsTrue(reader.Read());
|
||||
|
||||
string s = reader.ReadAsString();
|
||||
Assert.AreEqual("false", s);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.IsFalse(reader.Read());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Read_Boolean_Failure()
|
||||
{
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader("{\"Test1\":false1}"));
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.IsTrue(reader.Read());
|
||||
|
||||
ExceptionAssert.Throws<JsonReaderException>(
|
||||
() => { reader.Read(); },
|
||||
"Error parsing boolean value. Path 'Test1', line 1, position 14.");
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.IsFalse(reader.Read());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ReadAsString_Boolean_Failure()
|
||||
{
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader("{\"Test1\":false1}"));
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.IsTrue(reader.Read());
|
||||
|
||||
ExceptionAssert.Throws<JsonReaderException>(
|
||||
() => { reader.ReadAsString(); },
|
||||
"Unexpected character encountered while parsing value: 1. Path 'Test1', line 1, position 14.");
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.IsFalse(reader.Read());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ParseConstructorWithBadCharacter()
|
||||
{
|
||||
@@ -3402,6 +3451,86 @@ null//comment
|
||||
Assert.AreEqual(JsonToken.EndArray, reader.TokenType);
|
||||
}
|
||||
|
||||
#if !(PORTABLE || PORTABLE40 || NET35 || NET20)
|
||||
[Test]
|
||||
public void ReadAsBoolean()
|
||||
{
|
||||
string json = @"[
|
||||
1,
|
||||
0,
|
||||
1.1,
|
||||
0.0,
|
||||
0.000000000001,
|
||||
9999999999,
|
||||
-9999999999,
|
||||
9999999999999999999999999999999999999999999999999999999999999999999999,
|
||||
-9999999999999999999999999999999999999999999999999999999999999999999999,
|
||||
'true',
|
||||
'TRUE',
|
||||
'false',
|
||||
'FALSE',
|
||||
'',
|
||||
null
|
||||
]";
|
||||
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual("", reader.Path);
|
||||
|
||||
Assert.AreEqual(true, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[0]", reader.Path);
|
||||
|
||||
Assert.AreEqual(false, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[1]", reader.Path);
|
||||
|
||||
Assert.AreEqual(true, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[2]", reader.Path);
|
||||
|
||||
Assert.AreEqual(false, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[3]", reader.Path);
|
||||
|
||||
Assert.AreEqual(true, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[4]", reader.Path);
|
||||
|
||||
Assert.AreEqual(true, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[5]", reader.Path);
|
||||
|
||||
Assert.AreEqual(true, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[6]", reader.Path);
|
||||
|
||||
Assert.AreEqual(true, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[7]", reader.Path);
|
||||
|
||||
Assert.AreEqual(true, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[8]", reader.Path);
|
||||
|
||||
Assert.AreEqual(true, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[9]", reader.Path);
|
||||
|
||||
Assert.AreEqual(true, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[10]", reader.Path);
|
||||
|
||||
Assert.AreEqual(false, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[11]", reader.Path);
|
||||
|
||||
Assert.AreEqual(false, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[12]", reader.Path);
|
||||
|
||||
Assert.AreEqual(null, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[13]", reader.Path);
|
||||
|
||||
Assert.AreEqual(null, reader.ReadAsBoolean());
|
||||
Assert.AreEqual("[14]", reader.Path);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual("", reader.Path);
|
||||
|
||||
Assert.IsFalse(reader.Read());
|
||||
Assert.AreEqual("", reader.Path);
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void ReadAsBytes()
|
||||
{
|
||||
|
||||
@@ -67,8 +67,12 @@ namespace Newtonsoft.Json.Tests
|
||||
[TestFixture]
|
||||
public class PerformanceTests : TestFixtureBase
|
||||
{
|
||||
#if DEBUG
|
||||
public int Iterations = 1;
|
||||
#else
|
||||
public int Iterations = 100;
|
||||
//public int Iterations = 10000;
|
||||
#endif
|
||||
|
||||
#region Data
|
||||
private const string BsonHex =
|
||||
|
||||
@@ -215,6 +215,114 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void DeserializeBoolean_Null()
|
||||
{
|
||||
ExceptionAssert.Throws<JsonSerializationException>(
|
||||
() => JsonConvert.DeserializeObject<IList<bool>>(@"[null]"),
|
||||
"Error converting value {null} to type 'System.Boolean'. Path '[0]', line 1, position 5.");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeBoolean_DateTime()
|
||||
{
|
||||
ExceptionAssert.Throws<JsonReaderException>(
|
||||
() => JsonConvert.DeserializeObject<IList<bool>>(@"['2000-12-20T10:55:55Z']"),
|
||||
"Could not convert string to boolean: 2000-12-20T10:55:55Z. Path '[0]', line 1, position 23.");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeBoolean_BadString()
|
||||
{
|
||||
ExceptionAssert.Throws<JsonReaderException>(
|
||||
() => JsonConvert.DeserializeObject<IList<bool>>(@"['pie']"),
|
||||
@"Could not convert string to boolean: pie. Path '[0]', line 1, position 6.");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeBoolean_EmptyString()
|
||||
{
|
||||
ExceptionAssert.Throws<JsonSerializationException>(
|
||||
() => JsonConvert.DeserializeObject<IList<bool>>(@"['']"),
|
||||
@"Error converting value {null} to type 'System.Boolean'. Path '[0]', line 1, position 3.");
|
||||
}
|
||||
|
||||
#if !(PORTABLE || PORTABLE40 || NET35 || NET20)
|
||||
[Test]
|
||||
public void DeserializeBooleans()
|
||||
{
|
||||
IList<bool> l = JsonConvert.DeserializeObject<IList<bool>>(@"[
|
||||
1,
|
||||
0,
|
||||
1.1,
|
||||
0.0,
|
||||
0.000000000001,
|
||||
9999999999,
|
||||
-9999999999,
|
||||
9999999999999999999999999999999999999999999999999999999999999999999999,
|
||||
-9999999999999999999999999999999999999999999999999999999999999999999999,
|
||||
'true',
|
||||
'TRUE',
|
||||
'false',
|
||||
'FALSE'
|
||||
]");
|
||||
|
||||
int i = 0;
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(false, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(false, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(false, l[i++]);
|
||||
Assert.AreEqual(false, l[i++]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeNullableBooleans()
|
||||
{
|
||||
IList<bool?> l = JsonConvert.DeserializeObject<IList<bool?>>(@"[
|
||||
1,
|
||||
0,
|
||||
1.1,
|
||||
0.0,
|
||||
0.000000000001,
|
||||
9999999999,
|
||||
-9999999999,
|
||||
9999999999999999999999999999999999999999999999999999999999999999999999,
|
||||
-9999999999999999999999999999999999999999999999999999999999999999999999,
|
||||
'true',
|
||||
'TRUE',
|
||||
'false',
|
||||
'FALSE',
|
||||
'',
|
||||
null
|
||||
]");
|
||||
|
||||
int i = 0;
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(false, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(false, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(true, l[i++]);
|
||||
Assert.AreEqual(false, l[i++]);
|
||||
Assert.AreEqual(false, l[i++]);
|
||||
Assert.AreEqual(null, l[i++]);
|
||||
Assert.AreEqual(null, l[i++]);
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void CaseInsensitiveRequiredPropertyConstructorCreation()
|
||||
{
|
||||
|
||||
@@ -196,7 +196,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
var reader = new JsonTextReader(new StringReader(sb.ToString()));
|
||||
var ser = new JsonSerializer();
|
||||
ser.MetadataPropertyHandling = MetadataPropertyHandling.Default;
|
||||
ser.Deserialize<bool>(reader);
|
||||
ser.Deserialize<float>(reader);
|
||||
}, "Unexpected token when deserializing primitive value: StartObject. Path '$value', line 1, position 11.");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user