move utility classes after all tests

Author: kyra-rk

tests/MongoDB.Bson.Tests/Serialization/Conventions/ElementNameConventionsTests.cs

@@ -23,12 +23,6 @@ namespace MongoDB.Bson.Tests.Serialization.Conventions
     public class ElementNameConventionsTests
     {
 
-        private class BookWithBsonElementAttribute
-        {
-            [BsonElement("notId")]
-            public ObjectId Id { get; set; } // should not be set to _id
-        }
-
         [Fact]
         public void TestBsonElementAttributeOverridesNamedIdMemberConvention()
         {
@@ -40,14 +34,6 @@ public void TestBsonElementAttributeOverridesNamedIdMemberConvention()
             Assert.Equal("notId", classMap.GetMemberMap(x => x.Id).ElementName);
         }
 
-        private class BookWithBsonIdAttribute
-        {
-            public ObjectId id { get; set; }
-
-            [BsonId]
-            public string Title { get; set; } // should be set to _id
-        }
-
         [Fact]
         public void TestBsonIdAttributeOverridesNamedIdMemberConvention()
         {
@@ -61,15 +47,6 @@ public void TestBsonIdAttributeOverridesNamedIdMemberConvention()
             Assert.Equal("id", classMap.GetMemberMap(x => x.id).ElementName);
         }
 
-        private class BookWithBsonElementAndBsonId
-        {
-            [BsonElement("notId")]
-            public ObjectId Id { get; set; }
-
-            [BsonId]
-            public string Title { get; set; } // should be set to _id
-        }
-
         [Fact]
         public void TestBsonIdAttributeWinsWhenBsonElementSkipsIdProperty()
         {
@@ -81,12 +58,6 @@ public void TestBsonIdAttributeWinsWhenBsonElementSkipsIdProperty()
             Assert.Equal("notId", classMap.GetMemberMap(x => x.Id).ElementName);
         }
 
-        private class BookWithExplicitBsonElementId
-        {
-            [BsonElement("_id")]
-            public string Id { get; set; } // should not be set to _id
-        }
-
         [Fact]
         public void TestBsonElementWithUnderscoreIdOnIdPropertyAlsoBecomesIdMember()
         {
@@ -99,12 +70,6 @@ public void TestBsonElementWithUnderscoreIdOnIdPropertyAlsoBecomesIdMember()
             Assert.Equal("_id", classMap.GetMemberMap(x => x.Id).ElementName);
         }
 
-        private class BookWithExplicitBsonElementIdButNoIdProperty
-        {
-            [BsonElement("_id")]
-            public string Title { get; set; } // should be set to _id
-        }
-
         [Fact]
         public void TestBsonElementWithUnderscoreIdButNoIdPropertyDoesNotBecomeIdMember()
         {
@@ -116,13 +81,6 @@ public void TestBsonElementWithUnderscoreIdButNoIdPropertyDoesNotBecomeIdMember(
             Assert.Equal("_id", classMap.GetMemberMap(x => x.Title).ElementName);
         }
 
-        private class BookWithBsonElementAndFallthrough
-        {
-            [BsonElement("notId")]
-            public ObjectId Id { get; set; }
-            public ObjectId id { get; set; } // should be set to _id
-        }
-
         [Fact]
         public void TestBsonElementOnIdFallsThroughToLowercaseId()
         {
@@ -135,14 +93,6 @@ public void TestBsonElementOnIdFallsThroughToLowercaseId()
             Assert.Equal("notId", classMap.GetMemberMap(x => x.Id).ElementName);
         }
 
-        private class TestClass
-        {
-            public string FirstName { get; set; }
-            public int Age { get; set; }
-            public string _DumbName { get; set; }
-            public string lowerCase { get; set; }
-        }
-
         [Fact]
         public void TestMemberNameElementNameConvention()
         {
@@ -172,5 +122,55 @@ public void TestCamelCaseElementNameConvention()
             Assert.Equal("_DumbName", classMap.GetMemberMap(x => x._DumbName).ElementName);
             Assert.Equal("lowerCase", classMap.GetMemberMap(x => x.lowerCase).ElementName);
         }
+
+        private class BookWithBsonElementAttribute
+        {
+            [BsonElement("notId")]
+            public ObjectId Id { get; set; } // should not be set to _id
+        }
+
+        private class BookWithBsonIdAttribute
+        {
+            public ObjectId id { get; set; }
+
+            [BsonId]
+            public string Title { get; set; } // should be set to _id
+        }
+
+        private class BookWithBsonElementAndBsonId
+        {
+            [BsonElement("notId")]
+            public ObjectId Id { get; set; }
+
+            [BsonId]
+            public string Title { get; set; } // should be set to _id
+        }
+
+        private class BookWithExplicitBsonElementId
+        {
+            [BsonElement("_id")]
+            public string Id { get; set; } // should not be set to _id
+        }
+
+        private class BookWithExplicitBsonElementIdButNoIdProperty
+        {
+            [BsonElement("_id")]
+            public string Title { get; set; } // should be set to _id
+        }
+
+        private class BookWithBsonElementAndFallthrough
+        {
+            [BsonElement("notId")]
+            public ObjectId Id { get; set; }
+            public ObjectId id { get; set; } // should be set to _id
+        }
+
+        private class TestClass
+        {
+            public string FirstName { get; set; }
+            public int Age { get; set; }
+            public string _DumbName { get; set; }
+            public string lowerCase { get; set; }
+        }
     }
 }