zzio: Fix RWBS tests

Helco · Jan 21, 2024 · 5b317b3 · 5b317b3
1 parent ac90b67
commit 5b317b3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/zzio.tests/resources/rwbs_sample.dff b/zzio.tests/resources/rwbs_sample.dff
diff --git a/zzio.tests/zzio/rwbs/basic.cs b/zzio.tests/zzio/rwbs/basic.cs
@@ -27,7 +27,7 @@ private void testSection(Section section)
         RWFrameList frameList = (RWFrameList)clump.children[0];
         Assert.AreSame(clump, frameList.parent);
         Assert.AreEqual(SectionId.FrameList, frameList.sectionId);
-        Assert.AreEqual(0, frameList.children.Count);
+        Assert.AreEqual(1, frameList.children.Count);
         Assert.AreEqual(1, frameList.frames.Length);
         Frame frame = frameList.frames[0];
         Assert.AreEqual(0, frame.creationFlags);
@@ -41,17 +41,19 @@ private void testSection(Section section)
         Assert.AreEqual(0.0f, frame.position.Y);
         Assert.AreEqual(0.0f, frame.position.Z);
 
-        Assert.IsInstanceOf(typeof(RWExtension), clump.children[1]);
-        RWExtension extension = (RWExtension)clump.children[1];
-        Assert.AreSame(clump, extension.parent);
-        Assert.AreEqual(0, extension.children.Count);
+        Assert.IsInstanceOf(typeof(RWExtension), frameList.children[0]);
 
-        Assert.IsInstanceOf(typeof(RWGeometryList), clump.children[2]);
-        RWGeometryList geoList = (RWGeometryList)clump.children[2];
+        Assert.IsInstanceOf(typeof(RWGeometryList), clump.children[1]);
+        RWGeometryList geoList = (RWGeometryList)clump.children[1];
         Assert.AreSame(clump, geoList.parent);
         Assert.AreEqual(SectionId.GeometryList, geoList.sectionId);
         Assert.AreEqual(0, geoList.children.Count);
         Assert.AreEqual(0, geoList.geometryCount);
+
+        Assert.IsInstanceOf(typeof(RWExtension), clump.children[2]);
+        RWExtension extension = (RWExtension)clump.children[2];
+        Assert.AreSame(clump, extension.parent);
+        Assert.AreEqual(0, extension.children.Count);
     }
 
     [Test]

diff --git a/zzio/rwbs/ListSection.cs b/zzio/rwbs/ListSection.cs
@@ -15,7 +15,7 @@ protected override void readBody(Stream stream)
         children.Clear();
         long streamLength = stream.Length;
         // there might be padding bytes, check if a header would fit
-        while (streamLength - stream.Position > 12)
+        while (streamLength - stream.Position >= 12)
         {
             children.Add(ReadNew(new GatekeeperStream(stream), this));
         }