diff options
| author | ddunne | 2010-04-21 23:12:31 +0000 |
|---|---|---|
| committer | ddunne | 2010-04-21 23:12:31 +0000 |
| commit | 76cc4b5c1b8eca03a8c284263d23af39d275dc0e (patch) | |
| tree | 975dfc6fb7888f1fb732deb8b3f63bf1734100f1 | |
| parent | 3db5f8c3a04a5dbad6fb7e129b1e54d3c4cf09c6 (diff) | |
| download | org.eclipse.osee-76cc4b5c1b8eca03a8c284263d23af39d275dc0e.tar.gz org.eclipse.osee-76cc4b5c1b8eca03a8c284263d23af39d275dc0e.tar.xz org.eclipse.osee-76cc4b5c1b8eca03a8c284263d23af39d275dc0e.zip | |
"Task" - VS9D3 - "Mike Burgess - Coverage editor not saving rational"
36 files changed, 520 insertions, 138 deletions
diff --git a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF index f216d2320f3..7d1832a14d4 100644 --- a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF @@ -17,5 +17,6 @@ Export-Package: org.eclipse.osee.coverage.test, org.eclipse.osee.coverage.test.import6, org.eclipse.osee.coverage.test.import7, org.eclipse.osee.coverage.test.import8, + org.eclipse.osee.coverage.test.import9, org.eclipse.osee.coverage.test.model, org.eclipse.osee.coverage.test.navigate diff --git a/plugins/org.eclipse.osee.coverage.test/fragment.xml b/plugins/org.eclipse.osee.coverage.test/fragment.xml index 4a3e3c0d52d..1d7540bc118 100644 --- a/plugins/org.eclipse.osee.coverage.test/fragment.xml +++ b/plugins/org.eclipse.osee.coverage.test/fragment.xml @@ -55,5 +55,11 @@ className="org.eclipse.osee.coverage.test.import8.CoverageImport8TestBlam">
</Operation>
</extension>
+ <extension
+ point="org.eclipse.osee.framework.ui.skynet.BlamOperation">
+ <Operation
+ className="org.eclipse.osee.coverage.test.import9.CoverageImport9TestBlam">
+ </Operation>
+ </extension>
</fragment>
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java index 2b8c85f0e43..8c2e317774b 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java @@ -30,12 +30,14 @@ import org.eclipse.osee.coverage.test.import5.CoverageImport5TestBlam; import org.eclipse.osee.coverage.test.import6.CoverageImport6TestBlam;
import org.eclipse.osee.coverage.test.import7.CoverageImport7TestBlam;
import org.eclipse.osee.coverage.test.import8.CoverageImport8TestBlam;
+import org.eclipse.osee.coverage.test.import9.CoverageImport9TestBlam;
import org.eclipse.osee.coverage.test.util.CoverageTestUtil;
import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.ISaveable;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -56,10 +58,12 @@ public class CoveragePackageImportTest { public static CoveragePackage coveragePackage = null;
public static CoverageImport coverageImport = null;
private static boolean testWithDb = true;
+ private static Branch commonBranch = null;
@BeforeClass
public static void setUp() throws OseeCoreException {
CoverageUtil.setIsInTest(true);
+ commonBranch = BranchManager.getCommonBranch();
testCleanup();
}
@@ -71,7 +75,7 @@ public class CoveragePackageImportTest { public static void testCleanup() throws OseeCoreException {
if (testWithDb) {
- CoverageUtil.setBranch(BranchManager.getCommonBranch());
+ CoverageUtil.setNavigatorSelectedBranch(commonBranch);
CoverageTestUtil.cleanupCoverageTests();
} else
System.err.println("Test with Db Disabled...re-inenable");
@@ -142,6 +146,11 @@ public class CoveragePackageImportTest { return Result.TrueResult;
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return commonBranch;
+ }
+
}, mergeManager.getMergeItems());
Assert.assertEquals(1, resultData.getNumErrors());
@@ -167,6 +176,11 @@ public class CoveragePackageImportTest { return Result.TrueResult;
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return commonBranch;
+ }
+
}, mergeManager.getMergeItems());
Assert.assertEquals(0, resultData.getNumErrors());
@@ -200,13 +214,13 @@ public class CoveragePackageImportTest { CoveragePackage loadedCp = null;
if (testWithDb) {
// Test Persist of CoveragePackage
- OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Package Save");
+ OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, commonBranch);
+ SkynetTransaction transaction = new SkynetTransaction(commonBranch, "Coverage Package Save");
store.save(transaction);
transaction.execute();
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
OseeSystemArtifacts.getDefaultHierarchyRootArtifact(artifact.getBranch()).addChild(artifact);
artifact.persist();
@@ -290,6 +304,11 @@ public class CoveragePackageImportTest { return Result.TrueResult;
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return commonBranch;
+ }
+
}, mergeManager.getMergeItems());
Assert.assertEquals(0, resultData.getNumErrors());
@@ -305,13 +324,13 @@ public class CoveragePackageImportTest { CoveragePackage loadedCp = null;
if (testWithDb) {
// Test Persist of CoveragePackage
- OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Package Save");
+ OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, commonBranch);
+ SkynetTransaction transaction = new SkynetTransaction(commonBranch, "Coverage Package Save");
store.save(transaction);
transaction.execute();
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
@@ -341,7 +360,7 @@ public class CoveragePackageImportTest { if (testWithDb) {
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact);
@@ -386,6 +405,11 @@ public class CoveragePackageImportTest { return Result.TrueResult;
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return commonBranch;
+ }
+
}, mergeManager.getMergeItems());
Assert.assertEquals(0, resultData.getNumErrors());
@@ -409,13 +433,13 @@ public class CoveragePackageImportTest { CoveragePackage loadedCp = null;
if (testWithDb) {
// Test Persist of CoveragePackage
- OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Package Save");
+ OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, commonBranch);
+ SkynetTransaction transaction = new SkynetTransaction(commonBranch, "Coverage Package Save");
store.save(transaction);
transaction.execute();
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
@@ -451,7 +475,7 @@ public class CoveragePackageImportTest { if (testWithDb) {
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact);
@@ -497,6 +521,11 @@ public class CoveragePackageImportTest { return Result.TrueResult;
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return commonBranch;
+ }
+
}, mergeManager.getMergeItems());
Assert.assertEquals(0, resultData.getNumErrors());
@@ -520,13 +549,13 @@ public class CoveragePackageImportTest { CoveragePackage loadedCp = null;
if (testWithDb) {
// Test Persist of CoveragePackage
- OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Package Save");
+ OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, commonBranch);
+ SkynetTransaction transaction = new SkynetTransaction(commonBranch, "Coverage Package Save");
store.save(transaction);
transaction.execute();
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
@@ -563,7 +592,7 @@ public class CoveragePackageImportTest { if (testWithDb) {
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact);
@@ -615,6 +644,11 @@ public class CoveragePackageImportTest { return Result.TrueResult;
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return commonBranch;
+ }
+
}, mergeManager.getMergeItems());
Assert.assertEquals(0, resultData.getNumErrors());
@@ -630,13 +664,13 @@ public class CoveragePackageImportTest { CoveragePackage loadedCp = null;
if (testWithDb) {
// Test Persist of CoveragePackage
- OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Package Save");
+ OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, commonBranch);
+ SkynetTransaction transaction = new SkynetTransaction(commonBranch, "Coverage Package Save");
store.save(transaction);
transaction.execute();
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
@@ -665,7 +699,7 @@ public class CoveragePackageImportTest { if (testWithDb) {
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact);
@@ -725,6 +759,11 @@ public class CoveragePackageImportTest { return Result.TrueResult;
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return commonBranch;
+ }
+
}, mergeManager.getMergeItems());
Assert.assertEquals(0, resultData.getNumErrors());
@@ -753,13 +792,13 @@ public class CoveragePackageImportTest { CoveragePackage loadedCp = null;
if (testWithDb) {
// Test Persist of CoveragePackage
- OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Package Save");
+ OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, commonBranch);
+ SkynetTransaction transaction = new SkynetTransaction(commonBranch, "Coverage Package Save");
store.save(transaction);
transaction.execute();
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
@@ -779,8 +818,7 @@ public class CoveragePackageImportTest { Assert.assertEquals(67, loadedCp.getCoverageItemsCovered(CoverageOptionManager.Not_Covered).size());
// Make sure clear is not there anymore
- powerUnit2CoverageUnit =
- (CoverageUnit) CoverageTestUtil.getFirstCoverageByName(coveragePackage, "PowerUnit2.java");
+ powerUnit2CoverageUnit = (CoverageUnit) CoverageTestUtil.getFirstCoverageByName(loadedCp, "PowerUnit2.java");
Assert.assertNotNull(powerUnit2CoverageUnit);
found = false;
for (CoverageUnit childCoverageUnit : powerUnit2CoverageUnit.getCoverageUnits()) {
@@ -789,17 +827,16 @@ public class CoveragePackageImportTest { break;
}
}
- Assert.assertFalse("clear CoverageUnit should have been deleted", found);
+ Assert.assertFalse("\"clear\" CoverageUnit should have been deleted", found);
// Ensure that the artifact was deleted and not just relation deletion
try {
- ArtifactQuery.getArtifactFromId(clearCoverageUnitForDeletion.getGuid(), CoverageUtil.getBranch());
+ ArtifactQuery.getArtifactFromId(clearCoverageUnitForDeletion.getGuid(), commonBranch);
Assert.fail("clear CoverageUnit should no longer exist");
} catch (ArtifactDoesNotExist ex) {
// do nothing, this exception should have been thrown
}
- Artifact clearArt =
- ArtifactQuery.getArtifactFromId(clearCoverageUnitForDeletion.getGuid(), CoverageUtil.getBranch(), true);
+ Artifact clearArt = ArtifactQuery.getArtifactFromId(clearCoverageUnitForDeletion.getGuid(), commonBranch, true);
Assert.assertNotNull("clear CoverageUnit should exist if search for deleted == true", clearArt);
}
@@ -813,7 +850,7 @@ public class CoveragePackageImportTest { if (testWithDb) {
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact);
@@ -887,6 +924,11 @@ public class CoveragePackageImportTest { return Result.TrueResult;
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return commonBranch;
+ }
+
}, mergeManager.getMergeItems());
Assert.assertEquals(0, resultData.getNumErrors());
@@ -902,13 +944,13 @@ public class CoveragePackageImportTest { CoveragePackage loadedCp = null;
if (testWithDb) {
// Test Persist of CoveragePackage
- OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Package Save");
+ OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, commonBranch);
+ SkynetTransaction transaction = new SkynetTransaction(commonBranch, "Coverage Package Save");
store.save(transaction);
transaction.execute();
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
@@ -960,7 +1002,7 @@ public class CoveragePackageImportTest { if (testWithDb) {
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact);
@@ -1032,6 +1074,11 @@ public class CoveragePackageImportTest { return Result.TrueResult;
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return commonBranch;
+ }
+
}, mergeManager.getMergeItems());
Assert.assertEquals(0, resultData.getNumErrors());
@@ -1047,13 +1094,13 @@ public class CoveragePackageImportTest { CoveragePackage loadedCp = null;
if (testWithDb) {
// Test Persist of CoveragePackage
- OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Package Save");
+ OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, commonBranch);
+ SkynetTransaction transaction = new SkynetTransaction(commonBranch, "Coverage Package Save");
store.save(transaction);
transaction.execute();
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
@@ -1092,4 +1139,109 @@ public class CoveragePackageImportTest { postLoadFileContents.contains("Navigate Here"));
}
+
+ @Test
+ // Re-import; Method update for NavigationButton2.getImage.line2 and line5
+ public void testImport9() throws Exception {
+ CoverageImport9TestBlam coverageImport9TestBlam = new CoverageImport9TestBlam();
+ coverageImport = coverageImport9TestBlam.run(null);
+ Assert.assertNotNull(coverageImport);
+
+ if (testWithDb) {
+ // Test Load of Coverage Package
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
+ CoverageTestUtil.registerAsTestArtifact(artifact);
+ artifact.persist();
+ OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact);
+ Assert.assertNotNull(packageStore.getArtifact(false));
+ coveragePackage = packageStore.getCoveragePackage();
+ }
+
+ // Test MergeManager
+ Assert.assertNotNull(coveragePackage);
+ MergeManager mergeManager = new MergeManager(coveragePackage, coverageImport);
+ Assert.assertEquals(1, mergeManager.getMergeItems().size());
+ Assert.assertTrue(mergeManager.getMergeItems().iterator().next() instanceof MergeItemGroup);
+ int numRename = 0, numDeleted = 0;
+ for (IMergeItem mergeItem : ((MergeItemGroup) mergeManager.getMergeItems().iterator().next()).getMergeItems()) {
+ if (mergeItem.getMergeType() == MergeType.CI_Renamed)
+ numRename++;
+ else if (mergeItem.getMergeType() == MergeType.CI_Delete)
+ numDeleted++;
+ else
+ throw new OseeStateException(String.format("Unexpected merge type [%s] for CI_Changes group",
+ mergeItem.getMergeType()));
+ }
+ Assert.assertEquals(2, numRename);
+ Assert.assertEquals(1, numDeleted);
+
+ MergeImportManager importManager = new MergeImportManager(mergeManager);
+ XResultData resultData = importManager.importItems(new ISaveable() {
+
+ @Override
+ public Result isEditable() {
+ return Result.TrueResult;
+ }
+
+ @Override
+ public Result save() throws OseeCoreException {
+ return Result.TrueResult;
+ }
+
+ @Override
+ public Result save(Collection<ICoverage> coverages) throws OseeCoreException {
+ return Result.TrueResult;
+ }
+
+ @Override
+ public Result saveImportRecord(SkynetTransaction transaction, CoverageImport coverageImport) throws OseeCoreException {
+ return Result.TrueResult;
+ }
+
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return commonBranch;
+ }
+
+ }, mergeManager.getMergeItems());
+ Assert.assertEquals(0, resultData.getNumErrors());
+
+ // CoveragePackage should now have imported results
+ Assert.assertEquals(68, coveragePackage.getCoverageItemsCovered().size());
+ Assert.assertEquals(134, coveragePackage.getCoverageItems().size());
+ Assert.assertEquals(50, coveragePackage.getCoveragePercent());
+ Assert.assertEquals(0, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Deactivated_Code).size());
+ Assert.assertEquals(0, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Exception_Handling).size());
+ Assert.assertEquals(68, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Test_Unit).size());
+ Assert.assertEquals(66, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Not_Covered).size());
+
+ CoveragePackage loadedCp = null;
+ if (testWithDb) {
+ // Test Persist of CoveragePackage
+ OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, commonBranch);
+ SkynetTransaction transaction = new SkynetTransaction(commonBranch, "Coverage Package Save");
+ store.save(transaction);
+ transaction.execute();
+
+ // Test Load of Coverage Package
+ Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), commonBranch);
+ CoverageTestUtil.registerAsTestArtifact(artifact);
+ artifact.persist();
+
+ OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact);
+ Assert.assertNotNull(packageStore.getArtifact(false));
+ loadedCp = packageStore.getCoveragePackage();
+ } else {
+ loadedCp = coveragePackage;
+ }
+
+ Assert.assertEquals(68, loadedCp.getCoverageItemsCovered().size());
+ Assert.assertEquals(134, loadedCp.getCoverageItems().size());
+ Assert.assertEquals(50, loadedCp.getCoveragePercent());
+ Assert.assertEquals(0, loadedCp.getCoverageItemsCovered(CoverageOptionManager.Deactivated_Code).size());
+ Assert.assertEquals(0, loadedCp.getCoverageItemsCovered(CoverageOptionManager.Exception_Handling).size());
+ Assert.assertEquals(68, loadedCp.getCoverageItemsCovered(CoverageOptionManager.Test_Unit).size());
+ Assert.assertEquals(66, loadedCp.getCoverageItemsCovered(CoverageOptionManager.Not_Covered).size());
+
+ }
}
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 2e7cf3a1a56..4bb7bcc600e 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 @@ -27,6 +27,7 @@ import org.eclipse.osee.coverage.util.ISaveable; import org.eclipse.osee.coverage.vcast.IVectorCastCoverageImportProvider;
import org.eclipse.osee.coverage.vcast.VectorCastAdaCoverageImporter;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.AFile;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -65,7 +66,7 @@ public class VectorCastImportTest { public static void testCleanup() throws OseeCoreException {
if (testWithDb) {
- CoverageUtil.setBranch(BranchManager.getCommonBranch());
+ CoverageUtil.setNavigatorSelectedBranch(BranchManager.getCommonBranch());
CoverageTestUtil.cleanupCoverageTests();
} else
System.err.println("Test with Db Disabled...re-inenable");
@@ -152,6 +153,11 @@ public class VectorCastImportTest { return Result.TrueResult;
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return BranchManager.getCommonBranch();
+ }
+
}, mergeManager.getMergeItems());
Assert.assertEquals(0, resultData.getNumErrors());
@@ -185,13 +191,15 @@ public class VectorCastImportTest { CoveragePackage loadedCp = null;
if (testWithDb) {
// Test Persist of CoveragePackage
- OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Package Save");
+ OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, BranchManager.getCommonBranch());
+ SkynetTransaction transaction =
+ new SkynetTransaction(BranchManager.getCommonBranch(), "Coverage Package Save");
store.save(transaction);
transaction.execute();
// Test Load of Coverage Package
- Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact artifact =
+ ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), BranchManager.getCommonBranch());
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
@@ -238,13 +246,13 @@ public class VectorCastImportTest { });
coverageImport = vectorCastImporter.run(null);
- OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Save Import Record");
+ OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage, BranchManager.getCommonBranch());
+ SkynetTransaction transaction = new SkynetTransaction(BranchManager.getCommonBranch(), "Save Import Record");
Result result = store.saveImportRecord(transaction, coverageImport);
Assert.assertTrue(result.isTrue());
transaction.execute();
- Artifact packageArt = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageUtil.getBranch());
+ Artifact packageArt = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), BranchManager.getCommonBranch());
Artifact foundRecordArt = null;
for (Artifact artifact : packageArt.getChildren()) {
if (artifact.getName().equals(OseeCoveragePackageStore.IMPORT_RECORD_NAME)) {
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/CoverageImport9TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/CoverageImport9TestBlam.java new file mode 100644 index 00000000000..aeff0d71cdc --- /dev/null +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/CoverageImport9TestBlam.java @@ -0,0 +1,34 @@ +/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.coverage.test.import9;
+
+import java.util.Arrays;
+import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam;
+
+/**
+ * Method update for NavigationButton2.getImage.line2 and line5
+ *
+ * @author Donald G. Dunne
+ */
+public class CoverageImport9TestBlam extends CoverageImportTestBlam {
+
+ public static String NAME = "Test Import 9";
+
+ public CoverageImport9TestBlam() {
+ super(NAME, Arrays.asList(
+ //
+ "import5/nav/NavigationButton1.java", "import9/nav/NavigationButton2.java",
+ "import1/nav/NavigationButton3.java"
+ //
+ ));
+ }
+
+}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/CoveragePackage1Import9.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/CoveragePackage1Import9.java new file mode 100644 index 00000000000..27debd03a56 --- /dev/null +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/CoveragePackage1Import9.java @@ -0,0 +1,28 @@ +/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.coverage.test.import9;
+
+import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
+
+/**
+ * Method update for NavigationButton2.getImage.line2 and line5
+ *
+ * @author Donald G. Dunne
+ */
+public class CoveragePackage1Import9 extends CpSelectAndImportItem {
+
+ public CoveragePackage1Import9(XNavigateItem parent) {
+ super(parent, "Open CP 1 - Import 9 - Method update for NavigationButton2.getImage.line2 and line5",
+ CoverageImport9TestBlam.NAME);
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/nav/NavigationButton2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/nav/NavigationButton2.java new file mode 100644 index 00000000000..c37082f7f36 --- /dev/null +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/nav/NavigationButton2.java @@ -0,0 +1,55 @@ +/*
+ * Created on Sep 22, 2009
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.coverage.test.import9.nav;
+
+import java.util.logging.Level;
+import org.eclipse.osee.coverage.internal.Activator;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class NavigationButton2 extends Button {
+
+ public Image image;
+
+ /**
+ * @param parent
+ * @param style
+ */
+ public NavigationButton2(Composite parent, int style, Image image) {
+ super(parent, style);
+ }
+
+ @Override
+ public String getText() {
+ try {
+ if (getStyle() == 4) { // 1, 1, TestUnit2
+ }
+ } catch (Exception ex) {
+ OseeLog.log(Activator.class, Level.SEVERE, ex); // 1, 2, n
+ }
+ return "Navigate"; // 1, 3, n
+ }
+
+ @Override
+ public Image getImage() {
+ try {
+ if (getStyle() == 4) { // 2, 1, TestUnit2
+ return this.image; // 2, 2, TestUnit2
+ } else {
+ return super.getImage(); // 2, 3, TestUnit2
+ }
+ } catch (IllegalArgumentException ex) {
+ OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 4, n
+ }
+ return null; // 2, 5, TestUnit2
+ }
+
+}
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 7ec19bf0fc5..65039d7d012 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 @@ -41,7 +41,7 @@ public class CoverageItemPersistTest { @BeforeClass
public static void testSetup() throws OseeCoreException {
- CoverageUtil.setBranch(BranchManager.getCommonBranch());
+ CoverageUtil.setNavigatorSelectedBranch(BranchManager.getCommonBranch());
CoverageTestUtil.cleanupCoverageTests();
// If this fails, cleanup didn't happen. Must DbInit
Assert.assertEquals(0, CoverageTestUtil.getAllCoverageArtifacts().size());
@@ -64,33 +64,32 @@ public class CoverageItemPersistTest { @Test
public void testGetArtifact() throws OseeCoreException {
try {
- ArtifactQuery.getArtifactFromId(parentGuid, CoverageUtil.getBranch());
+ ArtifactQuery.getArtifactFromId(parentGuid, BranchManager.getCommonBranch());
Assert.fail("Artifact should not yet exist");
} catch (ArtifactDoesNotExist ex) {
// do nothing
}
- Artifact artifact = (new OseeCoverageUnitStore(parentCu)).getArtifact(false);
+ Artifact artifact = (new OseeCoverageUnitStore(parentCu, BranchManager.getCommonBranch())).getArtifact(false);
Assert.assertNull("Artifact should not have been created", artifact);
- artifact = (new OseeCoverageUnitStore(parentCu)).getArtifact(true);
+ artifact = (new OseeCoverageUnitStore(parentCu, BranchManager.getCommonBranch())).getArtifact(true);
CoverageTestUtil.registerAsTestArtifact(artifact);
artifact.persist();
Assert.assertNotNull("Artifact should have been created", artifact);
}
/**
- * Test method for
- * {@link org.eclipse.osee.coverage.model.CoverageItem#save()}
+ * Test method for {@link org.eclipse.osee.coverage.model.CoverageItem#save(SkynetTransaction)}
*/
@Test
public void testSave() throws OseeCoreException {
// Since test units are stored through provider, ensure they are same before and after save
Assert.assertEquals(10, ci.getTestUnits().size());
- Artifact artifact = (new OseeCoverageUnitStore(parentCu)).getArtifact(true);
+ Artifact artifact = (new OseeCoverageUnitStore(parentCu, BranchManager.getCommonBranch())).getArtifact(true);
Assert.assertNotNull(artifact);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Save CoverageItem");
- (new OseeCoverageUnitStore(parentCu)).save(transaction);
+ SkynetTransaction transaction = new SkynetTransaction(BranchManager.getCommonBranch(), "Save CoverageItem");
+ (new OseeCoverageUnitStore(parentCu, BranchManager.getCommonBranch())).save(transaction);
transaction.execute();
Assert.assertEquals(10, ci.getTestUnits().size());
@@ -101,7 +100,7 @@ public class CoverageItemPersistTest { */
@Test
public void testGetArtifact2() throws OseeCoreException {
- OseeCoverageUnitStore.get(parentCu).load(CoverageOptionManagerDefault.instance());
+ OseeCoverageUnitStore.get(parentCu, BranchManager.getCommonBranch()).load(CoverageOptionManagerDefault.instance());
CoverageItem ci = parentCu.getCoverageItems().iterator().next();
ci.setTestUnitProvider(DbTestUnitProvider.instance());
Assert.assertEquals(guid, ci.getGuid());
@@ -120,12 +119,12 @@ public class CoverageItemPersistTest { */
@Test
public void testDelete() throws OseeCoreException {
- Artifact artifact = (new OseeCoverageUnitStore(parentCu)).getArtifact(false);
+ Artifact artifact = (new OseeCoverageUnitStore(parentCu, BranchManager.getCommonBranch())).getArtifact(false);
Assert.assertNotNull(artifact);
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Save CoverageItem");
- (new OseeCoverageUnitStore(parentCu)).delete(transaction, false);
+ SkynetTransaction transaction = new SkynetTransaction(BranchManager.getCommonBranch(), "Save CoverageItem");
+ (new OseeCoverageUnitStore(parentCu, BranchManager.getCommonBranch())).delete(transaction, false);
transaction.execute();
- artifact = (new OseeCoverageUnitStore(parentCu)).getArtifact(false);
+ artifact = (new OseeCoverageUnitStore(parentCu, BranchManager.getCommonBranch())).getArtifact(false);
Assert.assertNull(artifact);
Assert.assertEquals(0, CoverageTestUtil.getAllCoverageArtifacts().size());
}
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerStoreTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerStoreTest.java index 8b2a97ff4e8..ae11219d9a5 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerStoreTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerStoreTest.java @@ -65,11 +65,11 @@ public class CoverageOptionManagerStoreTest { @Test
public void testCoverageOptionManagerStore() throws OseeCoreException {
- CoverageUtil.setBranch(BranchManager.getCommonBranch());
+ CoverageUtil.setNavigatorSelectedBranch(BranchManager.getCommonBranch());
CoveragePackage coveragePackage =
new CoveragePackage(CoverageOptionManagerStoreTest.class.getSimpleName(),
CoverageOptionManagerDefault.instance());
- OseeCoveragePackageStore store = new OseeCoveragePackageStore(coveragePackage);
+ OseeCoveragePackageStore store = new OseeCoveragePackageStore(coveragePackage, BranchManager.getCommonBranch());
store.save();
CoverageOptionManagerStore optionStore = new CoverageOptionManagerStore(store);
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java index 2e68cba4873..98609fac51c 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java @@ -35,6 +35,7 @@ import org.eclipse.osee.coverage.util.CoverageUtil; import org.eclipse.osee.coverage.util.ISaveable;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -64,7 +65,7 @@ public class CoverageUnitPersistTest { @BeforeClass
@AfterClass
public static void testCleanup() throws OseeCoreException {
- CoverageUtil.setBranch(BranchManager.getCommonBranch());
+ CoverageUtil.setNavigatorSelectedBranch(BranchManager.getCommonBranch());
CoverageTestUtil.cleanupCoverageTests();
}
@@ -115,7 +116,8 @@ public class CoverageUnitPersistTest { @Override
public Result save() throws OseeCoreException {
- OseeCoveragePackageStore store = OseeCoveragePackageStore.get(saveCoveragePackage);
+ OseeCoveragePackageStore store =
+ OseeCoveragePackageStore.get(saveCoveragePackage, BranchManager.getCommonBranch());
store.save();
Artifact artifact = store.getArtifact(false);
CoverageTestUtil.registerAsTestArtifact(artifact, true);
@@ -137,12 +139,17 @@ public class CoverageUnitPersistTest { public Result saveImportRecord(SkynetTransaction transaction, CoverageImport coverageImport) throws OseeCoreException {
return null;
}
+
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return BranchManager.getCommonBranch();
+ }
}, mergeItems);
// TEST LOAD
Artifact artifact =
ArtifactQuery.getArtifactFromTypeAndName(CoverageArtifactTypes.CoveragePackage, "CU Test",
- CoverageUtil.getBranch());
+ BranchManager.getCommonBranch());
loadCoveragePackage = OseeCoveragePackageStore.get(artifact);
Assert.assertEquals(saveCoveragePackage.getName(), loadCoveragePackage.getName());
Assert.assertEquals(saveCoveragePackage.getNamespace(), loadCoveragePackage.getNamespace());
@@ -154,14 +161,14 @@ public class CoverageUnitPersistTest { // TEST DELETE
artifact =
ArtifactQuery.getArtifactFromTypeAndName(CoverageArtifactTypes.CoveragePackage, "CU Test",
- CoverageUtil.getBranch());
+ BranchManager.getCommonBranch());
Assert.assertNotNull(artifact);
OseeCoveragePackageStore store = new OseeCoveragePackageStore(artifact);
store.delete(false);
try {
artifact =
ArtifactQuery.getArtifactFromTypeAndName(CoverageArtifactTypes.CoveragePackage, "CU Test",
- CoverageUtil.getBranch());
+ BranchManager.getCommonBranch());
Assert.assertNotNull("CU Test should not have been found", artifact);
} catch (ArtifactDoesNotExist ex) {
//do nothing
@@ -184,13 +191,13 @@ public class CoverageUnitPersistTest { item.addTestUnitName("Test Unit " + x);
}
Assert.assertEquals(10, item.getTestUnits().size());
- OseeCoverageUnitStore store = new OseeCoverageUnitStore(unit);
+ OseeCoverageUnitStore store = new OseeCoverageUnitStore(unit, BranchManager.getCommonBranch());
Result result = store.save();
Assert.assertTrue(result.isTrue());
Artifact artifact =
ArtifactQuery.getArtifactFromTypeAndName(CoverageArtifactTypes.CoverageUnit, cuName,
- CoverageUtil.getBranch());
+ BranchManager.getCommonBranch());
Assert.assertNotNull(artifact);
OseeCoverageUnitStore dbStore =
new OseeCoverageUnitStore(null, artifact, CoverageOptionManagerDefault.instance());
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java index 8e477c7128d..22f1e7c8cf0 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java @@ -23,6 +23,7 @@ import org.eclipse.osee.coverage.test.import5.CoveragePackage1Import5; import org.eclipse.osee.coverage.test.import6.CoveragePackage1Import6; import org.eclipse.osee.coverage.test.import7.CoveragePackage1Import7; import org.eclipse.osee.coverage.test.import8.CoveragePackage1Import8; +import org.eclipse.osee.coverage.test.import9.CoveragePackage1Import9; import org.eclipse.osee.coverage.test.package1.CoveragePackage1; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; @@ -57,6 +58,7 @@ public class CoverageTestNavigateViews implements ICoverageNavigateItem { items.add(new CoveragePackage1Import6(null)); items.add(new CoveragePackage1Import7(null)); items.add(new CoveragePackage1Import8(null)); + items.add(new CoveragePackage1Import9(null)); return items; } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageTestUtil.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageTestUtil.java index 464aca414f5..bcd4812f837 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageTestUtil.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageTestUtil.java @@ -14,11 +14,11 @@ import org.eclipse.osee.coverage.model.CoveragePackageBase; import org.eclipse.osee.coverage.model.CoverageUnit;
import org.eclipse.osee.coverage.model.ICoverage;
import org.eclipse.osee.coverage.store.CoverageArtifactTypes;
-import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager;
@@ -76,17 +76,17 @@ public class CoverageTestUtil { public static Collection<Artifact> getCoverageUnitArtifacts() throws OseeCoreException {
return StaticIdManager.getArtifactsFromArtifactQuery(CoverageArtifactTypes.CoverageUnit, COVERAGE_STATIC_ID,
- CoverageUtil.getBranch());
+ BranchManager.getCommonBranch());
}
public static Collection<Artifact> getCoveragePackageArtifacts() throws OseeCoreException {
return StaticIdManager.getArtifactsFromArtifactQuery(CoverageArtifactTypes.CoveragePackage, COVERAGE_STATIC_ID,
- CoverageUtil.getBranch());
+ BranchManager.getCommonBranch());
}
public static Collection<Artifact> getCoverageRecordArtifacts() throws OseeCoreException {
return StaticIdManager.getArtifactsFromArtifactQuery(CoreArtifactTypes.GeneralDocument, COVERAGE_STATIC_ID,
- CoverageUtil.getBranch());
+ BranchManager.getCommonBranch());
}
public static void setAllCoverageMethod(CoverageUnit coverageUnit, CoverageOption CoverageOption, boolean recurse) {
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpCreateAndImportItem.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpCreateAndImportItem.java index 59889f0e600..22bc9ab6a58 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpCreateAndImportItem.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpCreateAndImportItem.java @@ -14,6 +14,8 @@ import org.eclipse.osee.coverage.editor.CoverageEditor; import org.eclipse.osee.coverage.editor.CoverageEditorInput;
import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
import org.eclipse.osee.coverage.model.CoveragePackage;
+import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;
+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.utility.IncrementingNum;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
@@ -37,7 +39,10 @@ public class CpCreateAndImportItem extends XNavigateItemAction { public void run(TableLoadOption... tableLoadOptions) throws Exception {
coveragePackage =
new CoveragePackage(getName() + " - #" + IncrementingNum.get(), CoverageOptionManagerDefault.instance());
- CoverageEditor.open(new CoverageEditorInput(coveragePackage.getName(), null, coveragePackage, true));
+ OseeCoveragePackageStore store = new OseeCoveragePackageStore(coveragePackage, BranchManager.getCommonBranch());
+ store.save();
+ CoverageEditor.open(new CoverageEditorInput(coveragePackage.getName(), store.getArtifact(false), coveragePackage,
+ true));
// Process Import 1
CoverageEditor editor = null;
for (CoverageEditor coverageEditor : CoverageEditor.getEditors()) {
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java index aa390582cbc..452cdbb4c1e 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java @@ -39,7 +39,8 @@ public class CpSelectAndImportItem extends XNavigateItemAction { CoverageUtil.getBranchFromUser(false);
CoveragePackageArtifactListDialog dialog =
new CoveragePackageArtifactListDialog("Open Coverage Package", "Select Coverage Package");
- dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts());
+ if (!CoverageUtil.getBranchFromUser(false)) return;
+ dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts(CoverageUtil.getBranch()));
if (dialog.open() != 0) return;
Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0];
CoveragePackage coveragePackage = OseeCoveragePackageStore.get(coveragePackageArtifact);
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java index 7ef76d327af..d24d6708f4f 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java @@ -55,7 +55,7 @@ public class ConfigureCoverageMethodsAction extends Action { }
CoveragePackageArtifactListDialog dialog =
new CoveragePackageArtifactListDialog("Open Coverage Package", "Select Coverage Package");
- dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts());
+ dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts(CoverageUtil.getBranch()));
if (dialog.open() == 0) {
Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0];
OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(coveragePackageArtifact);
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java index 0ef044ee40f..dc93ce7fde9 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java @@ -15,7 +15,6 @@ import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.model.ICoverage;
import org.eclipse.osee.coverage.model.ICoverageUnitProvider;
import org.eclipse.osee.coverage.store.OseeCoverageUnitStore;
-import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.ISaveable;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
@@ -68,13 +67,14 @@ public class DeleteCoverUnitAction extends Action { "Delete Coverage Units")) {
try {
SkynetTransaction transaction =
- new SkynetTransaction(CoverageUtil.getBranch(), "Coverage - Delete Coverage Unit");
+ new SkynetTransaction(saveable.getBranch(), "Coverage - Delete Coverage Unit");
List<ICoverage> deleteItems = new ArrayList<ICoverage>();
for (ICoverage coverageItem : selectedCoverageEditorItem.getSelectedCoverageEditorItems()) {
if (coverageItem.getParent() instanceof ICoverageUnitProvider) {
((ICoverageUnitProvider) coverageItem.getParent()).removeCoverageUnit((CoverageUnit) coverageItem);
deleteItems.add(coverageItem);
- new OseeCoverageUnitStore((CoverageUnit) coverageItem).delete(transaction, false);
+ new OseeCoverageUnitStore((CoverageUnit) coverageItem, saveable.getBranch()).delete(transaction,
+ false);
}
}
transaction.execute();
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java index 1ac45553ece..4c56ffc80d5 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java @@ -13,6 +13,7 @@ import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -44,9 +45,10 @@ public class DeleteCoveragePackageAction extends Action { if (!CoverageUtil.getBranchFromUser(false)) {
return;
}
+ Branch branch = CoverageUtil.getBranch();
CoveragePackageArtifactListDialog dialog =
new CoveragePackageArtifactListDialog("Delete Package", "Select Package");
- dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts());
+ dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts(branch));
if (dialog.open() == 0) {
Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0];
CoveragePackage coveragePackage = OseeCoveragePackageStore.get(coveragePackageArtifact);
@@ -60,9 +62,9 @@ public class DeleteCoveragePackageAction extends Action { boolean purge = cDialog.isChecked();
SkynetTransaction transaction = null;
if (!purge) {
- transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Delete Coverage Package");
+ transaction = new SkynetTransaction(branch, "Delete Coverage Package");
}
- OseeCoveragePackageStore.get(coveragePackage).delete(transaction, purge);
+ OseeCoveragePackageStore.get(coveragePackage, branch).delete(transaction, purge);
if (!purge) {
transaction.execute();
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java index e049f24199a..7423517445d 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java @@ -16,6 +16,7 @@ import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; import org.eclipse.osee.coverage.util.CoverageImage;
import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -45,15 +46,16 @@ public class NewCoveragePackageAction extends Action { if (!CoverageUtil.getBranchFromUser(false)) {
return;
}
+ Branch branch = CoverageUtil.getBranch();
EntryDialog dialog = new EntryDialog(getText(), "Enter Coverage Package Name");
if (dialog.open() == 0) {
CoveragePackage coveragePackage =
new CoveragePackage(dialog.getEntry(), CoverageOptionManagerDefault.instance());
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Add Coverage Package");
- OseeCoveragePackageStore.get(coveragePackage).save(transaction);
+ SkynetTransaction transaction = new SkynetTransaction(branch, "Add Coverage Package");
+ OseeCoveragePackageStore.get(coveragePackage, branch).save(transaction);
transaction.execute();
- CoverageEditor.open(new CoverageEditorInput(dialog.getEntry(),
- OseeCoveragePackageStore.get(coveragePackage).getArtifact(false), coveragePackage, false));
+ CoverageEditor.open(new CoverageEditorInput(dialog.getEntry(), OseeCoveragePackageStore.get(
+ coveragePackage, branch).getArtifact(false), coveragePackage, false));
}
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java index 758e799195c..972a0f305c6 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java @@ -15,6 +15,7 @@ import org.eclipse.osee.coverage.util.CoverageImage; import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -43,9 +44,10 @@ public class OpenCoveragePackageAction extends Action { if (!CoverageUtil.getBranchFromUser(false)) {
return;
}
+ Branch branch = CoverageUtil.getBranch();
CoveragePackageArtifactListDialog dialog =
new CoveragePackageArtifactListDialog("Open Coverage Package", "Select Coverage Package");
- dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts());
+ dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts(branch));
if (dialog.open() == 0) {
Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0];
CoverageEditor.open(new CoverageEditorInput(coveragePackageArtifact.getName(), coveragePackageArtifact,
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/SaveImportRecordAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/SaveImportRecordAction.java index 83edbad3d75..86167b89054 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/SaveImportRecordAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/SaveImportRecordAction.java @@ -10,7 +10,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osee.coverage.internal.Activator;
import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.ISaveable;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
@@ -50,7 +49,7 @@ public class SaveImportRecordAction extends Action { "Overwrite coverage import record with current import information?")) {
try {
SkynetTransaction transaction =
- new SkynetTransaction(CoverageUtil.getBranch(), "Coverage - Save Import Record");
+ new SkynetTransaction(saveable.getBranch(), "Coverage - Save Import Record");
saveable.saveImportRecord(transaction, coverageImport);
transaction.execute();
} catch (OseeCoreException ex) {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java index 8b6794fe536..720c1ae6d19 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java @@ -28,6 +28,7 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.logging.OseeLevel; @@ -322,4 +323,11 @@ public class CoverageEditor extends FormEditor implements IActionable { return coverageEditorOverviewTab; } + public Branch getBranch() throws OseeCoreException { + Artifact artifact = getCoverageEditorInput().getCoveragePackageArtifact(); + if (artifact != null) { + return artifact.getBranch(); + } + return null; + } } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorCoverageTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorCoverageTab.java index aca1b331503..6de7f4c2fb9 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorCoverageTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorCoverageTab.java @@ -27,6 +27,7 @@ import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.coverage.util.ISaveable;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -166,12 +167,12 @@ public class CoverageEditorCoverageTab extends FormPage implements ISaveable { @Override
public Result save() throws OseeCoreException {
- return OseeCoveragePackageStore.get((CoveragePackage) coveragePackageBase).save();
+ return OseeCoveragePackageStore.get((CoveragePackage) coveragePackageBase, coverageEditor.getBranch()).save();
}
@Override
public Result save(Collection<ICoverage> coverages) throws OseeCoreException {
- return (OseeCoveragePackageStore.get((CoveragePackage) coveragePackageBase)).save(coverages);
+ return (OseeCoveragePackageStore.get((CoveragePackage) coveragePackageBase, coverageEditor.getBranch())).save(coverages);
}
@Override
@@ -179,4 +180,9 @@ public class CoverageEditorCoverageTab extends FormPage implements ISaveable { return new Result(false, "Not valid for this tab.");
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return coverageEditor.getBranch();
+ }
+
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java index 7a81038966a..e2fb654d1d0 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java @@ -45,6 +45,7 @@ import org.eclipse.osee.coverage.util.NotSaveable; import org.eclipse.osee.coverage.util.widget.XHyperlabelCoverageMethodSelection;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.logging.OseeLevel;
@@ -167,7 +168,12 @@ public class CoverageEditorMergeTab extends FormPage implements ISaveable { XResultData rd = new MergeImportManager(mergeManager).importItems(this, mergeItems);
rd.report("Import");
if (dialog.isChecked()) {
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Save Import Record");
+ Branch branch = coverageEditor.getBranch();
+ if (branch == null) {
+ AWorkbench.popup("Can't determine branch");
+ return;
+ }
+ SkynetTransaction transaction = new SkynetTransaction(branch, "Save Import Record");
saveImportRecord(transaction, coverageImport);
transaction.execute();
}
@@ -339,7 +345,7 @@ public class CoverageEditorMergeTab extends FormPage implements ISaveable { try {
Artifact artifact = ((CoverageEditorInput) coverageEditor.getEditorInput()).getCoveragePackageArtifact();
if (artifact != null) {
- CoverageUtil.setBranch(artifact.getBranch());
+ CoverageUtil.setNavigatorSelectedBranch(artifact.getBranch());
} else {
if (!CoverageUtil.getBranchFromUser(true)) {
return;
@@ -399,7 +405,7 @@ public class CoverageEditorMergeTab extends FormPage implements ISaveable { @Override
public Result save() throws OseeCoreException {
- OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage);
+ OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage, coverageEditor.getBranch());
Result result = store.save();
if (result.isFalse()) return result;
Artifact artifact = store.getArtifact(false);
@@ -409,7 +415,7 @@ public class CoverageEditorMergeTab extends FormPage implements ISaveable { @Override
public Result save(Collection<ICoverage> coverages) throws OseeCoreException {
- OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage);
+ OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage, coverageEditor.getBranch());
Result result = store.save(coverages);
if (result.isFalse()) return result;
Artifact artifact = store.getArtifact(false);
@@ -419,8 +425,13 @@ public class CoverageEditorMergeTab extends FormPage implements ISaveable { @Override
public Result saveImportRecord(SkynetTransaction transaction, CoverageImport coverageImport) throws OseeCoreException {
- OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage);
+ OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage, transaction.getBranch());
Result result = store.saveImportRecord(transaction, coverageImport);
return result;
}
+
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return coverageEditor.getBranch();
+ }
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java index f8a562fecb2..cff6bb42bd3 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java @@ -96,8 +96,16 @@ public class CoverageEditorOverviewTab extends FormPage implements IRefreshActio }
rd.addRaw(AHTML.endMultiColumnTable());
+ String branchName = null;
+ try {
+ branchName = coverageEditor.getBranch().getName();
+ } catch (Exception ex) {
+ branchName = "Exception: " + ex.getLocalizedMessage();
+ }
+ rd.addRaw(AHTML.newline());
+ rd.addRaw(AHTML.getLabelValueStr("\nEditor Branch", branchName));
if (coveragePackageBase.getLog() != null) {
- rd.log(AHTML.newline() + AHTML.bold("Log") + AHTML.newline());
+ rd.log(AHTML.newline() + AHTML.bold("Log:") + AHTML.newline());
rd.addRaw(coveragePackageBase.getLog().getReport("").getManipulatedHtml());
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageXViewer.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageXViewer.java index ffdab1ad6e5..db0db7ad953 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageXViewer.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageXViewer.java @@ -38,6 +38,7 @@ import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.model.ICoverage; import org.eclipse.osee.coverage.util.ISaveable; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; @@ -291,4 +292,9 @@ public class CoverageXViewer extends XViewer implements ISelectedCoverageEditorI return new Result(false, "Invalid for this."); } + @Override + public Branch getBranch() throws OseeCoreException { + return xCoverageViewer.getSaveable().getBranch(); + } + } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java index 9f796ba3005..333c42b86a9 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java @@ -59,7 +59,7 @@ public class MergeManager { }
private void processImportCoverage(ICoverage importCoverage, List<IMergeItem> mergeItems, XResultData resultData) throws OseeCoreException {
- boolean debug = false;
+ boolean debug = true;
if (debug) {
System.err.println("Merging check " + importCoverage);
}
@@ -108,7 +108,10 @@ public class MergeManager { if (importCoverage.getGuid().equals("AAte3i2bH3L1MvsFMqAA")) {
System.out.println("here");
}
- if (importCoverage.getName().equals("FILTER_FAILURES")) {
+ if (importCoverage.getName().equals("NavigationButton2.java")) {
+ System.out.println("here");
+ }
+ if (importCoverage.getName().equals("getImage")) {
System.out.println("here");
}
}
@@ -242,6 +245,12 @@ public class MergeManager { unMatchedImportCoverageItems.remove(childICoverage);
}
+ // Check for method change
+ else if (isCoverageItemMethodUpdate(childMatchItem)) {
+ groupMergeItems.add(new MergeItem(MergeType.CI_Method_Update, null, childICoverage, false));
+ unMatchedImportCoverageItems.remove(childICoverage);
+ }
+
}
// Check for moves in any items left unhandled by above renames and adds
@@ -282,6 +291,15 @@ public class MergeManager { }
+ private boolean isCoverageItemMethodUpdate(MatchItem childMatchItem) {
+ ICoverage importItem = childMatchItem.getImportItem();
+ ICoverage packageItem = childMatchItem.getPackageItem();
+ // Only valid for coverage items
+ if (!(importItem instanceof CoverageItem)) return false;
+ System.err.println("MergeManager: implement this");
+ return false;
+ }
+
private boolean isCoverageItemAdded(Collection<? extends ICoverage> packageItemChildren, ICoverage importItemChild) {
// Only valid for coverage items
if (!(importItemChild instanceof CoverageItem)) return false;
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeType.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeType.java index 5079e2fe689..b53739478a8 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeType.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeType.java @@ -18,6 +18,8 @@ public enum MergeType { Delete,
// This will result in adding this and all children with all attributes
CI_Add,
+ // This will result in changing existing coverage method to new one imported
+ CI_Method_Update,
// This will result in deleting this child and re-ordering
CI_Delete,
// This will result in changing name of package to match import, clearing rationale and setting coverage method
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java index 97d13154f48..c0bcc6b3100 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java @@ -81,7 +81,7 @@ public class CoverageNavigateView extends ViewPart implements IActionable { try {
Branch selectedBranch = xBranchSelectWidget.getData();
if (selectedBranch != null) {
- CoverageUtil.setBranch(selectedBranch);
+ CoverageUtil.setNavigatorSelectedBranch(selectedBranch);
}
} catch (Exception ex) {
OseeLog.log(getClass(), Level.SEVERE, ex);
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CreateTestCoverageUnits.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CreateTestCoverageUnits.java index 44d318adee1..7e2c12abd4e 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CreateTestCoverageUnits.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CreateTestCoverageUnits.java @@ -51,7 +51,7 @@ public class CreateTestCoverageUnits extends XNavigateItemAction { if (!CoverageUtil.getBranchFromUser(false)) return; CoveragePackageArtifactListDialog dialog = new CoveragePackageArtifactListDialog(getName(), "Select Coverage Package"); - dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts()); + dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts(CoverageUtil.getBranch())); if (dialog.open() == 0) { Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0]; OseeCoveragePackageStore store = new OseeCoveragePackageStore(coveragePackageArtifact); diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java index 6a1dbb67dd5..a0da95032d9 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java @@ -25,6 +25,7 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -45,15 +46,15 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave public static String IMPORT_RECORD_NAME = "Coverage Import Record";
public OseeCoveragePackageStore(Artifact artifact) throws OseeCoreException {
- super(null, CoverageArtifactTypes.CoveragePackage);
+ super(null, CoverageArtifactTypes.CoveragePackage, artifact.getBranch());
this.artifact = artifact;
coverageOptionManager = (new CoverageOptionManagerStore(this)).getCoverageOptionManager();
this.coveragePackage = new CoveragePackage(artifact.getName(), coverageOptionManager);
load(coverageOptionManager);
}
- public OseeCoveragePackageStore(CoveragePackage coveragePackage) {
- super(coveragePackage, CoverageArtifactTypes.CoveragePackage);
+ public OseeCoveragePackageStore(CoveragePackage coveragePackage, Branch branch) {
+ super(coveragePackage, CoverageArtifactTypes.CoveragePackage, branch);
this.coveragePackage = coveragePackage;
}
@@ -61,8 +62,8 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave return coveragePackage;
}
- public static OseeCoveragePackageStore get(CoveragePackage coveragePackage) {
- return new OseeCoveragePackageStore(coveragePackage);
+ public static OseeCoveragePackageStore get(CoveragePackage coveragePackage, Branch branch) {
+ return new OseeCoveragePackageStore(coveragePackage, branch);
}
public static CoveragePackage get(Artifact artifact) throws OseeCoreException {
@@ -94,7 +95,7 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave artifact.setName(coveragePackage.getName());
artifact.setSoleAttributeValue(CoverageAttributes.ACTIVE.getStoreName(), coveragePackage.isEditable().isTrue());
for (CoverageUnit coverageUnit : coveragePackage.getCoverageUnits()) {
- OseeCoverageStore store = new OseeCoverageUnitStore(coverageUnit);
+ OseeCoverageStore store = new OseeCoverageUnitStore(coverageUnit, artifact.getBranch());
store.save(transaction);
Artifact childArt = store.getArtifact(false);
if (childArt.getParent() == null && !(artifact.getChildren().contains(childArt))) {
@@ -120,7 +121,7 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave } else {
throw new OseeArgumentException("Unhandled coverage type");
}
- OseeCoverageUnitStore store = new OseeCoverageUnitStore(coverageUnit);
+ OseeCoverageUnitStore store = new OseeCoverageUnitStore(coverageUnit, transaction.getBranch());
store.save(transaction);
}
elapsedTime.end();
@@ -171,7 +172,7 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave getArtifact(false).deleteAndPersist(transaction);
}
for (CoverageUnit childCoverageUnit : coveragePackage.getCoverageUnits()) {
- new OseeCoverageUnitStore(childCoverageUnit).delete(transaction, purge);
+ new OseeCoverageUnitStore(childCoverageUnit, transaction.getBranch()).delete(transaction, purge);
}
}
@@ -180,13 +181,13 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave return coveragePackage.isEditable();
}
- public static Collection<Artifact> getCoveragePackageArtifacts() throws OseeCoreException {
- return ArtifactQuery.getArtifactListFromType(CoverageArtifactTypes.CoveragePackage, CoverageUtil.getBranch());
+ public static Collection<Artifact> getCoveragePackageArtifacts(Branch branch) throws OseeCoreException {
+ return ArtifactQuery.getArtifactListFromType(CoverageArtifactTypes.CoveragePackage, branch);
}
public Result save(Collection<ICoverage> coverages) throws OseeCoreException {
try {
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Save");
+ SkynetTransaction transaction = new SkynetTransaction(branch, "Coverage Save");
save(transaction, coverages);
transaction.execute();
} catch (OseeCoreException ex) {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java index 404d5ea921b..2db15463fe7 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java @@ -8,10 +8,10 @@ package org.eclipse.osee.coverage.store; import org.eclipse.osee.coverage.internal.Activator;
import org.eclipse.osee.coverage.model.CoverageOptionManager;
import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -25,25 +25,26 @@ import org.eclipse.osee.framework.ui.plugin.util.Result; */
public abstract class OseeCoverageStore extends CoverageStore {
protected Artifact artifact;
+ protected Branch branch;
private final IArtifactType artifactType;
private final ICoverage coverage;
- public OseeCoverageStore(ICoverage coverage, IArtifactType artifactType) {
+ public OseeCoverageStore(ICoverage coverage, IArtifactType artifactType, Branch branch) {
super(coverage);
this.coverage = coverage;
this.artifactType = artifactType;
+ this.branch = branch;
}
public Artifact getArtifact(boolean create) throws OseeCoreException {
if (artifact == null) {
try {
- artifact = ArtifactQuery.getArtifactFromId(coverage.getGuid(), CoverageUtil.getBranch());
+ artifact = ArtifactQuery.getArtifactFromId(coverage.getGuid(), branch);
} catch (ArtifactDoesNotExist ex) {
// do nothing
}
if (artifact == null && create) {
- artifact =
- ArtifactTypeManager.addArtifact(artifactType, CoverageUtil.getBranch(), coverage.getGuid(), null);
+ artifact = ArtifactTypeManager.addArtifact(artifactType, branch, coverage.getGuid(), null);
}
}
return artifact;
@@ -58,7 +59,7 @@ public abstract class OseeCoverageStore extends CoverageStore { @Override
public Result save() throws OseeCoreException {
try {
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Save");
+ SkynetTransaction transaction = new SkynetTransaction(branch, "Coverage Save");
save(transaction);
transaction.execute();
} catch (OseeCoreException ex) {
@@ -70,11 +71,15 @@ public abstract class OseeCoverageStore extends CoverageStore { @Override
public void delete(boolean purge) throws OseeCoreException {
- SkynetTransaction transaction = new SkynetTransaction(CoverageUtil.getBranch(), "Coverage Save");
+ SkynetTransaction transaction = new SkynetTransaction(branch, "Coverage Save");
delete(transaction, purge);
transaction.execute();
}
public abstract Result save(SkynetTransaction transaction) throws OseeCoreException;
+ public Branch getBranch() throws OseeCoreException {
+ return branch;
+ }
+
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitFileContentsProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitFileContentsProvider.java index d5bc32a1aaa..3fe6136bec3 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitFileContentsProvider.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitFileContentsProvider.java @@ -10,6 +10,7 @@ import org.eclipse.osee.coverage.internal.Activator; import org.eclipse.osee.coverage.model.CoverageUnit;
import org.eclipse.osee.coverage.model.ICoverageUnitFileContentsProvider;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -18,19 +19,24 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; */
public class OseeCoverageUnitFileContentsProvider implements ICoverageUnitFileContentsProvider {
- private static OseeCoverageUnitFileContentsProvider instance = new OseeCoverageUnitFileContentsProvider();
+ private static OseeCoverageUnitFileContentsProvider instance;
+ private final Branch branch;
- private OseeCoverageUnitFileContentsProvider() {
+ private OseeCoverageUnitFileContentsProvider(Branch branch) {
+ this.branch = branch;
}
- public static OseeCoverageUnitFileContentsProvider getInstance() {
+ public static OseeCoverageUnitFileContentsProvider getInstance(Branch branch) {
+ if (instance == null) {
+ instance = new OseeCoverageUnitFileContentsProvider(branch);
+ }
return instance;
}
@Override
public String getFileContents(CoverageUnit coverageUnit) {
try {
- OseeCoverageUnitStore store = new OseeCoverageUnitStore(coverageUnit);
+ OseeCoverageUnitStore store = new OseeCoverageUnitStore(coverageUnit, branch);
Artifact artifact = store.getArtifact(false);
if (artifact != null) {
return artifact.getSoleAttributeValue(CoverageAttributes.FILE_CONTENTS.getStoreName(), "");
@@ -44,7 +50,7 @@ public class OseeCoverageUnitFileContentsProvider implements ICoverageUnitFileCo @Override
public void setFileContents(CoverageUnit coverageUnit, String fileContents) {
try {
- OseeCoverageUnitStore store = new OseeCoverageUnitStore(coverageUnit);
+ OseeCoverageUnitStore store = new OseeCoverageUnitStore(coverageUnit, branch);
Artifact artifact = store.getArtifact(false);
if (artifact != null) {
artifact.setSoleAttributeValue(CoverageAttributes.FILE_CONTENTS.getStoreName(), fileContents);
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java index bfff32aeb91..1c5b57832ec 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java @@ -14,8 +14,8 @@ import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
import org.eclipse.osee.coverage.model.CoverageUnit;
import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -32,16 +32,16 @@ public class OseeCoverageUnitStore extends OseeCoverageStore { private final CoverageUnit coverageUnit;
public OseeCoverageUnitStore(ICoverage parent, Artifact artifact, CoverageOptionManager coverageOptionManager) throws OseeCoreException {
- super(null, artifact.getArtifactType());
+ super(null, artifact.getArtifactType(), artifact.getBranch());
this.artifact = artifact;
this.coverageUnit =
- new CoverageUnit(parent, artifact.getName(), "", OseeCoverageUnitFileContentsProvider.getInstance());
+ new CoverageUnit(parent, artifact.getName(), "", OseeCoverageUnitFileContentsProvider.getInstance(branch));
load(coverageOptionManager);
}
- public OseeCoverageUnitStore(CoverageUnit coverageUnit) {
+ public OseeCoverageUnitStore(CoverageUnit coverageUnit, Branch branch) {
super(coverageUnit,
- coverageUnit.isFolder() ? CoverageArtifactTypes.CoverageFolder : CoverageArtifactTypes.CoverageUnit);
+ coverageUnit.isFolder() ? CoverageArtifactTypes.CoverageFolder : CoverageArtifactTypes.CoverageUnit, branch);
this.coverageUnit = coverageUnit;
}
@@ -50,8 +50,8 @@ public class OseeCoverageUnitStore extends OseeCoverageStore { return unitStore.getCoverageUnit();
}
- public static OseeCoverageUnitStore get(CoverageUnit coverageUnit) throws OseeCoreException {
- return new OseeCoverageUnitStore(coverageUnit);
+ public static OseeCoverageUnitStore get(CoverageUnit coverageUnit, Branch branch) throws OseeCoreException {
+ return new OseeCoverageUnitStore(coverageUnit, branch);
}
public void delete(SkynetTransaction transaction, boolean purge) throws OseeCoreException {
@@ -62,7 +62,7 @@ public class OseeCoverageUnitStore extends OseeCoverageStore { getArtifact(false).deleteAndPersist(transaction);
}
for (CoverageUnit childCoverageUnit : coverageUnit.getCoverageUnits()) {
- new OseeCoverageUnitStore(childCoverageUnit).delete(transaction, purge);
+ new OseeCoverageUnitStore(childCoverageUnit, branch).delete(transaction, purge);
}
}
@@ -79,7 +79,7 @@ public class OseeCoverageUnitStore extends OseeCoverageStore { coverageUnit.addCoverageItem(item);
}
// Don't load file contents until needed
- coverageUnit.setFileContentsProvider(OseeCoverageUnitFileContentsProvider.getInstance());
+ coverageUnit.setFileContentsProvider(OseeCoverageUnitFileContentsProvider.getInstance(branch));
coverageUnit.setNotes(artifact.getSoleAttributeValueAsString(CoverageAttributes.NOTES.getStoreName(), ""));
coverageUnit.setFolder(artifact.isOfType(CoverageArtifactTypes.CoverageFolder));
coverageUnit.setAssignees(artifact.getSoleAttributeValueAsString(CoverageAttributes.ASSIGNEES.getStoreName(),
@@ -120,10 +120,10 @@ public class OseeCoverageUnitStore extends OseeCoverageStore { if (Strings.isValid(coverageUnit.getNamespace())) {
artifact.setSoleAttributeFromString(CoverageAttributes.NAMESPACE.getStoreName(), coverageUnit.getNamespace());
}
- if (coverageUnit.getFileContentsProvider() != null && coverageUnit.getFileContentsProvider() != OseeCoverageUnitFileContentsProvider.getInstance()) {
+ if (coverageUnit.getFileContentsProvider() != null && coverageUnit.getFileContentsProvider() != OseeCoverageUnitFileContentsProvider.getInstance(branch)) {
String fileContents = coverageUnit.getFileContents();
if (Strings.isValid(fileContents)) {
- coverageUnit.setFileContentsProvider(OseeCoverageUnitFileContentsProvider.getInstance());
+ coverageUnit.setFileContentsProvider(OseeCoverageUnitFileContentsProvider.getInstance(branch));
coverageUnit.setFileContents(fileContents);
}
}
@@ -137,15 +137,14 @@ public class OseeCoverageUnitStore extends OseeCoverageStore { artifact.setSoleAttributeFromString(CoverageAttributes.LOCATION.getStoreName(), coverageUnit.getLocation());
}
if (coverageUnit.getParent() != null) {
- Artifact parentArt =
- ArtifactQuery.getArtifactFromId(coverageUnit.getParent().getGuid(), CoverageUtil.getBranch());
+ Artifact parentArt = ArtifactQuery.getArtifactFromId(coverageUnit.getParent().getGuid(), branch);
if (artifact.getParent() == null && !parentArt.getChildren().contains(artifact)) {
parentArt.addChild(artifact);
}
}
// Save current/new coverage items
for (CoverageUnit childCoverageUnit : coverageUnit.getCoverageUnits()) {
- new OseeCoverageUnitStore(childCoverageUnit).save(transaction);
+ new OseeCoverageUnitStore(childCoverageUnit, branch).save(transaction);
}
// Delete removed coverage units and folders
for (Artifact childArt : artifact.getChildren()) {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java index 7a4e1ac2265..e0939b4ee06 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java @@ -55,7 +55,7 @@ public class CoverageUtil { if (dialog.open() != 0) {
return false;
}
- CoverageUtil.setBranch(dialog.getSelected());
+ CoverageUtil.setNavigatorSelectedBranch(dialog.getSelected());
}
return true;
}
@@ -138,7 +138,7 @@ public class CoverageUtil { return branch;
}
- public static void setBranch(Branch branch) {
+ public static void setNavigatorSelectedBranch(Branch branch) {
CoverageUtil.branch = branch;
for (Listener listener : branchChangeListeners) {
listener.handleEvent(null);
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/ISaveable.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/ISaveable.java index d4ebe42e1c3..63543179a24 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/ISaveable.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/ISaveable.java @@ -9,6 +9,7 @@ import java.util.Collection; import org.eclipse.osee.coverage.model.CoverageImport;
import org.eclipse.osee.coverage.model.ICoverage;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.Result;
@@ -24,4 +25,6 @@ public interface ISaveable { public Result saveImportRecord(SkynetTransaction transaction, CoverageImport coverageImport) throws OseeCoreException;
public Result isEditable();
+
+ public Branch getBranch() throws OseeCoreException;
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/NotSaveable.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/NotSaveable.java index 6d6a072d28b..56a7956a0f7 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/NotSaveable.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/NotSaveable.java @@ -9,6 +9,7 @@ import java.util.Collection; import org.eclipse.osee.coverage.model.CoverageImport;
import org.eclipse.osee.coverage.model.ICoverage;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.Result;
@@ -37,4 +38,9 @@ public class NotSaveable implements ISaveable { return new Result("Not Saveable");
}
+ @Override
+ public Branch getBranch() throws OseeCoreException {
+ return null;
+ }
+
}
|