Improve exception when number cannot be read as type (#1782)
This commit is contained in:
@@ -0,0 +1,81 @@
|
|||||||
|
#region License
|
||||||
|
// Copyright (c) 2007 James Newton-King
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person
|
||||||
|
// obtaining a copy of this software and associated documentation
|
||||||
|
// files (the "Software"), to deal in the Software without
|
||||||
|
// restriction, including without limitation the rights to use,
|
||||||
|
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the
|
||||||
|
// Software is furnished to do so, subject to the following
|
||||||
|
// conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be
|
||||||
|
// included in all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#if !NET20
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Reflection.Emit;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
#if !(NET20 || NET35 || NET40 || PORTABLE40)
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
#endif
|
||||||
|
using Newtonsoft.Json.Converters;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using Newtonsoft.Json.Serialization;
|
||||||
|
using Newtonsoft.Json.Utilities;
|
||||||
|
#if DNXCORE50
|
||||||
|
using Xunit;
|
||||||
|
using Test = Xunit.FactAttribute;
|
||||||
|
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
|
||||||
|
#else
|
||||||
|
using NUnit.Framework;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace Newtonsoft.Json.Tests.Issues
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
public class Issue1778 : TestFixtureBase
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void Test()
|
||||||
|
{
|
||||||
|
JsonTextReader reader = new JsonTextReader(new StringReader(@"{""enddate"":-1}"));
|
||||||
|
reader.Read();
|
||||||
|
reader.Read();
|
||||||
|
|
||||||
|
ExceptionAssert.Throws<JsonReaderException>(
|
||||||
|
() => reader.ReadAsDateTime(),
|
||||||
|
"Cannot read number value as type. Path 'enddate', line 1, position 13.");
|
||||||
|
}
|
||||||
|
|
||||||
|
#if !(NET20 || NET35 || NET40 || PORTABLE40)
|
||||||
|
[Test]
|
||||||
|
public async Task Test_Async()
|
||||||
|
{
|
||||||
|
JsonTextReader reader = new JsonTextReader(new StringReader(@"{""enddate"":-1}"));
|
||||||
|
reader.Read();
|
||||||
|
reader.Read();
|
||||||
|
|
||||||
|
await ExceptionAssert.ThrowsAsync<JsonReaderException>(
|
||||||
|
() => reader.ReadAsDateTimeAsync(),
|
||||||
|
"Cannot read number value as type. Path 'enddate', line 1, position 13.");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
@@ -12,10 +12,13 @@
|
|||||||
<AssemblyName>Newtonsoft.Json.Tests</AssemblyName>
|
<AssemblyName>Newtonsoft.Json.Tests</AssemblyName>
|
||||||
<RootNamespace>Newtonsoft.Json.Tests</RootNamespace>
|
<RootNamespace>Newtonsoft.Json.Tests</RootNamespace>
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
|
<!-- Workaround for https://github.com/nunit/nunit3-vs-adapter/issues/296 -->
|
||||||
|
<DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp1.0' AND '$(TargetFramework)' != 'netcoreapp1.1' AND '$(TargetFramework)' != 'netcoreapp2.0'">Full</DebugType>
|
||||||
<!-- Disabled because SourceLink isn't referenced to calculate paths -->
|
<!-- Disabled because SourceLink isn't referenced to calculate paths -->
|
||||||
<DeterministicSourcePaths>false</DeterministicSourcePaths>
|
<DeterministicSourcePaths>false</DeterministicSourcePaths>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
|
||||||
<None Remove="**\*.orig" />
|
<None Remove="**\*.orig" />
|
||||||
<None Include="large.json">
|
<None Include="large.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
|||||||
@@ -1940,7 +1940,9 @@ namespace Newtonsoft.Json
|
|||||||
bool singleDigit = (char.IsDigit(firstChar) && _stringReference.Length == 1);
|
bool singleDigit = (char.IsDigit(firstChar) && _stringReference.Length == 1);
|
||||||
bool nonBase10 = (firstChar == '0' && _stringReference.Length > 1 && _stringReference.Chars[_stringReference.StartIndex + 1] != '.' && _stringReference.Chars[_stringReference.StartIndex + 1] != 'e' && _stringReference.Chars[_stringReference.StartIndex + 1] != 'E');
|
bool nonBase10 = (firstChar == '0' && _stringReference.Length > 1 && _stringReference.Chars[_stringReference.StartIndex + 1] != '.' && _stringReference.Chars[_stringReference.StartIndex + 1] != 'e' && _stringReference.Chars[_stringReference.StartIndex + 1] != 'E');
|
||||||
|
|
||||||
if (readType == ReadType.ReadAsString)
|
switch (readType)
|
||||||
|
{
|
||||||
|
case ReadType.ReadAsString:
|
||||||
{
|
{
|
||||||
string number = _stringReference.ToString();
|
string number = _stringReference.ToString();
|
||||||
|
|
||||||
@@ -1974,7 +1976,8 @@ namespace Newtonsoft.Json
|
|||||||
numberType = JsonToken.String;
|
numberType = JsonToken.String;
|
||||||
numberValue = number;
|
numberValue = number;
|
||||||
}
|
}
|
||||||
else if (readType == ReadType.ReadAsInt32)
|
break;
|
||||||
|
case ReadType.ReadAsInt32:
|
||||||
{
|
{
|
||||||
if (singleDigit)
|
if (singleDigit)
|
||||||
{
|
{
|
||||||
@@ -2015,7 +2018,8 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
numberType = JsonToken.Integer;
|
numberType = JsonToken.Integer;
|
||||||
}
|
}
|
||||||
else if (readType == ReadType.ReadAsDecimal)
|
break;
|
||||||
|
case ReadType.ReadAsDecimal:
|
||||||
{
|
{
|
||||||
if (singleDigit)
|
if (singleDigit)
|
||||||
{
|
{
|
||||||
@@ -2053,7 +2057,8 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
numberType = JsonToken.Float;
|
numberType = JsonToken.Float;
|
||||||
}
|
}
|
||||||
else if (readType == ReadType.ReadAsDouble)
|
break;
|
||||||
|
case ReadType.ReadAsDouble:
|
||||||
{
|
{
|
||||||
if (singleDigit)
|
if (singleDigit)
|
||||||
{
|
{
|
||||||
@@ -2092,7 +2097,9 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
numberType = JsonToken.Float;
|
numberType = JsonToken.Float;
|
||||||
}
|
}
|
||||||
else
|
break;
|
||||||
|
case ReadType.Read:
|
||||||
|
case ReadType.ReadAsInt64:
|
||||||
{
|
{
|
||||||
if (singleDigit)
|
if (singleDigit)
|
||||||
{
|
{
|
||||||
@@ -2171,6 +2178,10 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw JsonReaderException.Create(this, "Cannot read number value as type.");
|
||||||
|
}
|
||||||
|
|
||||||
ClearRecentString();
|
ClearRecentString();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user