Remove non-sdk code from coverage calculation

MrCreosote · MrCreosote · commit f91c001665f3 · 2025-03-07T13:00:13.000-08:00
Coverage should not include

* external embedded code
* compiled SDK clients
* test code
* code copied from other repos (execution engine)
diff --git a/build.xml b/build.xml
@@ -360,30 +360,35 @@ $JAVA_HOME/bin/java -cp ${lib.classpath}:${jar.absolute.path} us.kbase.tools.Wor
         </fileset>
       </batchtest>
      </junit>
-  	</jacoco:coverage>
+    </jacoco:coverage>
     <fail message="Test failure detected, check test results." if="test.failed" />
-  	<jacoco:report>
-  	    <executiondata>
-  	       <file file="${report.dir}/jacoco.exec"/>
-  	    </executiondata>
-  	    <structure name="SDK">
-  	       <classfiles>
-  	          <fileset dir="${report.dir}/classes">
-                <exclude name="**/test/**/**Test.class" />
-  	          </fileset>
-  	       </classfiles>
- 	       <sourcefiles encoding="UTF-8">
-  	          <fileset dir="${src}"/>
-  	       </sourcefiles>
-  	    </structure>
-        <html destdir="${report.dir}/html"/>
-        <csv destfile="${report.dir}/coverage-report.csv"/>
-        <xml destfile="${report.dir}/coverage-report.xml"/>
-  	</jacoco:report>
+    <jacoco:report>
+      <executiondata>
+        <file file="${report.dir}/jacoco.exec"/>
+      </executiondata>
+      <structure name="SDK">
+        <classfiles>
+          <fileset dir="${report.dir}/classes">
+            <exclude name="**/test/**"/>
+            <exclude name="**/fraser/neil/**"/>
+            <exclude name="**/common/executionengine/**"/>
+            <exclude name="**/catalog/**"/>
+            <exclude name="**/narrativemethodstore/**"/>
+            <exclude name="**/kbasejobservice/**"/>
+          </fileset>
+        </classfiles>
+        <sourcefiles encoding="UTF-8">
+          <fileset dir="${src}"/>
+        </sourcefiles>
+      </structure>
+      <html destdir="${report.dir}/html"/>
+      <csv destfile="${report.dir}/coverage-report.csv"/>
+      <xml destfile="${report.dir}/coverage-report.xml"/>
+    </jacoco:report>
     <delete dir="${report.dir}/classes"/>
-  	<exec executable="bash">
-  	  <arg value="./test_scripts/print_test_coverage.sh" />
-  	</exec>
+    <exec executable="bash">
+      <arg value="./test_scripts/print_test_coverage.sh" />
+    </exec>
   </target>
 
 
diff --git a/src/java/us/kbase/mobu/runner/ModuleRunner.java b/src/java/us/kbase/mobu/runner/ModuleRunner.java
@@ -252,6 +252,8 @@ public void logNextLine(String line, boolean isError) {
             File outputTmpFile = new File(workDir, "output.json");
             if (!outputTmpFile.exists())
                 throw new IllegalStateException("Output JSON file was not found");
+            // TODO CODE this should use a compiled client FJP
+            //           actually why is FJP used here at all?
             FinishJobParams outObj = UObject.getMapper().readValue(outputTmpFile, 
                     FinishJobParams.class);
             if (outObj.getError() != null || outObj.getResult() == null) {
diff --git a/src/java/us/kbase/test/sdk/scripts/TypeGeneratorTest.java b/src/java/us/kbase/test/sdk/scripts/TypeGeneratorTest.java
@@ -556,6 +556,8 @@ public void testDynamicClients() throws Exception {
 	}
 
     private Server startJobService(File binDir, File tempDir) throws Exception {
+        // TODO TEST this is older than EE2. Figure out what it's used for and see if changes
+        //           are needed.
         Server jettyServer = new Server(findFreePort());
 	    ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
 	    context.setContextPath("/");

Original file line number	Diff line number	Diff line change
`@@ -556,6 +556,8 @@ public void testDynamicClients() throws Exception {`
`556`	`556`	`}`
`557`	`557`
`558`	`558`	`private Server startJobService(File binDir, File tempDir) throws Exception {`
	`559`	`+ // TODO TEST this is older than EE2. Figure out what it's used for and see if changes`
	`560`	`+ // are needed.`
`559`	`561`	`Server jettyServer = new Server(findFreePort());`
`560`	`562`	`ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);`
`561`	`563`	`context.setContextPath("/");`