reformatted all code to .NET standard formatting
diff --git a/src/ProtocolBuffersLite.Test/InteropLiteTest.cs b/src/ProtocolBuffersLite.Test/InteropLiteTest.cs
index 48537e5..c49e035 100644
--- a/src/ProtocolBuffersLite.Test/InteropLiteTest.cs
+++ b/src/ProtocolBuffersLite.Test/InteropLiteTest.cs
@@ -1,4 +1,5 @@
-#region Copyright notice and license
+#region Copyright notice and license
+
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// http://github.com/jskeet/dotnet-protobufs/
@@ -30,6 +31,7 @@
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
#endregion
using System;
@@ -38,125 +40,147 @@
using Google.ProtocolBuffers.TestProtos;
using NUnit.Framework;
-namespace Google.ProtocolBuffers {
- [TestFixture]
- public class InteropLiteTest {
+namespace Google.ProtocolBuffers
+{
+ [TestFixture]
+ public class InteropLiteTest
+ {
+ [Test]
+ public void TestConvertFromFullMinimal()
+ {
+ TestInteropPerson person = TestInteropPerson.CreateBuilder()
+ .SetId(123)
+ .SetName("abc")
+ .Build();
+ Assert.IsTrue(person.IsInitialized);
- [Test]
- public void TestConvertFromFullMinimal() {
- TestInteropPerson person = TestInteropPerson.CreateBuilder()
- .SetId(123)
- .SetName("abc")
- .Build();
- Assert.IsTrue(person.IsInitialized);
+ TestInteropPersonLite copy = TestInteropPersonLite.ParseFrom(person.ToByteArray());
- TestInteropPersonLite copy = TestInteropPersonLite.ParseFrom(person.ToByteArray());
+ Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
+ }
- Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
+ [Test]
+ public void TestConvertFromFullComplete()
+ {
+ TestInteropPerson person = TestInteropPerson.CreateBuilder()
+ .SetId(123)
+ .SetName("abc")
+ .SetEmail("abc@123.com")
+ .AddRangeCodes(new[] {1, 2, 3})
+ .AddPhone(TestInteropPerson.Types.PhoneNumber.CreateBuilder().SetNumber("555-1234").Build())
+ .AddPhone(TestInteropPerson.Types.PhoneNumber.CreateBuilder().SetNumber("555-5678").Build())
+ .AddAddresses(
+ TestInteropPerson.Types.Addresses.CreateBuilder().SetAddress("123 Seseme").SetCity("Wonderland").
+ SetState("NA").SetZip(12345).Build())
+ .SetExtension(UnitTestExtrasFullProtoFile.EmployeeId,
+ TestInteropEmployeeId.CreateBuilder().SetNumber("123").Build())
+ .Build();
+ Assert.IsTrue(person.IsInitialized);
+
+ ExtensionRegistry registry = ExtensionRegistry.CreateInstance();
+ UnitTestExtrasLiteProtoFile.RegisterAllExtensions(registry);
+
+ TestInteropPersonLite copy = TestInteropPersonLite.ParseFrom(person.ToByteArray(), registry);
+
+ Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
+ }
+
+ [Test]
+ public void TestConvertFromLiteMinimal()
+ {
+ TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder()
+ .SetId(123)
+ .SetName("abc")
+ .Build();
+ Assert.IsTrue(person.IsInitialized);
+
+ TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray());
+
+ Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
+ }
+
+ [Test]
+ public void TestConvertFromLiteComplete()
+ {
+ TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder()
+ .SetId(123)
+ .SetName("abc")
+ .SetEmail("abc@123.com")
+ .AddRangeCodes(new[] {1, 2, 3})
+ .AddPhone(TestInteropPersonLite.Types.PhoneNumber.CreateBuilder().SetNumber("555-1234").Build())
+ .AddPhone(TestInteropPersonLite.Types.PhoneNumber.CreateBuilder().SetNumber("555-5678").Build())
+ .AddAddresses(
+ TestInteropPersonLite.Types.Addresses.CreateBuilder().SetAddress("123 Seseme").SetCity("Wonderland")
+ .SetState("NA").SetZip(12345).Build())
+ .SetExtension(UnitTestExtrasLiteProtoFile.EmployeeIdLite,
+ TestInteropEmployeeIdLite.CreateBuilder().SetNumber("123").Build())
+ .Build();
+ Assert.IsTrue(person.IsInitialized);
+
+ ExtensionRegistry registry = ExtensionRegistry.CreateInstance();
+ UnitTestExtrasFullProtoFile.RegisterAllExtensions(registry);
+
+ TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray(), registry);
+
+ Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
+ }
+
+ public ByteString AllBytes
+ {
+ get
+ {
+ byte[] bytes = new byte[256];
+ for (int i = 0; i < bytes.Length; i++)
+ bytes[i] = (byte) i;
+ return ByteString.CopyFrom(bytes);
+ }
+ }
+
+ [Test]
+ public void TestCompareStringValues()
+ {
+ TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder()
+ .SetId(123)
+ .SetName("abc")
+ .SetEmail("abc@123.com")
+ .AddRangeCodes(new[] {1, 2, 3})
+ .AddPhone(TestInteropPersonLite.Types.PhoneNumber.CreateBuilder().SetNumber("555-1234").Build())
+ .AddPhone(
+ TestInteropPersonLite.Types.PhoneNumber.CreateBuilder().SetNumber(
+ System.Text.Encoding.ASCII.GetString(AllBytes.ToByteArray())).Build())
+ .AddAddresses(
+ TestInteropPersonLite.Types.Addresses.CreateBuilder().SetAddress("123 Seseme").SetCity("Wonderland")
+ .SetState("NA").SetZip(12345).Build())
+ .SetExtension(UnitTestExtrasLiteProtoFile.EmployeeIdLite,
+ TestInteropEmployeeIdLite.CreateBuilder().SetNumber("123").Build())
+ .Build();
+ Assert.IsTrue(person.IsInitialized);
+
+ ExtensionRegistry registry = ExtensionRegistry.CreateInstance();
+ UnitTestExtrasFullProtoFile.RegisterAllExtensions(registry);
+
+ TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray(), registry);
+
+ Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
+
+ TestInteropPerson.Builder copyBuilder = TestInteropPerson.CreateBuilder();
+ TextFormat.Merge(
+ person.ToString().Replace("[protobuf_unittest_extra.employee_id_lite]",
+ "[protobuf_unittest_extra.employee_id]"), registry, copyBuilder);
+
+ copy = copyBuilder.Build();
+ Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
+
+ string liteText = person.ToString().TrimEnd().Replace("\r", "");
+ string fullText = copy.ToString().TrimEnd().Replace("\r", "");
+ //map the extension type
+ liteText = liteText.Replace("[protobuf_unittest_extra.employee_id_lite]",
+ "[protobuf_unittest_extra.employee_id]");
+ //lite version does not indent
+ while (fullText.IndexOf("\n ") >= 0)
+ fullText = fullText.Replace("\n ", "\n");
+
+ Assert.AreEqual(fullText, liteText);
+ }
}
-
- [Test]
- public void TestConvertFromFullComplete() {
- TestInteropPerson person = TestInteropPerson.CreateBuilder()
- .SetId(123)
- .SetName("abc")
- .SetEmail("abc@123.com")
- .AddRangeCodes(new[] { 1, 2, 3 })
- .AddPhone(TestInteropPerson.Types.PhoneNumber.CreateBuilder().SetNumber("555-1234").Build())
- .AddPhone(TestInteropPerson.Types.PhoneNumber.CreateBuilder().SetNumber("555-5678").Build())
- .AddAddresses(TestInteropPerson.Types.Addresses.CreateBuilder().SetAddress("123 Seseme").SetCity("Wonderland").SetState("NA").SetZip(12345).Build())
- .SetExtension(UnitTestExtrasFullProtoFile.EmployeeId, TestInteropEmployeeId.CreateBuilder().SetNumber("123").Build())
- .Build();
- Assert.IsTrue(person.IsInitialized);
-
- ExtensionRegistry registry = ExtensionRegistry.CreateInstance();
- UnitTestExtrasLiteProtoFile.RegisterAllExtensions(registry);
-
- TestInteropPersonLite copy = TestInteropPersonLite.ParseFrom(person.ToByteArray(), registry);
-
- Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
- }
-
- [Test]
- public void TestConvertFromLiteMinimal() {
- TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder()
- .SetId(123)
- .SetName("abc")
- .Build();
- Assert.IsTrue(person.IsInitialized);
-
- TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray());
-
- Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
- }
-
- [Test]
- public void TestConvertFromLiteComplete() {
- TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder()
- .SetId(123)
- .SetName("abc")
- .SetEmail("abc@123.com")
- .AddRangeCodes(new[] { 1, 2, 3 })
- .AddPhone(TestInteropPersonLite.Types.PhoneNumber.CreateBuilder().SetNumber("555-1234").Build())
- .AddPhone(TestInteropPersonLite.Types.PhoneNumber.CreateBuilder().SetNumber("555-5678").Build())
- .AddAddresses(TestInteropPersonLite.Types.Addresses.CreateBuilder().SetAddress("123 Seseme").SetCity("Wonderland").SetState("NA").SetZip(12345).Build())
- .SetExtension(UnitTestExtrasLiteProtoFile.EmployeeIdLite, TestInteropEmployeeIdLite.CreateBuilder().SetNumber("123").Build())
- .Build();
- Assert.IsTrue(person.IsInitialized);
-
- ExtensionRegistry registry = ExtensionRegistry.CreateInstance();
- UnitTestExtrasFullProtoFile.RegisterAllExtensions(registry);
-
- TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray(), registry);
-
- Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
- }
-
- public ByteString AllBytes {
- get {
- byte[] bytes = new byte[256];
- for (int i = 0; i < bytes.Length; i++)
- bytes[i] = (byte)i;
- return ByteString.CopyFrom(bytes);
- }
- }
-
- [Test]
- public void TestCompareStringValues() {
- TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder()
- .SetId(123)
- .SetName("abc")
- .SetEmail("abc@123.com")
- .AddRangeCodes(new[] { 1, 2, 3 })
- .AddPhone(TestInteropPersonLite.Types.PhoneNumber.CreateBuilder().SetNumber("555-1234").Build())
- .AddPhone(TestInteropPersonLite.Types.PhoneNumber.CreateBuilder().SetNumber(System.Text.Encoding.ASCII.GetString(AllBytes.ToByteArray())).Build())
- .AddAddresses(TestInteropPersonLite.Types.Addresses.CreateBuilder().SetAddress("123 Seseme").SetCity("Wonderland").SetState("NA").SetZip(12345).Build())
- .SetExtension(UnitTestExtrasLiteProtoFile.EmployeeIdLite, TestInteropEmployeeIdLite.CreateBuilder().SetNumber("123").Build())
- .Build();
- Assert.IsTrue(person.IsInitialized);
-
- ExtensionRegistry registry = ExtensionRegistry.CreateInstance();
- UnitTestExtrasFullProtoFile.RegisterAllExtensions(registry);
-
- TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray(), registry);
-
- Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
-
- TestInteropPerson.Builder copyBuilder = TestInteropPerson.CreateBuilder();
- TextFormat.Merge(person.ToString().Replace("[protobuf_unittest_extra.employee_id_lite]", "[protobuf_unittest_extra.employee_id]"), registry, copyBuilder);
-
- copy = copyBuilder.Build();
- Assert.AreEqual(person.ToByteArray(), copy.ToByteArray());
-
- string liteText = person.ToString().TrimEnd().Replace("\r", "");
- string fullText = copy.ToString().TrimEnd().Replace("\r", "");
- //map the extension type
- liteText = liteText.Replace("[protobuf_unittest_extra.employee_id_lite]", "[protobuf_unittest_extra.employee_id]");
- //lite version does not indent
- while (fullText.IndexOf("\n ") >= 0)
- fullText = fullText.Replace("\n ", "\n");
-
- Assert.AreEqual(fullText, liteText);
- }
- }
-}
+}
\ No newline at end of file