Merge branch 'master' into actions-test

ImperatorToCK3/.editorconfig → .editorconfig

@@ -1,6 +1,14 @@
 # Remove the line below if you want to inherit .editorconfig settings from higher directories
 root = true
 
+### Editor guidelines
+# All files
+[*]
+guidelines = 80
+# C# or VB files
+[*.{cs,vb}]
+guidelines = 150
+
 # C# files
 [*.cs]
 

.github/workflows/bump_version.yml

@@ -11,10 +11,9 @@ jobs:
       with:
         fetch-depth: '0'
     - name: "Bump version and push tag"
-      uses: anothrNick/github-tag-action@1.61.0
+      uses: anothrNick/github-tag-action@1.62.0
       env:
         GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
         DEFAULT_BUMP: none
         WITH_V: false
-        BRANCH_HISTORY: 'last'
         DEFAULT_BRANCH: 'master'

.github/workflows/integration_tests.yml

@@ -0,0 +1,61 @@
+name: "Integration tests"
+
+on:
+  release:
+    types: [published]
+
+concurrency:
+  group: ci-integration-${{ github.ref }}-1
+  cancel-in-progress: true
+
+jobs:
+  run_test_conversions:
+    runs-on: [self-hosted, windows]
+    strategy:
+      fail-fast: false
+      matrix:
+        save_url:
+          # 2.0 vanilla
+          - https://mega.nz/file/TR13kB7D#QWT2yFzoS3rSIu9-EkUEdcc-X8jJnhZdXbJvw9jC-dg  # Benchmark.rome
+          # 2.0 with mods
+          - https://mega.nz/file/id90lRYD#4OBL6N6_87-Nu28wNssm-O-3jmxli0iFzOtI7XVdN1E  # Mega_Campaign.rome
+          - https://mega.nz/file/zQ0wDKya#eiFQCiJ2sjTaolAJGnfQ0_0OS2Q1kf48dIGDlrEoJ9I  # Erreinu Atlantikoa Debug Over NameFix.rome
+          - https://mega.nz/file/yd1nAZpB#6pXqexexEAXgE04Kll1XYwz_IhRPr42juVIJQ4uKXM8  # The New Rome.rome
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        submodules: recursive
+    - name: "Check if docs folders exist"
+      run: |
+        ls "C:\Users\Administrator\Documents\Paradox Interactive\Imperator"
+        ls "C:\Users\Administrator\Documents\Paradox Interactive\Imperator\mod"
+        ls "C:\Users\Administrator\Documents\Paradox Interactive\Crusader Kings III\mod"
+    - name: "Setup Dotnet for use with actions"
+      uses: actions/setup-dotnet@v3
+      with:
+        global-json-file: global.json
+    - name: "Build converter backend"
+      working-directory: ImperatorToCK3
+      run: |
+        dotnet build -c:Debug
+    - name: "Download I:R save from MEGA"
+      run: |
+        & "C:/Program Files/megatools/megatools.exe" dl --path "save.rome" ${{ matrix.save_url }}
+    - name: "Create configuration.txt"
+      working-directory: Debug/ImperatorToCK3
+      run: |
+        echo 'ImperatorDirectory = "C:\Program Files (x86)\Steam\steamapps\common\ImperatorRome"' > configuration.txt
+        echo 'ImperatorDocDirectory = "C:\Users\Administrator\Documents\Paradox Interactive\Imperator"' >> configuration.txt
+        echo 'CK3directory = "C:\Program Files (x86)\Steam\steamapps\common\Crusader Kings III"' >> configuration.txt
+        echo 'targetGameModPath = "C:\Users\Administrator\Documents\Paradox Interactive\Crusader Kings III\mod"' >> configuration.txt
+        echo 'SaveGame = "../../save.rome"' >> configuration.txt
+        cat configuration.txt
+    - name: "Run conversion"
+      working-directory: Debug/ImperatorToCK3
+      run: |
+        dotnet ImperatorToCK3Converter.dll
+    - name: "Cleanup"
+      if: always()
+      run: |
+        Get-ChildItem -Path $Env:GITHUB_WORKSPACE -Recurse -Force | Remove-Item -force -recurse

.github/workflows/spelling.yml

@@ -1,11 +1,11 @@
-name: Check spelling
+name: Check spelling
 on: [pull_request]
 jobs:
   misspell:
     name: Check spelling
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Check spelling
         uses: reviewdog/action-misspell@v1
         with:

.github/workflows/test.yml

@@ -11,7 +11,7 @@ concurrency:
 
 jobs:
   test_and_check_coverage:
-    runs-on: [self-hosted, linux]
+    runs-on: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v3
       with:
@@ -27,13 +27,14 @@ jobs:
       run: |
        $env:CoverletOutput='./TestResults/coverage.info'
        $env:CoverletOutputFormat='lcov'
-       dotnet test /p:CollectCoverage=true /p:Exclude="[commonItems]*"
+       dotnet test /p:CollectCoverage=true
     - name: "Publish coverage report to coveralls.io"
-      uses: coverallsapp/github-action@master
+      uses: coverallsapp/github-action@v2
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         path-to-lcov: ImperatorToCK3.UnitTests/TestResults/coverage.info
-
+        format: lcov
+        debug: true
 
   test:
     strategy:

ImperatorToCK3.UnitTests/CK3/Armies/MenAtArmsTypeTests.cs

@@ -0,0 +1,49 @@
+using commonItems;
+using ImperatorToCK3.CK3.Armies;
+using Xunit;
+
+namespace ImperatorToCK3.UnitTests.CK3.Armies; 
+
+public class MenAtArmsTypeTests {
+	[Fact]
+	public void MenAtArmsTypeIsCorrectlySerialized() {
+		var maaTypeReader = new BufferedReader("""
+		{
+			type = pikemen
+
+			damage = 30
+			toughness = 24
+
+			terrain_bonus = {
+				mountains = { damage = 5 toughness = 12 }
+				desert_mountains = { damage = 5 toughness = 12 }
+				hills = { damage = 3 toughness = 8 }
+			}
+
+			counters = {
+				pikemen = 0.5
+				light_cavalry = 2
+				heavy_cavalry = 2
+			}
+
+			buy_cost = { gold = landsknecht_recruitment_cost }
+			low_maintenance_cost = { gold = landsknecht_low_maint_cost }
+			high_maintenance_cost = { gold = landsknecht_high_maint_cost }
+
+			stack = 100
+			ai_quality = { value = @cultural_maa_extra_ai_score }
+			icon = pikemen
+		}
+		""");
+
+		var menAtArmsType = new MenAtArmsType("landsknecht", maaTypeReader, new ScriptValueCollection());
+		var serializedType = menAtArmsType.Serialize(indent: string.Empty, withBraces: true);
+
+		Assert.Contains("damage=30", serializedType);
+		Assert.Contains("toughness=24", serializedType);
+		Assert.Contains("terrain_bonus={", serializedType);
+		Assert.Contains("buy_cost={", serializedType);
+		Assert.Contains("stack=100", serializedType);
+		Assert.Contains("icon=pikemen", serializedType);
+	}
+}