more unit tests

Author: dedouwe26

GAIL.Networking/NetworkRegister.cs

@@ -111,9 +111,9 @@ public static uint RegisterPacket(Packet packet) {
         Type type = packet.GetType();
         string name = type.Name;
 
-        if (IsPacketRegistered(type)) {
-            Logger.LogError("Packet ({name}) is already registered.");
-            throw new InvalidOperationException("Packet is already registered");
+        uint? id;
+        if ((id = GetPacketID(packet)) != null) {
+            return id.Value;
         }
 
         ConstructorInfo? constructor;

GAIL/Core/Texture.cs

@@ -1,5 +1,4 @@
 using GAIL.Core.File;
-using OxDED.Terminal.Logging;
 using Silk.NET.GLFW;
 
 namespace GAIL.Core

Tests/GAIL.Networking.Tests/ContainerTests.cs

@@ -1,11 +1,47 @@
+using GAIL.Serializing;
+using GAIL.Serializing.Formatters;
+
 namespace GAIL.Networking.Tests;
 
-public class TestPacket : Packet {
-    
+public class TestPacket : Packet, IEquatable<TestPacket> {
+    [PacketConstructor]
+    public TestPacket() { name = "Admin"; id = 6; isAdmin = true; }
+
+    public string name;
+    [PacketField]
+    private StringSerializable NameField { get => new(name); set => name = value.Value; }
+    public int id;
+    [PacketField]
+    private IntSerializable IDField { get => new(id); set => id = value.Value; }
+    public bool isAdmin;
+    [PacketField]
+    private BoolSerializable IsAdminField { get => new(isAdmin); set => isAdmin = value.B1; }
+
+    /// <inheritdoc/>
+    public bool Equals(TestPacket? other) {
+        if (other is null) { return false; }
+        if (ReferenceEquals(this, other)) { return true; }
+        if (GetType() != other.GetType()) { return false; }
+        
+        return name==other.name && id==other.id && isAdmin==other.isAdmin;
+    }
+    /// <inheritdoc/>
+	public override bool Equals(object? obj) {
+		return Equals(obj as TestPacket);
+	}
+    public override int GetHashCode() {
+        return name.GetHashCode() ^ id.GetHashCode() ^ isAdmin.GetHashCode();
+    }
 }
 
 public class FormattedPacket : Packet {
+    public override IFormatter? Formatter => new GZipFormatter();
+    [PacketConstructor]
+    public FormattedPacket() { message = "AAaaBBbb1234"; }
 
+    public string message;
+    [PacketField]
+    private StringSerializable MessageField { get => new(message); set => message = value.Value; }
 }
 
 public static class Packets {

Tests/GAIL.Networking.Tests/Packets.cs

@@ -0,0 +1,40 @@
+using GAIL.Serializing;
+using GAIL.Serializing.Formatters;
+
+namespace GAIL.Networking.Tests;
+
+public class RegisterTests {
+    [Fact]
+    public void CheckForIDs() {
+        uint original = NetworkRegister.RegisterPacket<TestPacket>();
+        uint? id = NetworkRegister.GetPacketID(new TestPacket());
+        
+        Assert.NotNull(id);
+        Assert.Equal(id, original);
+    }
+    [Fact]
+    public void IsPacketRegistered() {
+        NetworkRegister.RegisterPacket<TestPacket>();
+
+        Assert.True(NetworkRegister.IsPacketRegistered<TestPacket>());
+    }
+    [Fact]
+    public void CheckForFormat() {
+        uint id = NetworkRegister.RegisterPacket<TestPacket>();
+
+        SerializableInfo[] format = NetworkRegister.GetPacketFormat(id);
+
+        Assert.True(
+            format.SequenceEqual([StringSerializable.Info, IntSerializable.Info, BoolSerializable.Info],
+            EqualityComparer<SerializableInfo>.Create((info1, info2) => info1 == info2)
+        ));
+    }
+    [Fact]
+    public void CheckForFormatter() {
+        uint id = NetworkRegister.RegisterPacket<FormattedPacket>();
+
+        IFormatter? formatter = NetworkRegister.GetPacketFormatter(id);
+
+        Assert.IsType<GZipFormatter>(formatter);
+    }
+}

Tests/GAIL.Networking.Tests/RegisterTests.cs

@@ -1,8 +1,48 @@
+using GAIL.Networking.Streams;
+using GAIL.Serializing.Formatters;
+
 namespace GAIL.Networking.Tests;
 
 public class StreamTests {
     [Fact]
     public void SerializingAndParsing() {
         Packets.RegisterPackets();
+
+        TestPacket original = new();
+
+        NetworkSerializer serializer = new(true);
+        serializer.WritePacket(original);
+
+        serializer.OutStream.Position = 0;
+
+        NetworkParser parser = new(serializer.OutStream, false);
+        Packet read = parser.ReadPacket();
+
+        parser.Dispose();
+        serializer.Dispose();
+
+        Assert.True(original.Equals(read));
+    }
+    [Fact]
+    public void SerializingAndParsingWithGlobalFormatter() {
+        Packets.RegisterPackets();
+
+        AESFormatter formatter = new(
+            [.. new byte[32].Select((_, index) => Convert.ToByte(index))], [.. new byte[16].Select((_, index) => Convert.ToByte(index))]
+        );
+        TestPacket original = new();
+
+        NetworkSerializer serializer = new(true);
+        serializer.WritePacket(original, formatter);
+
+        serializer.OutStream.Position = 0;
+
+        NetworkParser parser = new(serializer.OutStream, false);
+        Packet read = parser.ReadPacket(formatter);
+
+        parser.Dispose();
+        serializer.Dispose();
+
+        Assert.True(original.Equals(read));
     }
 }

Tests/GAIL.Networking.Tests/StreamTests.cs

@@ -40,9 +40,9 @@ public void Streams() {
 
         string gotten = parser.ReadString(new GZipFormatter());
 
-        Assert.Equal(actual, gotten);
-
         parser.Dispose();
         serializer.Dispose();
+
+        Assert.Equal(actual, gotten);
     }
 }

Tests/GAIL.Serializing.Tests/FormatterTests.cs

@@ -56,7 +56,7 @@ public void Serializing() {
         TestReducer reducer2 = new("admin", 6, true);
         Serializer serializer2 = new();
 
-        serializer2.WriteReducer(reducer);
+        serializer2.WriteReducer(reducer2);
 
         byte[] gotten2 = (serializer.BaseStream as MemoryStream)!.ToArray();
 
@@ -74,9 +74,9 @@ public void SerializingAndParsing() {
         serializer.BaseStream.Position = 0;
         TestReducer reducer2 = parser.ReadReducer<TestReducer>(TestReducer.Info);
 
-        Assert.True(reducer.Equals(reducer2));
-
         parser.Dispose();
         serializer.Dispose();
+
+        Assert.True(reducer.Equals(reducer2));
     }
 }

Tests/GAIL.Serializing.Tests/ReducerTests.cs

@@ -25,12 +25,12 @@ public void SerializingAndParsing() {
         uint b2 = parser.ReadUInt();
         BoolSerializable b3 = parser.ReadSerializable<BoolSerializable>(BoolSerializable.Info);
 
+        parser.Dispose();
+        serializer.Dispose();
+
         Assert.Equal(a1, b1);
         Assert.Equal(a2, b2);
         Assert.Equal(a3, b3.B1);
         Assert.Equal(a4, b3.B2);
-
-        parser.Dispose();
-        serializer.Dispose();
     }
 }