Reach 100% plugin line coverage and fix war and installation state

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
+    branches: [main, 'test/coverage-foundation']
 
 permissions:
   contents: read
@@ -74,3 +74,11 @@ jobs:
           name: unit-test-reports-${{ github.run_id }}-${{ github.run_attempt }}
           path: target/surefire-reports/
           if-no-files-found: error
+
+      - name: Upload coverage reports
+        if: ${{ !cancelled() && hashFiles('target/site/jacoco/jacoco.xml') != '' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: coverage-reports-${{ github.run_id }}-${{ github.run_attempt }}
+          path: target/site/jacoco/
+          if-no-files-found: error

README.md

@@ -61,8 +61,11 @@ documentation.
 
 The suite in `src/test` uses JUnit 5 and Mockito, mocking the Paper and plugin
 APIs rather than starting a server. It checks plugin logic, not behaviour on a
-live Paper server. Surefire writes reports to `target/surefire-reports/`. No
-coverage gate is enforced.
+live Paper server. Surefire writes reports to `target/surefire-reports/`. JaCoCo
+writes HTML and XML reports to `target/site/jacoco/`; `verify` requires 100%
+production line coverage with no
+class or package exclusions. This is a line coverage gate, not a branch coverage
+guarantee. CI uploads both test and coverage reports.
 
 ## License
 

pom.xml

@@ -9,6 +9,7 @@
     <version>main-SNAPSHOT</version>
 
     <properties>
+        <argLine></argLine>
         <maven.compiler.release>21</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.proc>full</maven.compiler.proc>
@@ -184,6 +185,38 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.15</version>
+                <executions>
+                    <execution><goals><goal>prepare-agent</goal></goals></execution>
+                    <execution>
+                        <id>coverage-report</id>
+                        <phase>verify</phase>
+                        <goals><goal>report</goal></goals>
+                    </execution>
+                    <execution>
+                        <id>coverage-check</id>
+                        <phase>verify</phase>
+                        <goals><goal>check</goal></goals>
+                        <configuration>
+                            <rules>
+                                <rule>
+                                    <element>BUNDLE</element>
+                                    <limits>
+                                        <limit>
+                                            <counter>LINE</counter>
+                                            <value>MISSEDCOUNT</value>
+                                            <maximum>0</maximum>
+                                        </limit>
+                                    </limits>
+                                </rule>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -209,7 +242,8 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.2.5</version>
                 <configuration>
-                    <argLine>-javaagent:${org.mockito:mockito-core:jar} -Xshare:off -Dnet.bytebuddy.experimental=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+                    <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar} -Xshare:off -Dnet.bytebuddy.experimental=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+                    <failIfNoTests>true</failIfNoTests>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/net/tfminecraft/simplefactions/Cache.java

@@ -17,6 +17,8 @@
 import net.tfminecraft.simplefactions.war.battle.enums.DefenderRespawnMode;
 
 public class Cache {
+    private Cache() {}
+
 	public static String mapRef;
 	/** Chapter slug for a future Archive prefill. Not the live upload folder. */
 	public static String chapterId = "unknown";

src/main/java/net/tfminecraft/simplefactions/SimpleFactions.java

@@ -252,15 +252,24 @@ public class SimpleFactions extends JavaPlugin{
 	private final VehicleMaintenanceDecayTask vehicleMaintenanceDecayTask =
 			new VehicleMaintenanceDecayTask();
 
+	private boolean startupComplete;
+
 	@Override
 	public void onEnable() {
+		startupComplete = false;
 		config = getConfig();
 		plugin = this;
 		FactionManager.inv = inventoryManager;
 		createFolders();
 		createConfigs();
+		try {
+			loadConfigs();
+		} catch (RuntimeException error) {
+			getLogger().log(java.util.logging.Level.SEVERE, "Cannot load SimpleFactions configuration; disabling before restoring saved state", error);
+			getServer().getPluginManager().disablePlugin(this);
+			return;
+		}
 		registerListeners();
-		loadConfigs();
 		registerRpCharactersIntegrationHooks();
 		vehicleRegistryPersistence = new VehicleRegistryPersistence(
 			new File(getDataFolder(), "Cache"),
@@ -365,6 +374,7 @@ public void onEnable() {
 		}
 		inventoryManager.start();
 		vehicleMaintenanceDecayTask.start();
+		startupComplete = true;
 	}
 	@Override
 	public void onDisable() {
@@ -376,8 +386,12 @@ public void onDisable() {
 		CampaignViewRefreshService.stop();
 		BattleManager.shutdown();
 		net.tfminecraft.simplefactions.war.battle.persistence.BattlePersistenceService.stopAutosave();
-		net.tfminecraft.simplefactions.war.battle.persistence.BattlePersistenceService.saveAll();
 		sessionManager.end();
+		if (!startupComplete) {
+			net.tfminecraft.simplefactions.identity.LeaderCharacters.reset();
+			return;
+		}
+		net.tfminecraft.simplefactions.war.battle.persistence.BattlePersistenceService.saveAll();
 		net.tfminecraft.simplefactions.inactivity.InactivityService.save();
 		saveFactionsForShutdown();
 		for(War w : WarManager.get()){

src/main/java/net/tfminecraft/simplefactions/army/Military.java

@@ -273,9 +273,9 @@ public List<LevyEntry> getLevies() {
 				if(total+count >= subject.getMembers().size()) {
 					count = subject.getMembers().size() - total;
 				}
-				total+=count;
-				if(count > 0) r.setSentToOverlord(count);
-				else continue;
+				count = Math.max(0, count);
+				total += count;
+				r.setSentToOverlord(count);
 			}
 			levies.add(new LevyEntry(subject, total));
 			for(LevyEntry e : subjectLevies) {