Change field name in MaskPositionInfo type

vertigra · Jan 2, 2018 · 7f213c8 · 7f213c8
1 parent 44796a0
commit 7f213c8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/NetTelebot.Tests/NullReferenceExceptionTest/MessageInfoClassTypeTest.cs b/NetTelebot.Tests/NullReferenceExceptionTest/MessageInfoClassTypeTest.cs
@@ -266,8 +266,8 @@ public void TestAppealToTheEmptySticker()
                 Assert.IsInstanceOf(typeof(MaskPositionInfo), sticker.MaskPosition);
                 Assert.AreEqual(sticker.MaskPosition.Point, null);
                 Assert.AreEqual(sticker.MaskPosition.Scale, 0);
-                Assert.AreEqual(sticker.MaskPosition.X_shift, 0);
-                Assert.AreEqual(sticker.MaskPosition.Y_shift, 0);
+                Assert.AreEqual(sticker.MaskPosition.xShift, 0);
+                Assert.AreEqual(sticker.MaskPosition.yShift, 0);
             });
         }
 

diff --git a/NetTelebot.Tests/RequestToMockTest/ClientTest.cs b/NetTelebot.Tests/RequestToMockTest/ClientTest.cs
@@ -1085,8 +1085,8 @@ public void AddStickerToSetTest()
                 {
                     Point = Point.chin,
                     Scale = 123.5,
-                    X_shift = 456.7,
-                    Y_shift = 789.45
+                    xShift = 456.7,
+                    yShift = 789.45
                 });
 
             var request =
@@ -1111,8 +1111,8 @@ public void AddStickerToSetTest()
                 {
                     Point = Point.chin,
                     Scale = 123.5,
-                    X_shift = 456.7,
-                    Y_shift = 789.45
+                    xShift = 456.7,
+                    yShift = 789.45
                 }));
 
         }

diff --git a/NetTelebot.Tests/ResponseTest/MessageInfoParserTest.cs b/NetTelebot.Tests/ResponseTest/MessageInfoParserTest.cs
@@ -614,8 +614,8 @@ public static void MessageInfoStickerTest()
             Assert.Multiple(() =>
             {
                 Assert.AreEqual(Point.forehead, messageInfo.Sticker.MaskPosition.Point);
-                Assert.AreEqual(1.01, messageInfo.Sticker.MaskPosition.X_shift);
-                Assert.AreEqual(1.01, messageInfo.Sticker.MaskPosition.Y_shift);
+                Assert.AreEqual(1.01, messageInfo.Sticker.MaskPosition.xShift);
+                Assert.AreEqual(1.01, messageInfo.Sticker.MaskPosition.yShift);
                 Assert.AreEqual(1.01, messageInfo.Sticker.MaskPosition.Scale);
             });
         }

diff --git a/NetTelebot.Tests/ResponseTest/StickerSetInfoResultParserTest.cs b/NetTelebot.Tests/ResponseTest/StickerSetInfoResultParserTest.cs
@@ -71,8 +71,8 @@ public static void StickerSetInfoResultTest()
             Assert.AreEqual(stickerSetInfoResultString.Result.Stickers[0].Emoji, stickerSetInfoResult.Result.Stickers[0].Emoji);
             Assert.AreEqual(stickerSetInfoResultString.Result.Stickers[0].SetName, stickerSetInfoResult.Result.Stickers[0].SetName);
             Assert.AreEqual(Point.chin, stickerSetInfoResult.Result.Stickers[0].MaskPosition.Point);
-            Assert.AreEqual(stickerSetInfoResultString.Result.Stickers[0].MaskPosition.X_shift, stickerSetInfoResult.Result.Stickers[0].MaskPosition.X_shift);
-            Assert.AreEqual(stickerSetInfoResultString.Result.Stickers[0].MaskPosition.Y_shift, stickerSetInfoResult.Result.Stickers[0].MaskPosition.Y_shift);
+            Assert.AreEqual(stickerSetInfoResultString.Result.Stickers[0].MaskPosition.X_shift, stickerSetInfoResult.Result.Stickers[0].MaskPosition.xShift);
+            Assert.AreEqual(stickerSetInfoResultString.Result.Stickers[0].MaskPosition.Y_shift, stickerSetInfoResult.Result.Stickers[0].MaskPosition.yShift);
             Assert.AreEqual(stickerSetInfoResultString.Result.Stickers[0].MaskPosition.Scale, stickerSetInfoResult.Result.Stickers[0].MaskPosition.Scale);
             Assert.AreEqual(stickerSetInfoResultString.Result.Stickers[0].FileSize, stickerSetInfoResult.Result.Stickers[0].FileSize);
         }

diff --git a/NetTelebot/Type/Sticker/MaskPositionInfo.cs b/NetTelebot/Type/Sticker/MaskPositionInfo.cs
@@ -2,8 +2,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-// ReSharper disable InconsistentNaming
-
 namespace NetTelebot.Type.Sticker
 {
     /// <summary>
@@ -24,14 +22,14 @@ public class MaskPositionInfo
         /// For example, choosing -1.0 will place mask just to the left of the default mask position.
         /// </summary>
         [JsonProperty("x_shift", Required = Required.Always)]
-        public double X_shift { get; set; }
+        public double xShift { get; set; }
 
         /// <summary>
         /// Shift by Y-axis measured in heights of the mask scaled to the face size, from top to bottom. 
         /// For example, 1.0 will place the mask just below the default mask position.
         /// </summary>
         [JsonProperty("y_shift", Required = Required.Always)]
-        public double Y_shift { get; set; }
+        public double yShift { get; set; }
 
         /// <summary>
         /// Mask scaling coefficient. For example, 2.0 means double size.