-Added WriteRegex to BsonWriter
-Added RegexConverter -Fixed BsonWriter writing empty string instead of null
This commit is contained in:
@@ -979,5 +979,40 @@ namespace Newtonsoft.Json.Tests.Bson
|
||||
string expected = sb.ToString();
|
||||
Assert.AreEqual(expected, WriteAndReadStringPropertyName(expected));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ReadRegexWithOptions()
|
||||
{
|
||||
string hexdoc = "1A-00-00-00-0B-72-65-67-65-78-00-61-62-63-00-69-00-0B-74-65-73-74-00-00-00-00";
|
||||
|
||||
byte[] data = MiscellaneousUtils.HexToBytes(hexdoc);
|
||||
|
||||
MemoryStream ms = new MemoryStream(data);
|
||||
BsonReader reader = new BsonReader(ms);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||
Assert.AreEqual("/abc/i", reader.Value);
|
||||
Assert.AreEqual(typeof(string), reader.ValueType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||
Assert.AreEqual("//", reader.Value);
|
||||
Assert.AreEqual(typeof(string), reader.ValueType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
|
||||
|
||||
Assert.IsFalse(reader.Read());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -472,5 +472,91 @@ namespace Newtonsoft.Json.Tests.Bson
|
||||
|
||||
Assert.AreEqual(expected, ms.ToArray());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteRegexPlusContent()
|
||||
{
|
||||
MemoryStream ms = new MemoryStream();
|
||||
BsonWriter writer = new BsonWriter(ms);
|
||||
|
||||
writer.WriteStartObject();
|
||||
writer.WritePropertyName("regex");
|
||||
writer.WriteRegex("abc", "i");
|
||||
writer.WritePropertyName("test");
|
||||
writer.WriteRegex(string.Empty, null);
|
||||
writer.WriteEndObject();
|
||||
|
||||
byte[] expected = MiscellaneousUtils.HexToBytes("1A-00-00-00-0B-72-65-67-65-78-00-61-62-63-00-69-00-0B-74-65-73-74-00-00-00-00");
|
||||
|
||||
Assert.AreEqual(expected, ms.ToArray());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializeEmptyAndNullStrings()
|
||||
{
|
||||
Product p = new Product();
|
||||
p.ExpiryDate = DateTime.Parse("2009-04-05T14:45:00Z");
|
||||
p.Name = null;
|
||||
p.Price = 9.95m;
|
||||
p.Sizes = new[] { "Small", "", null };
|
||||
|
||||
MemoryStream ms = new MemoryStream();
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
|
||||
BsonWriter writer = new BsonWriter(ms);
|
||||
serializer.Serialize(writer, p);
|
||||
|
||||
ms.Seek(0, SeekOrigin.Begin);
|
||||
|
||||
BsonReader reader = new BsonReader(ms);
|
||||
Product deserializedProduct = serializer.Deserialize<Product>(reader);
|
||||
|
||||
Console.WriteLine(deserializedProduct.Name);
|
||||
|
||||
Assert.AreEqual(null, deserializedProduct.Name);
|
||||
Assert.AreEqual(9.95m, deserializedProduct.Price);
|
||||
Assert.AreEqual(3, deserializedProduct.Sizes.Length);
|
||||
Assert.AreEqual("Small", deserializedProduct.Sizes[0]);
|
||||
Assert.AreEqual("", deserializedProduct.Sizes[1]);
|
||||
Assert.AreEqual(null, deserializedProduct.Sizes[2]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteReadEmptyAndNullStrings()
|
||||
{
|
||||
MemoryStream ms = new MemoryStream();
|
||||
BsonWriter writer = new BsonWriter(ms);
|
||||
|
||||
writer.WriteStartArray();
|
||||
writer.WriteValue("Content!");
|
||||
writer.WriteValue("");
|
||||
writer.WriteValue((string)null);
|
||||
writer.WriteEndArray();
|
||||
|
||||
ms.Seek(0, SeekOrigin.Begin);
|
||||
|
||||
BsonReader reader = new BsonReader(ms);
|
||||
reader.ReadRootValueAsArray = true;
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.StartArray, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||
Assert.AreEqual("Content!", reader.Value);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||
Assert.AreEqual("", reader.Value);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.Null, reader.TokenType);
|
||||
Assert.AreEqual(null, reader.Value);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.EndArray, reader.TokenType);
|
||||
|
||||
Assert.IsFalse(reader.Read());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,156 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
#if !SILVERLIGHT && !PocketPC && !NET20
|
||||
using System.Data.Linq;
|
||||
#endif
|
||||
#if !SILVERLIGHT
|
||||
using System.Data.SqlTypes;
|
||||
#endif
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using Newtonsoft.Json.Bson;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using Newtonsoft.Json.Utilities;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Converters
|
||||
{
|
||||
public class RegexConverterTests : TestFixtureBase
|
||||
{
|
||||
public class RegexTestClass
|
||||
{
|
||||
public Regex Regex { get; set; }
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializeToText()
|
||||
{
|
||||
Regex regex = new Regex("abc", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
|
||||
|
||||
string json = JsonConvert.SerializeObject(regex, Formatting.Indented, new RegexConverter());
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""Pattern"": ""abc"",
|
||||
""Options"": 513
|
||||
}", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializeToBson()
|
||||
{
|
||||
Regex regex = new Regex("abc", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
|
||||
|
||||
MemoryStream ms = new MemoryStream();
|
||||
BsonWriter writer = new BsonWriter(ms);
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
serializer.Converters.Add(new RegexConverter());
|
||||
|
||||
serializer.Serialize(writer, new RegexTestClass { Regex = regex });
|
||||
|
||||
string expected = "13-00-00-00-0B-52-65-67-65-78-00-61-62-63-00-69-75-00-00";
|
||||
string bson = MiscellaneousUtils.BytesToHex(ms.ToArray());
|
||||
|
||||
Assert.AreEqual(expected, bson);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeFromText()
|
||||
{
|
||||
string json = @"{
|
||||
""Pattern"": ""abc"",
|
||||
""Options"": 513
|
||||
}";
|
||||
|
||||
Regex newRegex = JsonConvert.DeserializeObject<Regex>(json, new RegexConverter());
|
||||
Assert.AreEqual("abc", newRegex.ToString());
|
||||
Assert.AreEqual(RegexOptions.IgnoreCase | RegexOptions.CultureInvariant, newRegex.Options);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeFromBson()
|
||||
{
|
||||
MemoryStream ms = new MemoryStream(MiscellaneousUtils.HexToBytes("13-00-00-00-0B-52-65-67-65-78-00-61-62-63-00-69-75-00-00"));
|
||||
BsonReader reader = new BsonReader(ms);
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
serializer.Converters.Add(new RegexConverter());
|
||||
|
||||
RegexTestClass c = serializer.Deserialize<RegexTestClass>(reader);
|
||||
|
||||
Assert.AreEqual("abc", c.Regex.ToString());
|
||||
Assert.AreEqual(RegexOptions.IgnoreCase, c.Regex.Options);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ConvertEmptyRegexBson()
|
||||
{
|
||||
Regex regex = new Regex(string.Empty);
|
||||
|
||||
MemoryStream ms = new MemoryStream();
|
||||
BsonWriter writer = new BsonWriter(ms);
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
serializer.Converters.Add(new RegexConverter());
|
||||
|
||||
serializer.Serialize(writer, new RegexTestClass { Regex = regex });
|
||||
|
||||
ms.Seek(0, SeekOrigin.Begin);
|
||||
BsonReader reader = new BsonReader(ms);
|
||||
serializer.Converters.Add(new RegexConverter());
|
||||
|
||||
RegexTestClass c = serializer.Deserialize<RegexTestClass>(reader);
|
||||
|
||||
Assert.AreEqual("", c.Regex.ToString());
|
||||
Assert.AreEqual(RegexOptions.None, c.Regex.Options);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ConvertRegexWithAllOptionsBson()
|
||||
{
|
||||
Regex regex = new Regex(
|
||||
"/",
|
||||
RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Multiline | RegexOptions.ExplicitCapture);
|
||||
|
||||
MemoryStream ms = new MemoryStream();
|
||||
BsonWriter writer = new BsonWriter(ms);
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
serializer.Converters.Add(new RegexConverter());
|
||||
|
||||
serializer.Serialize(writer, new RegexTestClass { Regex = regex });
|
||||
|
||||
string expected = "14-00-00-00-0B-52-65-67-65-78-00-2F-00-69-6D-73-75-78-00-00";
|
||||
string bson = MiscellaneousUtils.BytesToHex(ms.ToArray());
|
||||
|
||||
Assert.AreEqual(expected, bson);
|
||||
|
||||
ms.Seek(0, SeekOrigin.Begin);
|
||||
BsonReader reader = new BsonReader(ms);
|
||||
serializer.Converters.Add(new RegexConverter());
|
||||
|
||||
RegexTestClass c = serializer.Deserialize<RegexTestClass>(reader);
|
||||
|
||||
Assert.AreEqual("/", c.Regex.ToString());
|
||||
Assert.AreEqual(RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Multiline | RegexOptions.ExplicitCapture, c.Regex.Options);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ConvertEmptyRegexJson()
|
||||
{
|
||||
Regex regex = new Regex("");
|
||||
|
||||
string json = JsonConvert.SerializeObject(new RegexTestClass { Regex = regex }, Formatting.Indented, new RegexConverter());
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""Regex"": {
|
||||
""Pattern"": """",
|
||||
""Options"": 0
|
||||
}
|
||||
}", json);
|
||||
|
||||
RegexTestClass newRegex = JsonConvert.DeserializeObject<RegexTestClass>(json, new RegexConverter());
|
||||
Assert.AreEqual("", newRegex.Regex.ToString());
|
||||
Assert.AreEqual(RegexOptions.None, newRegex.Regex.Options);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -66,6 +66,8 @@
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\HtmlColorConverterTests.cs" />
|
||||
<Compile Include="Converters\ObjectIdConverterTests.cs" />
|
||||
<Compile Include="Converters\RegexConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\BindingTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JPropertyDescriptorTests.cs" />
|
||||
|
||||
@@ -70,6 +70,8 @@
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\HtmlColorConverterTests.cs" />
|
||||
<Compile Include="Converters\ObjectIdConverterTests.cs" />
|
||||
<Compile Include="Converters\RegexConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="JsonArrayAttributeTests.cs" />
|
||||
<Compile Include="ExceptionTests.cs" />
|
||||
|
||||
@@ -75,6 +75,8 @@
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\HtmlColorConverterTests.cs" />
|
||||
<Compile Include="Converters\ObjectIdConverterTests.cs" />
|
||||
<Compile Include="Converters\RegexConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="ExceptionTests.cs" />
|
||||
<Compile Include="JsonArrayAttributeTests.cs" />
|
||||
|
||||
@@ -87,6 +87,7 @@
|
||||
<Compile Include="Bson\BsonWriterTests.cs" />
|
||||
<Compile Include="Bson\BsonReaderTests.cs" />
|
||||
<Compile Include="Converters\BinaryConverterTests.cs" />
|
||||
<Compile Include="Converters\RegexConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\CustomCreationConverterTests.cs" />
|
||||
|
||||
@@ -50,6 +50,7 @@ using Newtonsoft.Json.Utilities;
|
||||
using System.Reflection;
|
||||
#if !NET20 && !SILVERLIGHT
|
||||
using System.Xml.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
#endif
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Serialization
|
||||
|
||||
Reference in New Issue
Block a user