Ver Fonte

Last minute changes to cesium tests

vpenades há 2 anos atrás
pai
commit
2c69618220

+ 4 - 4
tests/SharpGLTF.Cesium.Tests/ExtInstanceFeaturesTests.cs

@@ -47,12 +47,12 @@ namespace SharpGLTF.Cesium
             var model = sceneBuilder.ToGltf2(settings);
             var model = sceneBuilder.ToGltf2(settings);
             model.LogicalNodes[0].SetFeatureIds(featureIds);
             model.LogicalNodes[0].SetFeatureIds(featureIds);
 
 
-            var cesiumExtInstanceFeaturesExtension = (MeshExtInstanceFeatures)model.LogicalNodes[0].Extensions.Where(item => item is MeshExtInstanceFeatures).FirstOrDefault();
+            var cesiumExtInstanceFeaturesExtension = model.LogicalNodes[0].GetExtension<MeshExtInstanceFeatures>();
 
 
             Assert.That(cesiumExtInstanceFeaturesExtension.FeatureIds, Is.Not.Null);
             Assert.That(cesiumExtInstanceFeaturesExtension.FeatureIds, Is.Not.Null);
-            Assert.That(cesiumExtInstanceFeaturesExtension.FeatureIds.Equals(featureIds));
-            Assert.That(cesiumExtInstanceFeaturesExtension.FeatureIds[0].Equals(featureId0));
-            Assert.That(cesiumExtInstanceFeaturesExtension.FeatureIds[1].Equals(featureId1));
+            Assert.That(cesiumExtInstanceFeaturesExtension.FeatureIds, Is.EqualTo(featureIds));
+            Assert.That(cesiumExtInstanceFeaturesExtension.FeatureIds[0], Is.EqualTo(featureId0));
+            Assert.That(cesiumExtInstanceFeaturesExtension.FeatureIds[1], Is.EqualTo(featureId1));
 
 
             var ctx = new ValidationResult(model, ValidationMode.Strict, true);
             var ctx = new ValidationResult(model, ValidationMode.Strict, true);
             model.ValidateContent(ctx.GetContext());
             model.ValidateContent(ctx.GetContext());

+ 1 - 1
tests/SharpGLTF.Cesium.Tests/ExtMeshFeaturesTests.cs

@@ -56,7 +56,7 @@ namespace SharpGLTF.Cesium
             var cesiumExtMeshFeaturesExtension = (MeshExtMeshFeatures)model.LogicalMeshes[0].Primitives[0].Extensions.FirstOrDefault();
             var cesiumExtMeshFeaturesExtension = (MeshExtMeshFeatures)model.LogicalMeshes[0].Primitives[0].Extensions.FirstOrDefault();
             Assert.That(cesiumExtMeshFeaturesExtension.FeatureIds, Is.Not.Null);
             Assert.That(cesiumExtMeshFeaturesExtension.FeatureIds, Is.Not.Null);
 
 
-            Assert.That(cesiumExtMeshFeaturesExtension.FeatureIds.Equals(featureIds));
+            Assert.That(cesiumExtMeshFeaturesExtension.FeatureIds, Is.EqualTo(featureIds));
 
 
             // Check there should be a custom vertex attribute with name _FEATURE_ID_{attribute}
             // Check there should be a custom vertex attribute with name _FEATURE_ID_{attribute}
             var attribute = cesiumExtMeshFeaturesExtension.FeatureIds[0].Attribute;
             var attribute = cesiumExtMeshFeaturesExtension.FeatureIds[0].Attribute;

+ 1 - 1
tests/SharpGLTF.Cesium.Tests/SharpGLTF.Cesium.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
 
 
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net471;net6.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net471;net6.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <IsPackable>false</IsPackable>
     <RootNamespace>SharpGLTF</RootNamespace>
     <RootNamespace>SharpGLTF</RootNamespace>
     <LangVersion>latest</LangVersion>
     <LangVersion>latest</LangVersion>