diff options
Diffstat (limited to 'plugins')
5 files changed, 11 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java index 5d610b47aa9..00e200a5bd5 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java @@ -205,8 +205,7 @@ public class VectorCastImportTest { OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, BranchManager.getCommonBranch()); SkynetTransaction transaction = new SkynetTransaction(BranchManager.getCommonBranch(), "Coverage Package Save"); - CoveragePackageEvent coverageEvent = - new CoveragePackageEvent(coveragePackage, CoverageEventType.Modified); + CoveragePackageEvent coverageEvent = new CoveragePackageEvent(coveragePackage, CoverageEventType.Modified); store.save(transaction, coverageEvent); transaction.execute(); @@ -290,8 +289,13 @@ public class VectorCastImportTest { OseeData.getFile("vcast.wrk/CCAST_.CFG")); Lib.writeStringToFile(AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/CCAST_.CFG")), OseeData.getFile("vcast.wrk/build_info.xml")); + + // create vcast dir and files within OseeData.getFolder("vcast.wrk/vcast").getLocation().toFile(); Lib.writeStringToFile( + AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast_aggregate_coverage_report.html")), + OseeData.getFile("vcast.wrk/vcast/vcast_aggregate_coverage_report.html")); + Lib.writeStringToFile( AFile.readFile(Activator.getInstance().getPluginFile("support/vcastData/vcast/test_main.2.LIS")), OseeData.getFile("vcast.wrk/vcast/test_main.2.LIS")); Lib.writeStringToFile( diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemPersistTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemPersistTest.java index 8e0ef28ecb8..f8d7db9f166 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemPersistTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemPersistTest.java @@ -108,8 +108,8 @@ public class CoverageItemPersistTest { Assert.assertEquals(coverageGuid, coverageEvent.getPackage().getGuid()); Assert.assertEquals(coverageName, coverageEvent.getPackage().getName()); Assert.assertEquals(CoverageEventType.Modified, coverageEvent.getPackage().getEventType()); - // 10 coverage items added and one coverage unit == 11 - Assert.assertEquals(11, coverageEvent.getCoverages().size()); + // 1 coverage item added and 1 coverage unit == 2 + Assert.assertEquals(2, coverageEvent.getCoverages().size()); Assert.assertEquals(CoverageEventType.Added, coverageEvent.getCoverages().iterator().next().getEventType()); Assert.assertEquals(10, ci.getTestUnits().size()); @@ -149,7 +149,7 @@ public class CoverageItemPersistTest { artifact = new OseeCoverageUnitStore(parentCu, BranchManager.getCommonBranch()).getArtifact(false); Assert.assertNull(artifact); Assert.assertEquals(0, CoverageTestUtil.getAllCoverageArtifacts().size()); - Assert.assertEquals(11, coverageEvent.getCoverages().size()); + Assert.assertEquals(1, coverageEvent.getCoverages().size()); Assert.assertEquals(CoverageEventType.Deleted, coverageEvent.getCoverages().iterator().next().getEventType()); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java index e06720f1b23..a093bb83817 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java @@ -86,7 +86,7 @@ public class CoverageImportTestBlam extends AbstractCoverageBlam implements ICov coverageImport.setCoverageUnitFileContentsProvider(new SimpleCoverageUnitFileContentsProvider()); try { for (String filename : fileList) { - System.err.println(String.format("Importing [%s]", PATH + filename)); + // System.err.println(String.format("Importing [%s]", PATH + filename)); URL url = CoverageImport1TestBlam.class.getResource(PATH + filename); CoverageUnit coverageUnit = SampleJavaFileParser.createCodeUnit(url, coverageImport.getCoverageUnitFileContentsProvider()); diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java index 08cbc75ed96..a7d56a9455d 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java @@ -245,7 +245,7 @@ public class MergeImportManager { } // This is new item else if (MatchType.isNoMatch(matchItem.getMatchType())) { - System.err.println("NEW ITEM " + matchItem.getMatchType()); + // System.err.println("NEW ITEM " + matchItem.getMatchType()); // Check if parent item exists ICoverage parentImportItem = importItem.getParent(); // If null, this is top level item, just add to package diff --git a/plugins/org.eclipse.osee.coverage/support/vcastData/vcast_aggregate_coverage_report.html b/plugins/org.eclipse.osee.coverage/support/vcastData/vcast_aggregate_coverage_report.html new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/plugins/org.eclipse.osee.coverage/support/vcastData/vcast_aggregate_coverage_report.html |