diff options
| author | James Newton-King <james@newtonking.com> | 2012-03-04 16:10:20 +0400 |
|---|---|---|
| committer | James Newton-King <james@newtonking.com> | 2012-03-04 16:10:20 +0400 |
| commit | fd760e33898cc6b3badaf4a8b77a466139b87fac (patch) | |
| tree | a57a49fd993993c3c9154dd7c096264a0e0f74d1 /Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs | |
| parent | fb2a5998bc2e85bde77ab157c5d30eb4791d809f (diff) | |
-Added DateFormatHandling to control whether dates are written in the MS format or ISO format, with ISO as the default
-Added DateTimeZoneHandling to control reading and writing DateTime time zone details
-Added reader/writer specific Formatting, DateFormatHandling and DateTimeZoneHandling to JsonSerializerSettings
-Added feature of reader/writer specific settings to be set on JsonReader/JsonWriter when serializing
-Added ReadAsDate to JsonReader
-Added ReadAsString to JsonReader
-Changed JsonTextReader to automatically read ISO strings as dates
-Refactored ReadAsXXX methods and reduce code redundancy
-Removed unused JsonDateTimeSerializationMode
Diffstat (limited to 'Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs')
| -rw-r--r-- | Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs index 058072b..c333acc 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs @@ -170,7 +170,7 @@ namespace Newtonsoft.Json.Tests.Converters ]
}";
- DataSet ds = JsonConvert.DeserializeObject<DataSet>(json, new IsoDateTimeConverter());
+ DataSet ds = JsonConvert.DeserializeObject<DataSet>(json);
Assert.IsNotNull(ds);
Assert.AreEqual(2, ds.Tables.Count);
@@ -187,7 +187,7 @@ namespace Newtonsoft.Json.Tests.Converters Assert.AreEqual("TimeSpanCol", dt.Columns[3].ColumnName);
Assert.AreEqual(typeof(string), dt.Columns[3].DataType);
Assert.AreEqual("DateTimeCol", dt.Columns[4].ColumnName);
- Assert.AreEqual(typeof(string), dt.Columns[4].DataType);
+ Assert.AreEqual(typeof(DateTime), dt.Columns[4].DataType);
Assert.AreEqual("DecimalCol", dt.Columns[5].ColumnName);
Assert.AreEqual(typeof(double), dt.Columns[5].DataType);
@@ -270,7 +270,7 @@ namespace Newtonsoft.Json.Tests.Converters ""int32Col"": 1,
""booleanCol"": true,
""timeSpanCol"": ""10.22:10:15.1000000"",
- ""dateTimeCol"": ""\/Date(978048000000)\/"",
+ ""dateTimeCol"": ""2000-12-29T00:00:00Z"",
""decimalCol"": 64.0021
},
{
@@ -278,7 +278,7 @@ namespace Newtonsoft.Json.Tests.Converters ""int32Col"": 2,
""booleanCol"": true,
""timeSpanCol"": ""10.22:10:15.1000000"",
- ""dateTimeCol"": ""\/Date(978048000000)\/"",
+ ""dateTimeCol"": ""2000-12-29T00:00:00Z"",
""decimalCol"": 64.0021
}
],
@@ -288,7 +288,7 @@ namespace Newtonsoft.Json.Tests.Converters ""int32Col"": 1,
""booleanCol"": true,
""timeSpanCol"": ""10.22:10:15.1000000"",
- ""dateTimeCol"": ""\/Date(978048000000)\/"",
+ ""dateTimeCol"": ""2000-12-29T00:00:00Z"",
""decimalCol"": 64.0021
}
]
|