diff --git a/FinModelUtility/Fin/Fin Tests/data/IndexableDictionaryTests.cs b/FinModelUtility/Fin/Fin Tests/data/IndexableDictionaryTests.cs index 2f29f5fa3..4a7b7ed5c 100644 --- a/FinModelUtility/Fin/Fin Tests/data/IndexableDictionaryTests.cs +++ b/FinModelUtility/Fin/Fin Tests/data/IndexableDictionaryTests.cs @@ -91,7 +91,7 @@ public void TestEnumeratorLinq() { dict[index1] = "string1"; var values = dict.ToArray(); - Asserts.Equal( + Asserts.SequenceEqual( new[] { "string1", "string3", "string5", }, values); } diff --git a/FinModelUtility/Fin/Fin Tests/data/KeyframesTests.cs b/FinModelUtility/Fin/Fin Tests/data/KeyframesTests.cs index 74c647b0a..cf9a530f3 100644 --- a/FinModelUtility/Fin/Fin Tests/data/KeyframesTests.cs +++ b/FinModelUtility/Fin/Fin Tests/data/KeyframesTests.cs @@ -218,7 +218,7 @@ private void AssertKeyframe_(Keyframe? expected, private void AssertKeyframes_(Keyframes actual, params Keyframe[] expected) { - Asserts.Equal(expected, actual.Definitions); + Asserts.SequenceEqual(expected, actual.Definitions); } } } \ No newline at end of file diff --git a/FinModelUtility/Fin/Fin Tests/data/ListDictionaryTests.cs b/FinModelUtility/Fin/Fin Tests/data/ListDictionaryTests.cs index f6ad89739..e86b1b6b4 100644 --- a/FinModelUtility/Fin/Fin Tests/data/ListDictionaryTests.cs +++ b/FinModelUtility/Fin/Fin Tests/data/ListDictionaryTests.cs @@ -60,13 +60,13 @@ public void TestTryGetList() { Assert.AreEqual(9, impl.Count); Assert.AreEqual(true, impl.TryGetList("foo", out var fooList)); - Asserts.Equal(new[] { "a", "b", "c" }, fooList!); + Asserts.SequenceEqual(new[] { "a", "b", "c" }, fooList!); Assert.AreEqual(true, impl.TryGetList("bar", out var barList)); - Asserts.Equal(new[] { "1", "2", "3" }, barList!); + Asserts.SequenceEqual(new[] { "1", "2", "3" }, barList!); Assert.AreEqual(true, impl.TryGetList(null, out var nullList)); - Asserts.Equal(new[] { "x", "y", "z" }, nullList!); + Asserts.SequenceEqual(new[] { "x", "y", "z" }, nullList!); } [Test] @@ -95,9 +95,11 @@ public void TestEnumeratorLinq() { Assert.AreEqual(true, impl.TryGetList("bar", out var barList)); Assert.AreEqual(true, impl.TryGetList(null, out var nullList)); - Asserts.Equal(new[] { - ("foo", fooList!), ("bar", barList!), (null, nullList!), - }, + Asserts.SequenceEqual([ + ("bar", barList!), + ("foo", fooList!), + (null, nullList!), + ], actualValues); } @@ -128,10 +130,10 @@ public void TestEnumeratorManually() { Assert.AreEqual(true, impl.TryGetList(null, out var nullList)); Assert.AreEqual(true, enumerator.MoveNext()); - Assert.AreEqual(("foo", fooList!), enumerator.Current); + Assert.AreEqual(("bar", barList!), enumerator.Current); Assert.AreEqual(true, enumerator.MoveNext()); - Assert.AreEqual(("bar", barList!), enumerator.Current); + Assert.AreEqual(("foo", fooList!), enumerator.Current); Assert.AreEqual(true, enumerator.MoveNext()); Assert.AreEqual(((string?) null, nullList!), enumerator.Current); diff --git a/FinModelUtility/Fin/Fin Tests/data/SetDictionaryTests.cs b/FinModelUtility/Fin/Fin Tests/data/SetDictionaryTests.cs index a9522e367..b0439dbe2 100644 --- a/FinModelUtility/Fin/Fin Tests/data/SetDictionaryTests.cs +++ b/FinModelUtility/Fin/Fin Tests/data/SetDictionaryTests.cs @@ -18,7 +18,7 @@ public void TestAdd() { Assert.AreEqual(2, impl.Count); Assert.True(impl.TryGetSet("foo", out var outSet)); Assert.AreEqual(outSet!, impl["foo"]); - Asserts.Equal>(outSet!.Order(), new[] { "bar", "goo"}); + Asserts.SequenceEqual>(outSet!.Order(), new[] { "bar", "goo"}); } [Test] diff --git a/FinModelUtility/Fin/Fin Tests/data/lazy/LazyArrayTests.cs b/FinModelUtility/Fin/Fin Tests/data/lazy/LazyArrayTests.cs index 8a170aa30..71ce40b8b 100644 --- a/FinModelUtility/Fin/Fin Tests/data/lazy/LazyArrayTests.cs +++ b/FinModelUtility/Fin/Fin Tests/data/lazy/LazyArrayTests.cs @@ -36,8 +36,8 @@ public void TestEnumerators() { Assert.AreEqual("foo1", lazyReverseMap[1]); Assert.AreEqual("foo5", lazyReverseMap[5]); - Asserts.Equal(lazyReverseMap.Keys, new[] { 1, 3, 5 }); - Asserts.Equal(lazyReverseMap.Values, new[] { "foo1", "foo3", "foo5" }); + Asserts.SequenceEqual(lazyReverseMap.Keys, new[] { 1, 3, 5 }); + Asserts.SequenceEqual(lazyReverseMap.Values, new[] { "foo1", "foo3", "foo5" }); } } } \ No newline at end of file diff --git a/FinModelUtility/Fin/Fin Tests/data/lazy/LazyDictionaryTests.cs b/FinModelUtility/Fin/Fin Tests/data/lazy/LazyDictionaryTests.cs index fae5a1b63..dd0406e32 100644 --- a/FinModelUtility/Fin/Fin Tests/data/lazy/LazyDictionaryTests.cs +++ b/FinModelUtility/Fin/Fin Tests/data/lazy/LazyDictionaryTests.cs @@ -114,9 +114,9 @@ public void TestEnumerators() { Assert.AreEqual("rab", lazyReverseMap["bar"]); Assert.AreEqual("oog", lazyReverseMap["goo"]); - Asserts.Equal>(lazyReverseMap.Keys.Order(), + Asserts.SequenceEqual>(lazyReverseMap.Keys.Order(), new[] { "bar", "foo", "goo" }); - Asserts.Equal>(lazyReverseMap.Values.Order(), + Asserts.SequenceEqual>(lazyReverseMap.Values.Order(), new[] { "oof", "oog", "rab", }); } } diff --git a/FinModelUtility/Fin/Fin Tests/data/nodes/TreeNodeTests.cs b/FinModelUtility/Fin/Fin Tests/data/nodes/TreeNodeTests.cs index a9624e5bd..b47b875b4 100644 --- a/FinModelUtility/Fin/Fin Tests/data/nodes/TreeNodeTests.cs +++ b/FinModelUtility/Fin/Fin Tests/data/nodes/TreeNodeTests.cs @@ -30,7 +30,7 @@ public void TestIterating() { finQueue.Enqueue(node.ChildNodes); } - Asserts.Equal>( + Asserts.SequenceEqual>( actualValues, new[] { "root", "foo", "bar", "123", "abc" }); } @@ -55,7 +55,7 @@ public void TestAncestors() { } } - Asserts.Equal>( + Asserts.SequenceEqual>( actualValues, new[] { "123", "foo", "root" }); } @@ -73,17 +73,17 @@ public void TestReplacingParent() { nodeChild.Parent = nodeFoo; Assert.AreEqual(nodeFoo, nodeChild.Parent); - Asserts.Equal(nodeFoo.ChildNodes, new[] { nodeChild }); + Asserts.SequenceEqual(nodeFoo.ChildNodes, new[] { nodeChild }); Assert.AreEqual(0, nodeBar.ChildNodes.Count()); nodeBar.AddChild(nodeChild); Assert.AreEqual(nodeBar, nodeChild.Parent); - Asserts.Equal(nodeBar.ChildNodes, new[] { nodeChild }); + Asserts.SequenceEqual(nodeBar.ChildNodes, new[] { nodeChild }); Assert.AreEqual(0, nodeFoo.ChildNodes.Count()); nodeChild.Parent = nodeFoo; Assert.AreEqual(nodeFoo, nodeChild.Parent); - Asserts.Equal(nodeFoo.ChildNodes, new[] { nodeChild }); + Asserts.SequenceEqual(nodeFoo.ChildNodes, new[] { nodeChild }); Assert.AreEqual(0, nodeBar.ChildNodes.Count()); } } diff --git a/FinModelUtility/Fin/Fin Tests/data/queue/FinQueueTests.cs b/FinModelUtility/Fin/Fin Tests/data/queue/FinQueueTests.cs index 48d6085fc..6f8fb0a0b 100644 --- a/FinModelUtility/Fin/Fin Tests/data/queue/FinQueueTests.cs +++ b/FinModelUtility/Fin/Fin Tests/data/queue/FinQueueTests.cs @@ -96,7 +96,7 @@ public void TestEnumeratorLinq() { var queue = new FinQueue(expectedValues); var actualValues = queue.ToArray(); - Asserts.Equal(expectedValues, actualValues); + Asserts.SequenceEqual(expectedValues, actualValues); } [Test] diff --git a/FinModelUtility/Fin/Fin Tests/data/queue/FinTupleQueueTests.cs b/FinModelUtility/Fin/Fin Tests/data/queue/FinTupleQueueTests.cs index e3ded090e..cb678915d 100644 --- a/FinModelUtility/Fin/Fin Tests/data/queue/FinTupleQueueTests.cs +++ b/FinModelUtility/Fin/Fin Tests/data/queue/FinTupleQueueTests.cs @@ -100,7 +100,7 @@ public void TestEnumeratorLinq() { var queue = new FinQueue<(string, string)>(expectedValues); var actualValues = queue.ToArray(); - Asserts.Equal(expectedValues, actualValues); + Asserts.SequenceEqual(expectedValues, actualValues); } [Test] diff --git a/FinModelUtility/Fin/Fin Tests/util/strings/StringNumberSuffixComparerTests.cs b/FinModelUtility/Fin/Fin Tests/util/strings/StringNumberSuffixComparerTests.cs index d95a94024..af8072431 100644 --- a/FinModelUtility/Fin/Fin Tests/util/strings/StringNumberSuffixComparerTests.cs +++ b/FinModelUtility/Fin/Fin Tests/util/strings/StringNumberSuffixComparerTests.cs @@ -17,7 +17,7 @@ public void TestOrder() { "bar1", "bar2", "bar5", "bar10", "foo1", "foo3", "foo13", }; - Asserts.Equal>( + Asserts.SequenceEqual>( expectedOutputStrings, inputStrings.OrderBy(value => value, new StringNumberSuffixComparer())); diff --git a/FinModelUtility/Fin/Fin/src/audio/io/importers/ogg/OggAudioImporter.cs b/FinModelUtility/Fin/Fin/src/audio/io/importers/ogg/OggAudioImporter.cs index 0084e273e..b2c0c2e03 100644 --- a/FinModelUtility/Fin/Fin/src/audio/io/importers/ogg/OggAudioImporter.cs +++ b/FinModelUtility/Fin/Fin/src/audio/io/importers/ogg/OggAudioImporter.cs @@ -10,7 +10,7 @@ public IAudioBuffer ImportAudio( IAudioManager audioManager, OggAudioFileBundle audioFileBundle) { var oggFile = audioFileBundle.OggFile; - Asserts.Equal(".ogg", oggFile.FileType.ToLower()); + Asserts.SequenceEqual(".ogg", oggFile.FileType.ToLower()); using var ogg = new VorbisReader(oggFile.OpenRead()); diff --git a/FinModelUtility/Fin/Fin/src/util/asserts/Asserts.cs b/FinModelUtility/Fin/Fin/src/util/asserts/Asserts.cs index a95e70c18..727069353 100644 --- a/FinModelUtility/Fin/Fin/src/util/asserts/Asserts.cs +++ b/FinModelUtility/Fin/Fin/src/util/asserts/Asserts.cs @@ -63,7 +63,7 @@ public static bool Equal( return false; } - public static void Equal( + public static void SequenceEqual( TEnumerable enumerableA, TEnumerable enumerableB) where TEnumerable : IEnumerable { var enumeratorA = enumerableA.GetEnumerator(); diff --git a/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/bfire/output/Shadowma.glb b/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/bfire/output/Shadowma.glb index 25f3fa2f3..d7d1053bb 100644 Binary files a/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/bfire/output/Shadowma.glb and b/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/bfire/output/Shadowma.glb differ diff --git a/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/gel_2p/output/Luigi_2p_gel.glb b/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/gel_2p/output/Luigi_2p_gel.glb index fe6d6c39b..5c473195d 100644 Binary files a/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/gel_2p/output/Luigi_2p_gel.glb and b/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/gel_2p/output/Luigi_2p_gel.glb differ diff --git a/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/optdemo1/output/GBH_Dr_Oyama.glb b/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/optdemo1/output/GBH_Dr_Oyama.glb index ea264a856..733970adc 100644 Binary files a/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/optdemo1/output/GBH_Dr_Oyama.glb and b/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/luigis_mansion_3d/optdemo1/output/GBH_Dr_Oyama.glb differ diff --git a/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/majoras_mask_3d/zelda_cow/output/cow.glb b/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/majoras_mask_3d/zelda_cow/output/cow.glb index 016e881f6..86f95908f 100644 Binary files a/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/majoras_mask_3d/zelda_cow/output/cow.glb and b/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/majoras_mask_3d/zelda_cow/output/cow.glb differ diff --git a/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/ocarina_of_time_3d/zelda_cow/output/cow.glb b/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/ocarina_of_time_3d/zelda_cow/output/cow.glb index 4458b33ce..04ac87be6 100644 Binary files a/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/ocarina_of_time_3d/zelda_cow/output/cow.glb and b/FinModelUtility/Formats/Cmb/Cmb Tests/goldens/cmb/ocarina_of_time_3d/zelda_cow/output/cow.glb differ diff --git a/FinModelUtility/Formats/Glo/Glo Tests/goldens/chuck/output/CHUCK.glb b/FinModelUtility/Formats/Glo/Glo Tests/goldens/chuck/output/CHUCK.glb index 478133920..5614a8ab4 100644 Binary files a/FinModelUtility/Formats/Glo/Glo Tests/goldens/chuck/output/CHUCK.glb and b/FinModelUtility/Formats/Glo/Glo Tests/goldens/chuck/output/CHUCK.glb differ diff --git a/FinModelUtility/Formats/Glo/Glo Tests/goldens/joff/output/joff.glb b/FinModelUtility/Formats/Glo/Glo Tests/goldens/joff/output/joff.glb index fcccb5a03..1536ab06f 100644 Binary files a/FinModelUtility/Formats/Glo/Glo Tests/goldens/joff/output/joff.glb and b/FinModelUtility/Formats/Glo/Glo Tests/goldens/joff/output/joff.glb differ diff --git a/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_Armor/output/enemy.glb b/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_Armor/output/enemy.glb index 92e15c088..0b92ba8c6 100644 Binary files a/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_Armor/output/enemy.glb and b/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_Armor/output/enemy.glb differ diff --git a/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_BigFoot/output/enemy.glb b/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_BigFoot/output/enemy.glb index 642bef56d..87e98f7d1 100644 Binary files a/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_BigFoot/output/enemy.glb and b/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_BigFoot/output/enemy.glb differ diff --git a/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_Chappy/output/enemy.glb b/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_Chappy/output/enemy.glb index 7c0c060b0..3705b6ea4 100644 Binary files a/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_Chappy/output/enemy.glb and b/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/pikmin_2_Chappy/output/enemy.glb differ diff --git a/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/super_mario_sunshine_kinopio/output/kinopio_body.glb b/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/super_mario_sunshine_kinopio/output/kinopio_body.glb index 380a54f42..0fb45d9cc 100644 Binary files a/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/super_mario_sunshine_kinopio/output/kinopio_body.glb and b/FinModelUtility/Formats/JSystem/JSystem Tests/goldens/super_mario_sunshine_kinopio/output/kinopio_body.glb differ diff --git a/FinModelUtility/Formats/Mod/Mod Tests/goldens/chappy/output/chappy.glb b/FinModelUtility/Formats/Mod/Mod Tests/goldens/chappy/output/chappy.glb index 5e3aacb28..06a4d5723 100644 Binary files a/FinModelUtility/Formats/Mod/Mod Tests/goldens/chappy/output/chappy.glb and b/FinModelUtility/Formats/Mod/Mod Tests/goldens/chappy/output/chappy.glb differ diff --git a/FinModelUtility/Formats/Mod/Mod Tests/goldens/kabekuiC/output/kabekuiC.glb b/FinModelUtility/Formats/Mod/Mod Tests/goldens/kabekuiC/output/kabekuiC.glb index 9dffdb0ab..f3d195eb3 100644 Binary files a/FinModelUtility/Formats/Mod/Mod Tests/goldens/kabekuiC/output/kabekuiC.glb and b/FinModelUtility/Formats/Mod/Mod Tests/goldens/kabekuiC/output/kabekuiC.glb differ diff --git a/FinModelUtility/Formats/Mod/Mod Tests/goldens/king/output/king.glb b/FinModelUtility/Formats/Mod/Mod Tests/goldens/king/output/king.glb index 78186be31..085749685 100644 Binary files a/FinModelUtility/Formats/Mod/Mod Tests/goldens/king/output/king.glb and b/FinModelUtility/Formats/Mod/Mod Tests/goldens/king/output/king.glb differ diff --git a/FinModelUtility/Formats/Mod/Mod Tests/goldens/kogane/output/kogane.glb b/FinModelUtility/Formats/Mod/Mod Tests/goldens/kogane/output/kogane.glb index 834ac18a5..688faca7e 100644 Binary files a/FinModelUtility/Formats/Mod/Mod Tests/goldens/kogane/output/kogane.glb and b/FinModelUtility/Formats/Mod/Mod Tests/goldens/kogane/output/kogane.glb differ diff --git a/FinModelUtility/Formats/Mod/Mod Tests/goldens/snake/output/snake.glb b/FinModelUtility/Formats/Mod/Mod Tests/goldens/snake/output/snake.glb index b733d2356..9a8c2ad83 100644 Binary files a/FinModelUtility/Formats/Mod/Mod Tests/goldens/snake/output/snake.glb and b/FinModelUtility/Formats/Mod/Mod Tests/goldens/snake/output/snake.glb differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/modl/battalion_wars_1/TVET/output/TVET.glb b/FinModelUtility/Formats/Modl/Modl Tests/goldens/modl/battalion_wars_1/TVET/output/TVET.glb index 435fde354..7b6279c81 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/modl/battalion_wars_1/TVET/output/TVET.glb and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/modl/battalion_wars_1/TVET/output/TVET.glb differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/modl/battalion_wars_2/TVET/output/LG_HI_LOD.glb b/FinModelUtility/Formats/Modl/Modl Tests/goldens/modl/battalion_wars_2/TVET/output/LG_HI_LOD.glb index a611d7b5f..33dd99aa3 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/modl/battalion_wars_2/TVET/output/LG_HI_LOD.glb and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/modl/battalion_wars_2/TVET/output/LG_HI_LOD.glb differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus.glb b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus.glb index 16d176bc7..1eee8ec2a 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus.glb and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus.glb differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_0.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_0.png index e6d4bb733..f5abd5c97 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_0.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_0.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_2.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_2.png index f5abd5c97..d42973ba0 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_2.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_2.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_3.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_3.png index a04d42528..d272c1900 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_3.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_3.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_4.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_4.png index d42973ba0..a04d42528 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_4.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_4.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_5.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_5.png index d272c1900..e6d4bb733 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_5.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Bonus/output/C1_Bonus_5.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet.glb b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet.glb index 481ccda4e..a602cf92e 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet.glb and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet.glb differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_0.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_0.png index 496ba9ea9..aafd5f2c8 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_0.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_0.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_1.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_1.png index f5abd5c97..496ba9ea9 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_1.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_1.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_3.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_3.png index a04d42528..2ed5f422b 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_3.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_3.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_6.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_6.png index aafd5f2c8..a04d42528 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_6.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_6.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_8.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_8.png index 2ed5f422b..f5abd5c97 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_8.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_1/C1_Gauntlet/output/C1_Gauntlet_8.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1.glb b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1.glb index 6016122a5..abf8e7694 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1.glb and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1.glb differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1_0.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1_0.png index abdbdc174..3c0a8fcbb 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1_0.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1_0.png differ diff --git a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1_3.png b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1_3.png index 3c0a8fcbb..abdbdc174 100644 Binary files a/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1_3.png and b/FinModelUtility/Formats/Modl/Modl Tests/goldens/out/battalion_wars_2/MP1_L/output/MP1_3.png differ diff --git a/FinModelUtility/Formats/Modl/Modl/src/schema/modl/bw1/node/Bw1Node.cs b/FinModelUtility/Formats/Modl/Modl/src/schema/modl/bw1/node/Bw1Node.cs index 37e7a28e3..365e48ff0 100644 --- a/FinModelUtility/Formats/Modl/Modl/src/schema/modl/bw1/node/Bw1Node.cs +++ b/FinModelUtility/Formats/Modl/Modl/src/schema/modl/bw1/node/Bw1Node.cs @@ -86,7 +86,7 @@ public void Read(IBinaryReader br) { out sectionSize); } - Asserts.Equal("MATL", sectionName); + Asserts.SequenceEqual("MATL", sectionName); var materialSize = 0x48; Asserts.Equal(0, sectionSize % materialSize); diff --git a/FinModelUtility/Formats/Modl/Modl/src/schema/modl/bw2/node/Bw2Node.cs b/FinModelUtility/Formats/Modl/Modl/src/schema/modl/bw2/node/Bw2Node.cs index c223c39d6..6d5e6a271 100644 --- a/FinModelUtility/Formats/Modl/Modl/src/schema/modl/bw2/node/Bw2Node.cs +++ b/FinModelUtility/Formats/Modl/Modl/src/schema/modl/bw2/node/Bw2Node.cs @@ -102,7 +102,7 @@ public void Read(IBinaryReader br) { SectionHeaderUtil.ReadNameAndSize(br, out sectionName, out sectionSize); } - Asserts.Equal("MATL", sectionName); + Asserts.SequenceEqual("MATL", sectionName); var materialSize = 0xA4; Asserts.Equal(0, sectionSize % materialSize); diff --git a/FinModelUtility/Games/HaloWarsTools/Resources/HWUgxResource.cs b/FinModelUtility/Games/HaloWarsTools/Resources/HWUgxResource.cs index ed9f78764..fe8736a9e 100644 --- a/FinModelUtility/Games/HaloWarsTools/Resources/HWUgxResource.cs +++ b/FinModelUtility/Games/HaloWarsTools/Resources/HWUgxResource.cs @@ -250,7 +250,7 @@ private void ImportMesh(byte[] bytes, ModelImpl finModel) { var fromBone = this.VisSubModelRef?.FromBone; if (fromBone != null) { - Asserts.Equal(fromBone, skeletonHeader.Bones[0].Name); + Asserts.SequenceEqual(fromBone, skeletonHeader.Bones[0].Name); } var rootBone = finModel.Skeleton.Root; diff --git a/FinModelUtility/Games/Pikmin2/Pikmin2/src/route/RouteParser.cs b/FinModelUtility/Games/Pikmin2/Pikmin2/src/route/RouteParser.cs index 0e05727e8..b3f178d43 100644 --- a/FinModelUtility/Games/Pikmin2/Pikmin2/src/route/RouteParser.cs +++ b/FinModelUtility/Games/Pikmin2/Pikmin2/src/route/RouteParser.cs @@ -31,7 +31,7 @@ var nodes .ToArray(); for (var i = 0; i < nodeCount; ++i) { - Asserts.Equal("{", lines[lineIndex++]); + Asserts.SequenceEqual("{", lines[lineIndex++]); var nodeIndex = int.Parse(lines[lineIndex++]); var node = nodes[nodeIndex]; @@ -55,7 +55,7 @@ var nodes Radius = floats[3], }; - Asserts.Equal("}", lines[lineIndex++]); + Asserts.SequenceEqual("}", lines[lineIndex++]); } return nodes;