From 7483bb7f80ad545115fa10f2098fd6048424e83c Mon Sep 17 00:00:00 2001 From: jonaslagoni Date: Sun, 16 Oct 2022 19:59:57 +0200 Subject: [PATCH] refactor: fix test setup --- GamingAPIPlugins.sln | 10 +- .../GamingAPIPluginsTest.csproj | 508 +----------------- .../Properties/AssemblyInfo.cs | 20 - GamingAPIPluginsTest/ServerStartedTest.cs | 15 - GamingAPIPluginsTest/UnitTest1.cs | 40 +- 5 files changed, 37 insertions(+), 556 deletions(-) delete mode 100644 GamingAPIPluginsTest/Properties/AssemblyInfo.cs delete mode 100644 GamingAPIPluginsTest/ServerStartedTest.cs diff --git a/GamingAPIPlugins.sln b/GamingAPIPlugins.sln index 2be23b2..bf1ae8c 100644 --- a/GamingAPIPlugins.sln +++ b/GamingAPIPlugins.sln @@ -4,7 +4,7 @@ VisualStudioVersion = 16.0.31005.135 MinimumVisualStudioVersion = 15.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GamingAPIPlugins", "GamingAPIPlugins\GamingAPIPlugins.csproj", "{E3B20E54-ACFF-4CB1-A5EC-97EB6AB462EF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GamingAPIPluginsTest", "TestProject3\GamingAPIPluginsTest.csproj", "{17A7063D-50C2-48B0-B0BD-886109DA412D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GamingAPIPluginsTest", "GamingAPIPluginsTest\GamingAPIPluginsTest.csproj", "{FC952EF7-5A85-4CD0-B963-4CF9B2E04AA6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -16,10 +16,10 @@ Global {E3B20E54-ACFF-4CB1-A5EC-97EB6AB462EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {E3B20E54-ACFF-4CB1-A5EC-97EB6AB462EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {E3B20E54-ACFF-4CB1-A5EC-97EB6AB462EF}.Release|Any CPU.Build.0 = Release|Any CPU - {17A7063D-50C2-48B0-B0BD-886109DA412D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17A7063D-50C2-48B0-B0BD-886109DA412D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17A7063D-50C2-48B0-B0BD-886109DA412D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17A7063D-50C2-48B0-B0BD-886109DA412D}.Release|Any CPU.Build.0 = Release|Any CPU + {FC952EF7-5A85-4CD0-B963-4CF9B2E04AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FC952EF7-5A85-4CD0-B963-4CF9B2E04AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FC952EF7-5A85-4CD0-B963-4CF9B2E04AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FC952EF7-5A85-4CD0-B963-4CF9B2E04AA6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GamingAPIPluginsTest/GamingAPIPluginsTest.csproj b/GamingAPIPluginsTest/GamingAPIPluginsTest.csproj index c0092c3..7bb7895 100644 --- a/GamingAPIPluginsTest/GamingAPIPluginsTest.csproj +++ b/GamingAPIPluginsTest/GamingAPIPluginsTest.csproj @@ -1,501 +1,19 @@ - - - + + - Debug - AnyCPU - {55C4CE6A-72BA-4EB0-B5FC-64FE1EC58547} - Library - Properties - UnitTestProject2 - UnitTestProject2 - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + net462 + + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\GamingAPIPlugins\Managed\0Harmony.dll - - - - ..\GamingAPIPlugins\Managed\ApexAI.dll - - - ..\GamingAPIPlugins\Managed\ApexSerialization.dll - - - ..\GamingAPIPlugins\Managed\ApexShared.dll - - - ..\GamingAPIPlugins\Managed\Assembly-CSharp.dll - - - ..\GamingAPIPlugins\Managed\Assembly-CSharp-firstpass.dll - - - ..\GamingAPIPlugins\Managed\com.unity.postprocessing.Runtime.dll - - - ..\GamingAPIPlugins\Managed\DryWetMidi.dll - - - ..\GamingAPIPlugins\Managed\EasyAntiCheat.Client.dll - - - ..\GamingAPIPlugins\Managed\EasyAntiCheat.Server.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.Console.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.GoogleSheets.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.Input.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.Network.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.Raknet.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.Rcon.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.Skeleton.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.Sqlite.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.SteamNetworking.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.Steamworks.Posix.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.System.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.Unity.dll - - - ..\GamingAPIPlugins\Managed\Facepunch.UnityEngine.dll - - - ..\GamingAPIPlugins\Managed\Fleck.dll - - - ..\GamingAPIPlugins\Managed\GA.dll - - - ..\GamingAPIPlugins\Managed\I18N.dll - - - ..\GamingAPIPlugins\Managed\I18N.CJK.dll - - - ..\GamingAPIPlugins\Managed\I18N.MidEast.dll - - - ..\GamingAPIPlugins\Managed\I18N.Other.dll - - - ..\GamingAPIPlugins\Managed\I18N.Rare.dll - - - ..\GamingAPIPlugins\Managed\I18N.West.dll - - - ..\GamingAPIPlugins\Managed\Ionic.Zip.Reduced.dll - - - ..\GamingAPIPlugins\Managed\JsonSubTypes.dll - - - ..\GamingAPIPlugins\Managed\LZ4.dll - - - ..\GamingAPIPlugins\Managed\LZ4pn.dll - - - ..\GamingAPIPlugins\Managed\MidiJack.dll - - - ..\GamingAPIPlugins\Managed\Mono.Data.Sqlite.dll - - - ..\GamingAPIPlugins\Managed\Mono.Data.Tds.dll - - - ..\GamingAPIPlugins\Managed\Mono.Posix.dll - - - ..\GamingAPIPlugins\Managed\Mono.Security.dll - - - ..\GamingAPIPlugins\Managed\Mono.WebBrowser.dll - - - ..\GamingAPIPlugins\Managed\MySql.Data.dll - - - ..\GamingAPIPlugins\Managed\NATS.Client.dll - - - False - ..\GamingAPIPlugins\Managed\netstandard.dll - - - ..\GamingAPIPlugins\Managed\NewAssembly.dll - - - False - ..\GamingAPIPlugins\Managed\Newtonsoft.Json.dll - - - ..\GamingAPIPlugins\Managed\Novell.Directory.Ldap.dll - - - ..\GamingAPIPlugins\Managed\Oxide.Core.dll - - - ..\GamingAPIPlugins\Managed\Oxide.CSharp.dll - - - ..\GamingAPIPlugins\Managed\Oxide.MySql.dll - - - ..\GamingAPIPlugins\Managed\Oxide.References.dll - - - ..\GamingAPIPlugins\Managed\Oxide.Rust.dll - - - ..\GamingAPIPlugins\Managed\Oxide.SQLite.dll - - - ..\GamingAPIPlugins\Managed\Oxide.Unity.dll - - - ..\GamingAPIPlugins\Managed\RestSharp.dll - - - ..\GamingAPIPlugins\Managed\Rust.Data.dll - - - ..\GamingAPIPlugins\Managed\Rust.Demo.dll - - - ..\GamingAPIPlugins\Managed\Rust.Global.dll - - - ..\GamingAPIPlugins\Managed\Rust.Harmony.dll - - - ..\GamingAPIPlugins\Managed\Rust.Localization.dll - - - ..\GamingAPIPlugins\Managed\Rust.UI.dll - - - ..\GamingAPIPlugins\Managed\Rust.Workshop.dll - - - ..\GamingAPIPlugins\Managed\Rust.World.dll - - - - ..\GamingAPIPlugins\Managed\System.Buffers.dll - - - - - - - - ..\GamingAPIPlugins\Managed\System.Data.SQLite.dll - - - - False - ..\GamingAPIPlugins\Managed\System.Diagnostics.StackTrace.dll - - - - - - - False - ..\GamingAPIPlugins\Managed\System.Globalization.Extensions.dll - - - - - ..\GamingAPIPlugins\Managed\System.Memory.dll - - - - - ..\GamingAPIPlugins\Managed\System.Numerics.Vectors.dll - - - ..\GamingAPIPlugins\Managed\System.Runtime.dll - - - ..\GamingAPIPlugins\Managed\System.Runtime.CompilerServices.Unsafe.dll - - - - - ..\GamingAPIPlugins\Managed\System.Runtime.Serialization.Xml.dll - - - - False - ..\GamingAPIPlugins\Managed\System.ServiceModel.Internals.dll - - - - - - - - - - False - ..\GamingAPIPlugins\Managed\System.Xml.XPath.XDocument.dll - - - ..\GamingAPIPlugins\Managed\Unity.TextMeshPro.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.AccessibilityModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.AIModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.AndroidJNIModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.AnimationModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.AssetBundleModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.AudioModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.ClothModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.ClusterInputModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.ClusterRendererModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.CoreModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.CrashReportingModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.DirectorModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.DSPGraphModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.GameCenterModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.GridModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.HotReloadModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.ImageConversionModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.IMGUIModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.InputLegacyModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.InputModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.JSONSerializeModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.LocalizationModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.ParticleSystemModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.PerformanceReportingModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.Physics2DModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.PhysicsModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.ProfilerModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.ScreenCaptureModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.SharedInternalsModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.SpriteMaskModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.SpriteShapeModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.StreamingModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.SubstanceModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.SubsystemsModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.TerrainModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.TerrainPhysicsModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.TextCoreModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.TextRenderingModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.TilemapModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.TLSModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UI.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UIElementsModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UIModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UmbraModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UNETModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UnityAnalyticsModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UnityConnectModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UnityTestProtocolModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UnityWebRequestAssetBundleModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UnityWebRequestAudioModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UnityWebRequestModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UnityWebRequestTextureModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.UnityWebRequestWWWModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.VehiclesModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.VFXModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.VideoModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.VRModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.WindModule.dll - - - ..\GamingAPIPlugins\Managed\UnityEngine.XRModule.dll - - - - - - - - + - - 2.1.1 - - - 2.1.1 - + + + + - - {e3b20e54-acff-4cb1-a5ec-97eb6ab462ef} - GamingAPIPlugins - + - - - \ No newline at end of file + + diff --git a/GamingAPIPluginsTest/Properties/AssemblyInfo.cs b/GamingAPIPluginsTest/Properties/AssemblyInfo.cs deleted file mode 100644 index 9610c9e..0000000 --- a/GamingAPIPluginsTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("UnitTestProject2")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnitTestProject2")] -[assembly: AssemblyCopyright("Copyright © 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("55c4ce6a-72ba-4eb0-b5fc-64fe1ec58547")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/GamingAPIPluginsTest/ServerStartedTest.cs b/GamingAPIPluginsTest/ServerStartedTest.cs deleted file mode 100644 index bbc4bfb..0000000 --- a/GamingAPIPluginsTest/ServerStartedTest.cs +++ /dev/null @@ -1,15 +0,0 @@ - -using System.Text.Json; -using Asyncapi.Nats.Client.Models; -using Xunit; - -namespace Asyncapi.Nats.Client.Tests -{ - public class ServerStartedTest - { - [Fact] - public void ShouldSerializeAndDeserializeAccurately() - { - } - } -} \ No newline at end of file diff --git a/GamingAPIPluginsTest/UnitTest1.cs b/GamingAPIPluginsTest/UnitTest1.cs index 5eca65c..5ee543b 100644 --- a/GamingAPIPluginsTest/UnitTest1.cs +++ b/GamingAPIPluginsTest/UnitTest1.cs @@ -1,27 +1,25 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using Oxide.Plugins; -using System.Reflection; -using System.Collections.Generic; -using ConVar; -using Oxide.Ext.GamingApi.MessageQueue; +using Asyncapi.Nats.Client.Models; +using NUnit.Framework; +using System.Text.Json; -namespace Test +namespace GamingAPIPluginTest { - [TestClass] - public class UnitTest1 + public class Tests { - [TestMethod] - public void TestMethod1() + [SetUp] + public void Setup() { - GamingAPI plugin = new GamingAPI(); - MethodInfo methodInfo = typeof(GamingAPI).GetMethod("OnPlayerChat", BindingFlags.NonPublic | BindingFlags.Instance); - var p = new BasePlayer(); - p.UserIDString = "test"; - p.displayName = "test"; - object[] parameters = { p, "test", Chat.ChatChannel.Global }; - methodInfo.Invoke(plugin, parameters); - Assert.AreEqual(GamingApiMessageQueue.Instance.GetCurrentMessagesInQueue(), 1); + } + + [Test] + public void Test1() + { + ServerStarted temp = new ServerStarted(); + temp.Timestamp = "Test"; + string json = JsonSerializer.Serialize(temp); + ServerStarted output = JsonSerializer.Deserialize(json); + string json2 = JsonSerializer.Serialize(output); + Assert.AreEqual(json, json2); } } -} +} \ No newline at end of file