commit 6b90ac13e07e619881c627d880215f677c6b6b1c
author Sydney Acksman <obsidianminor@gmail.com> Tue May 28 15:37:04 2019 -0500
committer Sydney Acksman <obsidianminor@gmail.com> Fri Aug 23 17:16:37 2019 -0500
tree 20415839b9accd2bc8219f16ca5cf4e6990e4aca
parent bf4f6c5431aaf54a5c19d16b08b31c6f1b4fc23f

Reorganize some tests

csharp/src/Google.Protobuf.Test/Reflection/CustomOptionsTest.cs

diff --git a/csharp/src/Google.Protobuf.Test/Reflection/CustomOptionsTest.cs b/csharp/src/Google.Protobuf.Test/Reflection/CustomOptionsTest.cs
index 527fa8a..02fe778 100644
--- a/csharp/src/Google.Protobuf.Test/Reflection/CustomOptionsTest.cs
+++ b/csharp/src/Google.Protobuf.Test/Reflection/CustomOptionsTest.cs
@@ -73,8 +73,8 @@
         [Test]
         public void ScalarOptions()
         {
-            var options = CustomOptionOtherValues.Descriptor.CustomOptions;
             var d = CustomOptionOtherValues.Descriptor;
+            var options = d.CustomOptions;
             AssertOption(-100, options.TryGetInt32, Int32Opt, d.GetOption);
             AssertOption(12.3456789f, options.TryGetFloat, FloatOpt, d.GetOption);
             AssertOption(1.234567890123456789d, options.TryGetDouble, DoubleOpt, d.GetOption);
@@ -86,8 +86,9 @@
         [Test]
         public void MessageOptions()
         {
-            var options = VariousComplexOptions.Descriptor.CustomOptions;
-            AssertOption(new ComplexOptionType1 { Foo = 42, Foo4 = { 99, 88 } }, options.TryGetMessage, ComplexOpt1, VariousComplexOptions.Descriptor.GetOption);
+            var d = VariousComplexOptions.Descriptor;
+            var options = d.CustomOptions;
+            AssertOption(new ComplexOptionType1 { Foo = 42, Foo4 = { 99, 88 } }, options.TryGetMessage, ComplexOpt1, d.GetOption);
             AssertOption(new ComplexOptionType2
             {
                 Baz = 987,
@@ -95,8 +96,8 @@
                 Fred = new ComplexOptionType4 { Waldo = 321 },
                 Barney = { new ComplexOptionType4 { Waldo = 101 }, new ComplexOptionType4 { Waldo = 212 } }
             },
-                options.TryGetMessage, ComplexOpt2, VariousComplexOptions.Descriptor.GetOption);
-            AssertOption(new ComplexOptionType3 { Qux = 9 }, options.TryGetMessage, ComplexOpt3, VariousComplexOptions.Descriptor.GetOption);
+                options.TryGetMessage, ComplexOpt2, d.GetOption);
+            AssertOption(new ComplexOptionType3 { Qux = 9 }, options.TryGetMessage, ComplexOpt3, d.GetOption);
         }
 
         [Test]
@@ -132,8 +133,8 @@
         [Test]
         public void MinValues()
         {
-            var options = CustomOptionMinIntegerValues.Descriptor.CustomOptions;
             var d = CustomOptionMinIntegerValues.Descriptor;
+            var options = d.CustomOptions;
             AssertOption(false, options.TryGetBool, BoolOpt, d.GetOption);
             AssertOption(int.MinValue, options.TryGetInt32, Int32Opt, d.GetOption);
             AssertOption(long.MinValue, options.TryGetInt64, Int64Opt, d.GetOption);
@@ -150,8 +151,8 @@
         [Test]
         public void MaxValues()
         {
-            var options = CustomOptionMaxIntegerValues.Descriptor.CustomOptions;
             var d = CustomOptionMaxIntegerValues.Descriptor;
+            var options = d.CustomOptions;
             AssertOption(true, options.TryGetBool, BoolOpt, d.GetOption);
             AssertOption(int.MaxValue, options.TryGetInt32, Int32Opt, d.GetOption);
             AssertOption(long.MaxValue, options.TryGetInt64, Int64Opt, d.GetOption);