reuse code coverage test setup with actual coverage result

PhilippSalvisberg · PhilippSalvisberg · commit fd0d3df72df1 · 2020-05-30T17:25:39.000+02:00
diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterTest.java
@@ -32,6 +32,7 @@
 import org.utplsql.sqldev.model.runner.PreSuiteEvent;
 import org.utplsql.sqldev.model.runner.PreTestEvent;
 import org.utplsql.sqldev.test.AbstractJdbcTest;
+import org.utplsql.sqldev.test.coverage.CodeCoverageReporterTest;
 
 public class RealtimeReporterTest extends AbstractJdbcTest {
     private static final Logger logger = Logger.getLogger(RealtimeReporterTest.class.getName());
@@ -142,13 +143,16 @@ public void setup() {
         sb.append("    END;\n");
         sb.append("END;");
         jdbcTemplate.execute(sb.toString());
-    }
 
+        new CodeCoverageReporterTest().setup();
+    }
+    
     @After
     public void teardown() {
         executeAndIgnore(jdbcTemplate, "DROP PACKAGE junit_utplsql_test1_pkg");
         executeAndIgnore(jdbcTemplate, "DROP PACKAGE junit_utplsql_test2_pkg");
         executeAndIgnore(jdbcTemplate, "DROP PACKAGE junit_utplsql_test3_pkg");
+        new CodeCoverageReporterTest().teardown();
     }
 
     @Test
@@ -175,11 +179,10 @@ public void produceAndConsumeWithCoverage() {
         final String realtimeReporterId = UUID.randomUUID().toString().replace("-", "");
         final String coverageReporterId = UUID.randomUUID().toString().replace("-", "");
         final TestRealtimerReporterEventConsumer consumer = new TestRealtimerReporterEventConsumer();
-        dao.produceReportWithCoverage(realtimeReporterId, coverageReporterId, Arrays.asList(":a", ":b"),
-                Arrays.asList(), Arrays.asList(), Arrays.asList());
+        dao.produceReportWithCoverage(realtimeReporterId, coverageReporterId, Arrays.asList(":test_f"), null, null, null);
         dao.consumeReport(realtimeReporterId, consumer);
         logger.fine(consumer.getConsumedList().toString());
-        Assert.assertEquals(28, consumer.getConsumedList().size());
+        Assert.assertEquals(6, consumer.getConsumedList().size());
         final String html = dao.getHtmlCoverage(coverageReporterId);
         Assert.assertTrue(html.trim().endsWith("</html>"));
     }
