Handle unexpected deserializer results

mnadareski · mnadareski · commit 5ae162400cea · 2024-11-27T14:04:20.000-05:00
diff --git a/SabreTools.Serialization.Test/Deserializers/AttractModeTests.cs b/SabreTools.Serialization.Test/Deserializers/AttractModeTests.cs
@@ -36,15 +36,7 @@ public void InvalidArray_Null()
             var deserializer = new Serialization.Deserializers.AttractMode();
 
             var actual = deserializer.Deserialize(data, offset);
-
-            // TODO: Unexpected result
-            // Turns into a single, malformatted header line
-            Assert.NotNull(actual);
-            Assert.NotNull(actual.Header);
-            var col = Assert.Single(actual.Header);
-            Assert.Equal(1024, col.Length);
-            Assert.NotNull(actual.Row);
-            Assert.Empty(actual.Row);
+            Assert.Null(actual);
         }
 
         [Fact]
@@ -74,15 +66,7 @@ public void InvalidStream_Null()
             var deserializer = new Serialization.Deserializers.AttractMode();
 
             var actual = deserializer.Deserialize(data);
-
-            // TODO: Unexpected result
-            // Turns into a single, malformatted header line
-            Assert.NotNull(actual);
-            Assert.NotNull(actual.Header);
-            var col = Assert.Single(actual.Header);
-            Assert.Equal(1024, col.Length);
-            Assert.NotNull(actual.Row);
-            Assert.Empty(actual.Row);
+            Assert.Null(actual);
         }
     }
 }
diff --git a/SabreTools.Serialization.Test/Deserializers/ClrMameProTests.cs b/SabreTools.Serialization.Test/Deserializers/ClrMameProTests.cs
@@ -36,13 +36,7 @@ public void InvalidArray_Null()
             var deserializer = new Serialization.Deserializers.ClrMamePro();
 
             var actual = deserializer.Deserialize(data, offset);
-
-            // TODO: Unexpected result
-            // Turns into an empty model
-            Assert.NotNull(actual);
-            Assert.Equal(default, actual.ClrMamePro);
-            Assert.NotNull(actual.Game);
-            Assert.Empty(actual.Game);
+            Assert.Null(actual);
         }
 
         [Fact]
@@ -72,13 +66,7 @@ public void InvalidStream_Null()
             var deserializer = new Serialization.Deserializers.ClrMamePro();
 
             var actual = deserializer.Deserialize(data);
-
-            // TODO: Unexpected result
-            // Turns into an empty model
-            Assert.NotNull(actual);
-            Assert.Equal(default, actual.ClrMamePro);
-            Assert.NotNull(actual.Game);
-            Assert.Empty(actual.Game);
+            Assert.Null(actual);
         }
     }
 }
diff --git a/SabreTools.Serialization.Test/Deserializers/DosCenterTests.cs b/SabreTools.Serialization.Test/Deserializers/DosCenterTests.cs
@@ -36,13 +36,7 @@ public void InvalidArray_Null()
             var deserializer = new Serialization.Deserializers.DosCenter();
 
             var actual = deserializer.Deserialize(data, offset);
-
-            // TODO: Unexpected result
-            // Turns into an empty model
-            Assert.NotNull(actual);
-            Assert.Equal(default, actual.DosCenter);
-            Assert.NotNull(actual.Game);
-            Assert.Empty(actual.Game);
+            Assert.Null(actual);
         }
 
         [Fact]
@@ -72,13 +66,7 @@ public void InvalidStream_Null()
             var deserializer = new Serialization.Deserializers.DosCenter();
 
             var actual = deserializer.Deserialize(data);
-
-            // TODO: Unexpected result
-            // Turns into an empty model
-            Assert.NotNull(actual);
-            Assert.Equal(default, actual.DosCenter);
-            Assert.NotNull(actual.Game);
-            Assert.Empty(actual.Game);
+            Assert.Null(actual);
         }
     }
 }
diff --git a/SabreTools.Serialization.Test/Deserializers/EverdriveSMDBTests.cs b/SabreTools.Serialization.Test/Deserializers/EverdriveSMDBTests.cs
@@ -36,12 +36,7 @@ public void InvalidArray_Null()
             var deserializer = new Serialization.Deserializers.EverdriveSMDB();
 
             var actual = deserializer.Deserialize(data, offset);
-
-            // TODO: Unexpected result
-            // Turns into an empty model
-            Assert.NotNull(actual);
-            Assert.NotNull(actual.Row);
-            Assert.Empty(actual.Row);
+            Assert.Null(actual);
         }
 
         [Fact]
@@ -71,12 +66,7 @@ public void InvalidStream_Null()
             var deserializer = new Serialization.Deserializers.EverdriveSMDB();
 
             var actual = deserializer.Deserialize(data);
-
-            // TODO: Unexpected result
-            // Turns into an empty model
-            Assert.NotNull(actual);
-            Assert.NotNull(actual.Row);
-            Assert.Empty(actual.Row);
+            Assert.Null(actual);
         }
     }
 }
diff --git a/SabreTools.Serialization.Test/Deserializers/ListromTests.cs b/SabreTools.Serialization.Test/Deserializers/ListromTests.cs
@@ -36,12 +36,7 @@ public void InvalidArray_Null()
             var deserializer = new Serialization.Deserializers.Listrom();
 
             var actual = deserializer.Deserialize(data, offset);
-
-            // TODO: Unexpected result
-            // Turns into an empty model
-            Assert.NotNull(actual);
-            Assert.NotNull(actual.Set);
-            Assert.Empty(actual.Set);
+            Assert.Null(actual);
         }
 
         [Fact]
@@ -71,12 +66,7 @@ public void InvalidStream_Null()
             var deserializer = new Serialization.Deserializers.Listrom();
 
             var actual = deserializer.Deserialize(data);
-
-            // TODO: Unexpected result
-            // Turns into an empty model
-            Assert.NotNull(actual);
-            Assert.NotNull(actual.Set);
-            Assert.Empty(actual.Set);
+            Assert.Null(actual);
         }
     }
 }
diff --git a/SabreTools.Serialization.Test/Deserializers/RomCenterTests.cs b/SabreTools.Serialization.Test/Deserializers/RomCenterTests.cs
@@ -36,14 +36,7 @@ public void InvalidArray_Null()
             var deserializer = new Serialization.Deserializers.RomCenter();
 
             var actual = deserializer.Deserialize(data, offset);
-
-            // TODO: Unexpected result
-            // Turns into an empty model
-            Assert.NotNull(actual);
-            Assert.Null(actual.Credits);
-            Assert.Null(actual.Dat);
-            Assert.Null(actual.Emulator);
-            Assert.Null(actual.Games);
+            Assert.Null(actual);
         }
 
         [Fact]
@@ -73,14 +66,7 @@ public void InvalidStream_Null()
             var deserializer = new Serialization.Deserializers.RomCenter();
 
             var actual = deserializer.Deserialize(data);
-
-            // TODO: Unexpected result
-            // Turns into an empty model
-            Assert.NotNull(actual);
-            Assert.Null(actual.Credits);
-            Assert.Null(actual.Dat);
-            Assert.Null(actual.Emulator);
-            Assert.Null(actual.Games);
+            Assert.Null(actual);
         }
     }
 }
diff --git a/SabreTools.Serialization.Test/Deserializers/SeparatedValueTests.cs b/SabreTools.Serialization.Test/Deserializers/SeparatedValueTests.cs
@@ -36,15 +36,7 @@ public void InvalidArray_Null()
             var deserializer = new Serialization.Deserializers.SeparatedValue();
 
             var actual = deserializer.Deserialize(data, offset);
-
-            // TODO: Unexpected result
-            // Turns into a single, malformatted header line
-            Assert.NotNull(actual);
-            Assert.NotNull(actual.Header);
-            var col = Assert.Single(actual.Header);
-            Assert.Equal(1024, col.Length);
-            Assert.NotNull(actual.Row);
-            Assert.Empty(actual.Row);
+            Assert.Null(actual);
         }
 
         [Fact]
@@ -74,15 +66,7 @@ public void InvalidStream_Null()
             var deserializer = new Serialization.Deserializers.SeparatedValue();
 
             var actual = deserializer.Deserialize(data);
-
-            // TODO: Unexpected result
-            // Turns into a single, malformatted header line
-            Assert.NotNull(actual);
-            Assert.NotNull(actual.Header);
-            var col = Assert.Single(actual.Header);
-            Assert.Equal(1024, col.Length);
-            Assert.NotNull(actual.Row);
-            Assert.Empty(actual.Row);
+            Assert.Null(actual);
         }
     }
 }
diff --git a/SabreTools.Serialization/Deserializers/AttractMode.cs b/SabreTools.Serialization/Deserializers/AttractMode.cs
@@ -111,8 +111,13 @@ public class AttractMode : BaseBinaryDeserializer<MetadataFile>
             }
 
             // Assign the rows to the Dat and return
-            dat.Row = [.. rows];
-            return dat;
+            if (rows.Count > 0)
+            {
+                dat.Row = [.. rows];
+                return dat;
+            }
+
+            return null;
         }
 
         #endregion
diff --git a/SabreTools.Serialization/Deserializers/ClrMamePro.cs b/SabreTools.Serialization/Deserializers/ClrMamePro.cs
@@ -381,8 +381,13 @@ public class ClrMamePro : BaseBinaryDeserializer<MetadataFile>
             }
 
             // Add extra pieces and return
-            dat.Game = [.. games];
-            return dat;
+            if (games.Count > 0)
+            {
+                dat.Game = [.. games];
+                return dat;
+            }
+
+            return null;
         }
 
         /// <summary>
diff --git a/SabreTools.Serialization/Deserializers/DosCenter.cs b/SabreTools.Serialization/Deserializers/DosCenter.cs
@@ -142,8 +142,13 @@ public class DosCenter : BaseBinaryDeserializer<MetadataFile>
             }
 
             // Add extra pieces and return
-            dat.Game = [.. games];
-            return dat;
+            if (games.Count > 0)
+            {
+                dat.Game = [.. games];
+                return dat;
+            }
+
+            return null;
         }
 
         /// <summary>
diff --git a/SabreTools.Serialization/Deserializers/EverdriveSMDB.cs b/SabreTools.Serialization/Deserializers/EverdriveSMDB.cs
@@ -58,8 +58,13 @@ public class EverdriveSMDB : BaseBinaryDeserializer<MetadataFile>
             }
 
             // Assign the rows to the Dat and return
-            dat.Row = [.. rows];
-            return dat;
+            if (rows.Count > 0)
+            {
+                dat.Row = [.. rows];
+                return dat;
+            }
+
+            return null;
         }
     }
 }
diff --git a/SabreTools.Serialization/Deserializers/Listrom.cs b/SabreTools.Serialization/Deserializers/Listrom.cs
diff --git a/SabreTools.Serialization/Deserializers/RomCenter.cs b/SabreTools.Serialization/Deserializers/RomCenter.cs
diff --git a/SabreTools.Serialization/Deserializers/SeparatedValue.cs b/SabreTools.Serialization/Deserializers/SeparatedValue.cs

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,7 @@ public void InvalidArray_Null()`
`36`	`36`	`var deserializer = new Serialization.Deserializers.EverdriveSMDB();`
`37`	`37`
`38`	`38`	`var actual = deserializer.Deserialize(data, offset);`
`39`		`-`
`40`		`- // TODO: Unexpected result`
`41`		`- // Turns into an empty model`
`42`		`- Assert.NotNull(actual);`
`43`		`- Assert.NotNull(actual.Row);`
`44`		`- Assert.Empty(actual.Row);`
	`39`	`+ Assert.Null(actual);`
`45`	`40`	`}`
`46`	`41`
`47`	`42`	`[Fact]`
`@@ -71,12 +66,7 @@ public void InvalidStream_Null()`
`71`	`66`	`var deserializer = new Serialization.Deserializers.EverdriveSMDB();`
`72`	`67`
`73`	`68`	`var actual = deserializer.Deserialize(data);`
`74`		`-`
`75`		`- // TODO: Unexpected result`
`76`		`- // Turns into an empty model`
`77`		`- Assert.NotNull(actual);`
`78`		`- Assert.NotNull(actual.Row);`
`79`		`- Assert.Empty(actual.Row);`
	`69`	`+ Assert.Null(actual);`
`80`	`70`	`}`
`81`	`71`	`}`
`82`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,13 @@ public class AttractMode : BaseBinaryDeserializer<MetadataFile>`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`// Assign the rows to the Dat and return`
`114`		`- dat.Row = [.. rows];`
`115`		`- return dat;`
	`114`	`+ if (rows.Count > 0)`
	`115`	`+ {`
	`116`	`+ dat.Row = [.. rows];`
	`117`	`+ return dat;`
	`118`	`+ }`
	`119`	`+`
	`120`	`+ return null;`
`116`	`121`	`}`
`117`	`122`
`118`	`123`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -381,8 +381,13 @@ public class ClrMamePro : BaseBinaryDeserializer<MetadataFile>`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`// Add extra pieces and return`
`384`		`- dat.Game = [.. games];`
`385`		`- return dat;`
	`384`	`+ if (games.Count > 0)`
	`385`	`+ {`
	`386`	`+ dat.Game = [.. games];`
	`387`	`+ return dat;`
	`388`	`+ }`
	`389`	`+`
	`390`	`+ return null;`
`386`	`391`	`}`
`387`	`392`
`388`	`393`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,13 @@ public class DosCenter : BaseBinaryDeserializer<MetadataFile>`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`// Add extra pieces and return`
`145`		`- dat.Game = [.. games];`
`146`		`- return dat;`
	`145`	`+ if (games.Count > 0)`
	`146`	`+ {`
	`147`	`+ dat.Game = [.. games];`
	`148`	`+ return dat;`
	`149`	`+ }`
	`150`	`+`
	`151`	`+ return null;`
`147`	`152`	`}`
`148`	`153`
`149`	`154`	`/// <summary>`