Browse Source

Completed processing BabylonJS test files

Vicente Penades 6 years ago
parent
commit
b285dec1dd

+ 18 - 3
tests/SharpGLTF.Tests/Schema2/LoadAndSave/LoadSampleTests.cs

@@ -59,8 +59,21 @@ namespace SharpGLTF.Schema2.LoadAndSave
         {
             var perf = System.Diagnostics.Stopwatch.StartNew();
 
-            var model = ModelRoot.Load(f);
-            Assert.NotNull(model);
+            ModelRoot model = null;
+
+            try
+            {
+                model = ModelRoot.Load(f);
+                Assert.NotNull(model);
+            }
+            catch(Exception ex)
+            {
+                TestContext.Progress.WriteLine($"Failed {f.ToShortDisplayPath()}");
+
+                Assert.Fail(ex.Message);
+            }
+            
+            
 
             var perf_load = perf.ElapsedMilliseconds;
 
@@ -69,8 +82,10 @@ namespace SharpGLTF.Schema2.LoadAndSave
 
             var perf_clone = perf.ElapsedMilliseconds;
 
+            var unsupportedExtensions = new[] { "MSFT_lod", "EXT_lights_image_based" };
+
             // check extensions used
-            if (!model.ExtensionsUsed.Contains("EXT_lights_image_based"))
+            if (unsupportedExtensions.All(uex => !model.ExtensionsUsed.Contains(uex)))
             {
                 var detectedExtensions = model.RetrieveUsedExtensions().ToArray();
                 CollectionAssert.AreEquivalent(model.ExtensionsUsed, detectedExtensions);

+ 1 - 0
tests/SharpGLTF.Tests/TestFiles.cs

@@ -120,6 +120,7 @@ namespace SharpGLTF
             return files
                 .OrderBy(item => item)
                 .Where(item => !item.Contains("\\AssetGenerator\\0.6\\"))
+                .Where(item => !item.EndsWith("shaderBall.glb")) // invalid
                 .ToList();
         }