Browse Source

Code cleanup

vpenades 2 years ago
parent
commit
5d33ff2642

+ 1 - 1
tests/Directory.Build.props

@@ -19,7 +19,7 @@
   <!-- Testing & Analysers =================================================================================== -->  
 
   <PropertyGroup>
-    <NoWarn>1701;1702;1591;CA1062;CA1304;CA1310;CA1000;CA5394;CA1510;CA1512</NoWarn>
+    <NoWarn>1701;1702;1591;CA1062;CA1303;CA1304;CA1307;CA1310;CA1000;CA5394;CA1510;CA1512;CA1852;CA1861</NoWarn>
   </PropertyGroup>  
 
   <PropertyGroup>

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

@@ -26,7 +26,7 @@ namespace SharpGLTF.Cesium
             settings.GpuMeshInstancingMinCount = 0;
 
             var modelRoot = ModelRoot.Load(ResourceInfo.From("tree.glb"));
-            var meshBuilder = modelRoot.LogicalMeshes.First().ToMeshBuilder();
+            var meshBuilder = modelRoot.LogicalMeshes[0].ToMeshBuilder();
             var sceneBuilder = new SceneBuilder();
             var quaternion = Quaternion.CreateFromYawPitchRoll(0, 0, 0);
             var scale = Vector3.One;

+ 1 - 1
tests/SharpGLTF.Core.Tests/AssemblyAPITests.cs

@@ -37,7 +37,7 @@ namespace SharpGLTF
 
             public event EventHandler EventX;
 
-            public struct Structure
+            public struct SomeStructure
             {
                 public int X;
                 public int Y { get; }

+ 1 - 1
tests/SharpGLTF.Core.Tests/Schema2/LoadAndSave/LoadGeneratedTests.cs

@@ -77,7 +77,7 @@ namespace SharpGLTF.Schema2.LoadAndSave
                 }
 
                 /*
-                if (ShouldLoad && !filePath.ToLowerInvariant().Contains("compatibility"))
+                if (ShouldLoad && !filePath.ToUpperInvariant().Contains("COMPATIBILITY"))
                 {
                     var model = ModelRoot.Load(filePath);
                     model.AttachToCurrentTest(System.IO.Path.ChangeExtension(System.IO.Path.GetFileName(filePath), ".obj"));

+ 2 - 2
tests/SharpGLTF.DownloadTestFiles/DownloadUtils.cs

@@ -22,7 +22,7 @@ namespace SharpGLTF
 
                     LibGit2Sharp.Repository.Clone(remoteUrl, localDirectoryPath);
 
-                    Console.WriteLine($"... Clone Completed");
+                    Console.WriteLine("... Clone Completed");
 
                     return;
                 }
@@ -59,7 +59,7 @@ namespace SharpGLTF
                     wc.DownloadFile(remoteUri, localFilePath);
                 }
 
-                if (localFilePath.ToLowerInvariant().EndsWith(".zip"))
+                if (localFilePath.ToUpperInvariant().EndsWith(".ZIP"))
                 {
                     Console.WriteLine($"Extracting {localFilePath}...");
 

+ 4 - 4
tests/SharpGLTF.NUnit/NUnitGltfUtils.cs

@@ -45,7 +45,7 @@ namespace SharpGLTF
         {
             var gl2model = ModelRoot.CreateModel();
 
-            var gl2mesh = gl2model.CreateMeshes(mesh).First();
+            var gl2mesh = gl2model.CreateMeshes(mesh)[0];
 
             var node = gl2model.UseScene(0).CreateNode();
             node.Mesh = gl2mesh;
@@ -64,7 +64,7 @@ namespace SharpGLTF
                     .WriteObject(f => model.SaveGLB(f, settings))
                     .FullName;
             }
-            else if (fileName.ToLowerInvariant().EndsWith(".gltf"))
+            else if (fileName.ToUpperInvariant().EndsWith(".GLTF"))
             {
                 if (settings == null) settings = new WriteSettings { JsonIndented = true };
 
@@ -73,7 +73,7 @@ namespace SharpGLTF
                     .WriteObject(f => model.Save(f, settings))
                     .FullName;
             }
-            else if (fileName.ToLowerInvariant().EndsWith(".obj"))
+            else if (fileName.ToUpperInvariant().EndsWith(".OBJ"))
             {
                 // skip exporting to obj if gpu instancing is there
                 if (Node.Flatten(model.DefaultScene).Any(n => n.GetGpuInstancing() != null)) return fileName;                
@@ -85,7 +85,7 @@ namespace SharpGLTF
                     .WriteObject(f => model.SaveAsWavefront(f))
                     .FullName;
             }
-            else if (fileName.ToLowerInvariant().EndsWith(".plotly"))
+            else if (fileName.ToUpperInvariant().EndsWith(".PLOTLY"))
             {
                 fileName = fileName.Replace(".plotly", ".html");
 

+ 1 - 1
tests/SharpGLTF.NUnit/Plotting.cs

@@ -239,7 +239,7 @@ namespace SharpGLTF
     {
         public static void AttachToCurrentTest(this Plotting.Point2Series points, string fileName)
         {
-            System.Diagnostics.Debug.Assert(fileName.ToLowerInvariant().EndsWith(".html"));
+            System.Diagnostics.Debug.Assert(fileName.ToUpperInvariant().EndsWith(".HTML"));
 
             NUnit.Framework.AttachmentInfo
                 .From(fileName)

+ 1 - 1
tests/SharpGLTF.NUnit/Reports.cs

@@ -56,7 +56,7 @@ namespace SharpGLTF.Reporting
             this.VertexAttributes = new[] { "SCENE" };
         }
 
-        internal void SetFrom(IEnumerable<VisualReport> many)
+        internal void SetFrom(IReadOnlyList<VisualReport> many)
         {
             NumVertices = many.Sum(item => item.NumVertices);
             NumTriangles = many.Sum(item => item.NumTriangles);

+ 2 - 2
tests/SharpGLTF.NUnit/TestFiles.cs

@@ -26,7 +26,7 @@ namespace SharpGLTF
             {
                 _TestFilesDir = System.IO.Path.Combine(wdir, "TestFiles");
 
-                if (wdir.ToLowerInvariant().EndsWith("tests") && System.IO.Directory.Exists(_TestFilesDir))
+                if (wdir.ToUpperInvariant().EndsWith("TESTS") && System.IO.Directory.Exists(_TestFilesDir))
                 {
                     examplesFound = true;
                     break;
@@ -221,7 +221,7 @@ namespace SharpGLTF
         public static IEnumerable<string> GetMeshIntancingModelPaths()
         {
             var fromBabylon = GetBabylonJSModelsPaths()
-                .Where(item => item.ToLowerInvariant().Contains("teapot"));
+                .Where(item => item.ToUpperInvariant().Contains("TEAPOT"));
 
             var meshInstPath = _UsingInternalFiles("gltf-GpuMeshInstancing");
 

+ 1 - 1
tests/SharpGLTF.ThirdParty.Tests/CesiumInstancingTests.cs

@@ -16,7 +16,7 @@ namespace SharpGLTF.ThirdParty
         public void WriteInstancedGlbWithFeatureIds()
         {
             var modelRoot = ModelRoot.Load(ResourceInfo.From("tree.glb"));
-            var meshBuilder = modelRoot.LogicalMeshes.First().ToMeshBuilder();
+            var meshBuilder = modelRoot.LogicalMeshes[0].ToMeshBuilder();
             var sceneBuilder = new SceneBuilder();
             var quaternion = Quaternion.CreateFromYawPitchRoll(0, 0, 0);
             var scale = Vector3.One;

+ 1 - 1
tests/SharpGLTF.ThirdParty.Tests/SandboxTests.cs

@@ -25,7 +25,7 @@ namespace SharpGLTF.ThirdParty
         [Test]
         public void MaterialCreate()
         {
-            Memory.MemoryImage.TryParseMime64("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAHXpUWHRUaXRsZQAACJlzSU1LLM0pCUmtKCktSgUAKVIFt/VCuZ8AAAAoelRYdEF1dGhvcgAACJkLy0xOzStJVQhIzUtMSS1WcCzKTc1Lzy8BAG89CQyAoFAQAAAANElEQVQoz2O8cuUKAwxoa2vD2VevXsUqzsRAIqC9Bsb///8TdDey+CD0Awsx7h6NB5prAADPsx0VAB8VRQAAAABJRU5ErkJggg==", out var memoryImage);
+            Assert.That(Memory.MemoryImage.TryParseMime64("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAHXpUWHRUaXRsZQAACJlzSU1LLM0pCUmtKCktSgUAKVIFt/VCuZ8AAAAoelRYdEF1dGhvcgAACJkLy0xOzStJVQhIzUtMSS1WcCzKTc1Lzy8BAG89CQyAoFAQAAAANElEQVQoz2O8cuUKAwxoa2vD2VevXsUqzsRAIqC9Bsb///8TdDey+CD0Awsx7h6NB5prAADPsx0VAB8VRQAAAABJRU5ErkJggg==", out var memoryImage));
 
             var material = new MaterialBuilder()
                 .WithAlpha(Materials.AlphaMode.OPAQUE);