Add Rhino tests and refactor current ones (#4)

* add tests with base test class * update locks * pin coverage to 4.4.0 * this is a subjob with uses, pass the secrets * fix secret passing * try quotes * try a different glob * Try simplier glob * try something else * try ubuntu for uploads * update build.sh * fix target * update test only target
specklesystems · Jul 5, 2024 · 49a0af8 · 49a0af8
1 parent 91a69a8
commit 49a0af8
Show file tree

Hide file tree

Showing 32 changed files with 356 additions and 139 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,6 +6,9 @@ on:
       - main
       - dev
   workflow_call:
+    secrets:
+      codecov_token:
+        required: true
     outputs:
       version:
         value: ${{ jobs.build.outputs.version }}
@@ -37,13 +40,6 @@ jobs:
 
       - name: ⚒️ Run build
         run: ./build.ps1
-
-      - name: Upload coverage reports to Codecov with GitHub Action
-        uses: codecov/codecov-action@v4
-        with:
-          files: ./**/*.Tests/coverage.xml
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
       - name: ⬆️ Upload artifacts
         uses: actions/upload-artifact@v4
@@ -54,4 +50,29 @@ jobs:
 
       - id: set-version
         name: Set version to output
-        run: echo "version=${{ env.GitVersion_FullSemVer }}" >> "$GITHUB_OUTPUT"
+        run: echo "version=${{ env.GitVersion_FullSemVer }}" >> "$GITHUB_OUTPUT"   
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)
+
+      - name: Cache Nuget     
+        uses: actions/cache@v4
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+
+      - name: ⚒️ Run build
+        run: ./build.sh test-only
+
+      - name: Upload coverage reports to Codecov with GitHub Action
+        uses: codecov/codecov-action@v4
+        with:
+          file: Converters/**/coverage.xml
+          token: ${{ secrets.codecov_token }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,6 +10,8 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/ci.yml
+    secrets:
+      codecov_token: ${{ secrets.CODECOV_TOKEN }}
 
 #  deploy-installers:
 #    runs-on: ubuntu-latest

diff --git a/Build/Program.cs b/Build/Program.cs
@@ -8,6 +8,7 @@
 const string RESTORE = "restore";
 const string BUILD = "build";
 const string TEST = "test";
+const string TEST_ONLY = "test-only";
 const string FORMAT = "format";
 const string ZIP = "zip";
 const string VERSION = "version";
@@ -115,7 +116,21 @@ void RemoveDirectory(string d)
   Glob.Files(".", "**/*.Tests.csproj"),
   file =>
   {
-    Run("dotnet", $"test {file} -c Release --no-build --no-restore --verbosity=normal  /p:AltCover=true");
+    Run("dotnet", $"test {file} -c Release --no-build --no-restore --verbosity=normal");
+  }
+);
+
+Target(
+  TEST_ONLY,
+  DependsOn(FORMAT),
+  Glob.Files(".", "**/*.Tests.csproj"),
+  file =>
+  {
+    Run("dotnet", $"restore {file} --locked-mode");
+    Run(
+      "dotnet",
+      $"test {file} -c Release --no-restore --verbosity=normal  /p:AltCover=true /p:AltCoverLocalSource=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage"
+    );
   }
 );
 

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json
@@ -381,8 +381,8 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
-          "Speckle.Autofac": "[2.0.999-local, )",
-          "Speckle.Connectors.Utils": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
           "Speckle.Core": "[3.0.1-alpha.14, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
@@ -391,44 +391,44 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Web.WebView2": "[1.0.1823.32, )",
-          "Speckle.Connectors.DUI": "[2.0.999-local, )"
+          "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
       "speckle.connectors.utils": {
         "type": "Project",
         "dependencies": {
           "Serilog.Extensions.Logging": "[7.0.0, )",
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Core": "[3.0.1-alpha.14, )"
         }
       },
       "speckle.converters.arcgis3": {
         "type": "Project",
         "dependencies": {
           "Esri.ArcGISPro.Extensions30": "[3.2.0.49743, )",
-          "Speckle.Converters.Common": "[2.0.999-local, )"
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.arcgis3.dependencyinjection": {
         "type": "Project",
         "dependencies": {
           "Autofac": "[5.2.0, )",
-          "Speckle.Converters.ArcGIS3": "[2.0.999-local, )",
-          "Speckle.Converters.Common.DependencyInjection": "[2.0.999-local, )"
+          "Speckle.Converters.ArcGIS3": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )"
         }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Objects": "[3.0.1-alpha.14, )"
         }
       },
       "speckle.converters.common.dependencyinjection": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
-          "Speckle.Converters.Common": "[2.0.999-local, )"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "Autofac": {

diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
@@ -434,8 +434,8 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
-          "Speckle.Autofac": "[2.0.999-local, )",
-          "Speckle.Connectors.Utils": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
           "Speckle.Core": "[3.0.1-alpha.14, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
@@ -444,44 +444,44 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Web.WebView2": "[1.0.1823.32, )",
-          "Speckle.Connectors.DUI": "[2.0.999-local, )"
+          "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
       "speckle.connectors.utils": {
         "type": "Project",
         "dependencies": {
           "Serilog.Extensions.Logging": "[7.0.0, )",
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Core": "[3.0.1-alpha.14, )"
         }
       },
       "speckle.converters.autocad2023": {
         "type": "Project",
         "dependencies": {
           "Speckle.AutoCAD.API": "[2023.0.0, )",
-          "Speckle.Converters.Common": "[2.0.999-local, )"
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.autocad2023.dependencyinjection": {
         "type": "Project",
         "dependencies": {
           "Autofac": "[5.2.0, )",
-          "Speckle.Converters.Autocad2023": "[2.0.999-local, )",
-          "Speckle.Converters.Common.DependencyInjection": "[2.0.999-local, )"
+          "Speckle.Converters.Autocad2023": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )"
         }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Objects": "[3.0.1-alpha.14, )"
         }
       },
       "speckle.converters.common.dependencyinjection": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
-          "Speckle.Converters.Common": "[2.0.999-local, )"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "Autofac": {

diff --git a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json
@@ -452,8 +452,8 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
-          "Speckle.Autofac": "[2.0.999-local, )",
-          "Speckle.Connectors.Utils": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
           "Speckle.Core": "[3.0.1-alpha.14, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
@@ -462,37 +462,37 @@
         "type": "Project",
         "dependencies": {
           "Serilog.Extensions.Logging": "[7.0.0, )",
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Core": "[3.0.1-alpha.14, )"
         }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Objects": "[3.0.1-alpha.14, )"
         }
       },
       "speckle.converters.common.dependencyinjection": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
-          "Speckle.Converters.Common": "[2.0.999-local, )"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.revit2023": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Converters.Common": "[2.0.999-local, )",
+          "Speckle.Converters.Common": "[1.0.0, )",
           "Speckle.Revit.API": "[2023.0.0, )"
         }
       },
       "speckle.converters.revit2023.dependencyinjection": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Converters.Common": "[2.0.999-local, )",
-          "Speckle.Converters.Common.DependencyInjection": "[2.0.999-local, )",
-          "Speckle.Converters.Revit2023": "[2.0.999-local, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )",
+          "Speckle.Converters.Revit2023": "[1.0.0, )"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {

diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json
@@ -442,8 +442,8 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
-          "Speckle.Autofac": "[2.0.999-local, )",
-          "Speckle.Connectors.Utils": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
           "Speckle.Core": "[3.0.1-alpha.14, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
@@ -452,42 +452,42 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Web.WebView2": "[1.0.1823.32, )",
-          "Speckle.Connectors.DUI": "[2.0.999-local, )"
+          "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
       "speckle.connectors.utils": {
         "type": "Project",
         "dependencies": {
           "Serilog.Extensions.Logging": "[7.0.0, )",
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Core": "[3.0.1-alpha.14, )"
         }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Objects": "[3.0.1-alpha.14, )"
         }
       },
       "speckle.converters.common.dependencyinjection": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
-          "Speckle.Converters.Common": "[2.0.999-local, )"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.rhino7": {
         "type": "Project",
         "dependencies": {
           "RhinoCommon": "[7.13.21348.13001, )",
-          "Speckle.Converters.Common": "[2.0.999-local, )"
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.rhino7.dependencyinjection": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Converters.Rhino7": "[2.0.999-local, )"
+          "Speckle.Converters.Rhino7": "[1.0.0, )"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {

diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3.DependencyInjection/packages.lock.json b/Converters/ArcGIS/Speckle.Converters.ArcGIS3.DependencyInjection/packages.lock.json
@@ -363,21 +363,21 @@
         "type": "Project",
         "dependencies": {
           "Esri.ArcGISPro.Extensions30": "[3.2.0.49743, )",
-          "Speckle.Converters.Common": "[2.0.999-local, )"
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Objects": "[3.0.1-alpha.14, )"
         }
       },
       "speckle.converters.common.dependencyinjection": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
-          "Speckle.Converters.Common": "[2.0.999-local, )"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "Esri.ArcGISPro.Extensions30": {

diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json
@@ -362,7 +362,7 @@
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Objects": "[3.0.1-alpha.14, )"
         }
       },

diff --git a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json
@@ -363,7 +363,7 @@
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Objects": "[3.0.1-alpha.14, )"
         }
       },

diff --git a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json
@@ -363,7 +363,7 @@
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Speckle.Autofac": "[2.0.999-local, )",
+          "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Objects": "[3.0.1-alpha.14, )"
         }
       },