Merge branch 'main' into dev/1.4.x

ChanyaVRC · Dec 20, 2022 · 0b8927a · 0b8927a
2 parents fa91412 + 77a2b3f
commit 0b8927a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/src/VRCOscLib/Tests/vrcosclib.Test/Avatar/OscPhysBoneTests.cs b/src/VRCOscLib/Tests/vrcosclib.Test/Avatar/OscPhysBoneTests.cs
@@ -21,7 +21,6 @@ public void Setup()
         TestUtility.CreateConfigFileForTest(AvatarId, "Test Avatar", TestUtility.GetAvatarConfigDirectory());
         _avatar = OscAvatarConfig.Create(AvatarId)!;
 
-        _server = new OscServer(OscUtility.SendPort);
 
         OscParameter.Parameters.Clear();
     }
@@ -30,18 +29,18 @@ public void Setup()
     public void TearDown()
     {
         TestUtility.RestoreOscDirectory();
-        _server.Dispose();
     }
 
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
+        _server = new OscServer(OscUtility.SendPort);
     }
 
     [OneTimeTearDown]
     public void OneTimeTearDown()
     {
-
+        _server.Dispose();
     }
 
     [Test]

diff --git a/src/VRCOscLib/Tests/vrcosclib.Test/Chatbox/OscChatboxTest.cs b/src/VRCOscLib/Tests/vrcosclib.Test/Chatbox/OscChatboxTest.cs
@@ -13,27 +13,25 @@ public class OscChatboxTest
     [SetUp]
     public void Setup()
     {
-        _server = new OscServer(OscUtility.SendPort);
-
         OscParameter.Parameters.Clear();
     }
 
     [TearDown]
     public void TearDown()
     {
-        _server.Dispose();
+
     }
 
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
-
+        _server = new OscServer(OscUtility.SendPort);
     }
 
     [OneTimeTearDown]
     public void OneTimeTearDown()
     {
-
+        _server.Dispose();
     }
 
 

diff --git a/src/VRCOscLib/Tests/vrcosclib.Test/Utility/OscParameterTests.cs b/src/VRCOscLib/Tests/vrcosclib.Test/Utility/OscParameterTests.cs
@@ -19,29 +19,27 @@ public class OscParameterTests
     [SetUp]
     public void Setup()
     {
-        _client = new OscClient("127.0.0.1", OscUtility.ReceivePort);
-        _server = new OscServer(OscUtility.SendPort);
-
         OscParameter.Parameters.Clear();
     }
 
     [TearDown]
     public void TearDown()
     {
-        _client.Dispose();
-        _server.Dispose();
+
     }
 
     [OneTimeSetUp]
     public void OneTimeSetUp()
     {
-
+        _client = new OscClient(OscUtility.VrcIPAddress, OscUtility.ReceivePort);
+        _server = new OscServer(OscUtility.SendPort);
     }
 
     [OneTimeTearDown]
     public void OneTimeTearDown()
     {
-
+        _client.Dispose();
+        _server.Dispose();
     }
 
     [Test]

diff --git a/src/VRCOscLib/VRCOscLib/Chatbox/OscChatbox.cs b/src/VRCOscLib/VRCOscLib/Chatbox/OscChatbox.cs
@@ -12,12 +12,12 @@ public static class OscChatbox
     /// <summary>
     /// The OSC address for sending chatbox input messages.
     /// </summary>
-    public static string InputAddress = "/chatbox/input";
+    public static readonly string InputAddress = "/chatbox/input";
 
     /// <summary>
     /// The OSC address for sending typing notifications.
     /// </summary>
-    public static string TypingAddress = "/chatbox/typing";
+    public static readonly string TypingAddress = "/chatbox/typing";
 
     /// <summary>
     /// Sends a message to the VRChat chatbox.