code coverage

10 files changed, 89 insertions, 30 deletions

diff --git a/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/cases/AtsBranchConfigurationTest.java b/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/cases/AtsBranchConfigurationTest.java
index 17601912236..f984ae839d3 100644
--- a/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/cases/AtsBranchConfigurationTest.java
+++ b/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/cases/AtsBranchConfigurationTest.java
@@ -196,6 +196,8 @@ public class AtsBranchConfigurationTest {
       // commit branch

       commitBranch(teamWf);

 

+      TestUtil.sleep(2000);

+

       // test change report

       OseeLog.log(AtsPlugin.class, Level.INFO, "Test change report results");

       Collection<Artifact> newArts =

diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Fast_Suite.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Fast_Suite.java
index b01416a7bc7..bf4b1f204e5 100644
--- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Fast_Suite.java
+++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Fast_Suite.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.framework.skynet.core.test;
 import static org.junit.Assert.assertTrue;

 import org.eclipse.osee.framework.core.client.ClientSessionManager;

 import org.eclipse.osee.framework.skynet.core.test.branch.BranchTestSuite;

+import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryTestDemo;

 import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactTypeInheritanceTest;

 import org.eclipse.osee.framework.skynet.core.test.cases.Artifact_setAttributeValues;

 import org.eclipse.osee.framework.skynet.core.test.cases.CsvArtifactTest;

@@ -29,10 +30,10 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

 

 @RunWith(Suite.class)

-@Suite.SuiteClasses( {TransactionManagerTest.class, BranchTestSuite.class, RelationTestSuite.class,

-      OseeCacheTestSuite.class, ArtifactTypeInheritanceTest.class, Artifact_setAttributeValues.class,

-      CsvArtifactTest.class, SevereLogMonitorTest.class, RelationDeletionTest.class, StaticIdManagerTest.class,

-      DuplicateHridTest.class, RelationOrderingTest.class})

+@Suite.SuiteClasses( {ArtifactQueryTestDemo.class, TransactionManagerTest.class, BranchTestSuite.class,

+      RelationTestSuite.class, OseeCacheTestSuite.class, ArtifactTypeInheritanceTest.class,

+      Artifact_setAttributeValues.class, CsvArtifactTest.class, SevereLogMonitorTest.class, RelationDeletionTest.class,

+      StaticIdManagerTest.class, DuplicateHridTest.class, RelationOrderingTest.class})

 /**

  * @author Donald G. Dunne

  */

diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Suite.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Suite.java
index 55f809f0878..4cb335e8cdc 100644
--- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Suite.java
+++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Demo_Suite.java
@@ -15,6 +15,7 @@ import org.eclipse.osee.framework.core.client.ClientSessionManager;
 import org.eclipse.osee.framework.skynet.core.test.branch.BranchManagerTest;

 import org.eclipse.osee.framework.skynet.core.test.branch.BranchTestSuite;

 import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactPurgeTest;

+import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryTestDemo;

 import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactTypeInheritanceTest;

 import org.eclipse.osee.framework.skynet.core.test.cases.Artifact_setAttributeValues;

 import org.eclipse.osee.framework.skynet.core.test.cases.BranchPurgeTest;

@@ -36,11 +37,12 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

 

 @RunWith(Suite.class)

-@Suite.SuiteClasses( {TransactionManagerTest.class, BranchTestSuite.class, BranchManagerTest.class,

-      RelationTestSuite.class, OseeCacheTestSuite.class, ArtifactTypeInheritanceTest.class, ArtifactPurgeTest.class,

-      BranchPurgeTest.class, Artifact_setAttributeValues.class, CsvArtifactTest.class, NativeArtifactTest.class,

-      ConflictTest.class, ChangeManagerTest.class, SevereLogMonitorTest.class, RelationDeletionTest.class,

-      StaticIdManagerTest.class, BranchStateTest.class, DuplicateHridTest.class, RelationOrderingTest.class})

+@Suite.SuiteClasses( {ArtifactQueryTestDemo.class, TransactionManagerTest.class, BranchTestSuite.class,

+      BranchManagerTest.class, RelationTestSuite.class, OseeCacheTestSuite.class, ArtifactTypeInheritanceTest.class,

+      ArtifactPurgeTest.class, BranchPurgeTest.class, Artifact_setAttributeValues.class, CsvArtifactTest.class,

+      NativeArtifactTest.class, ConflictTest.class, ChangeManagerTest.class, SevereLogMonitorTest.class,

+      RelationDeletionTest.class, StaticIdManagerTest.class, BranchStateTest.class, DuplicateHridTest.class,

+      RelationOrderingTest.class})

 /**

  * @author Donald G. Dunne

  */

diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Production_Suite.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Production_Suite.java
index 39fb461a209..cb05b3ecf4f 100644
--- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Production_Suite.java
+++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Production_Suite.java
@@ -13,13 +13,13 @@ package org.eclipse.osee.framework.skynet.core.test;
 import junit.framework.Assert;

 import org.eclipse.osee.framework.core.client.ClientSessionManager;

 import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryPerformanceTests;

-import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryTest;

+import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryTestProduction;

 import org.junit.BeforeClass;

 import org.junit.runner.RunWith;

 import org.junit.runners.Suite;

 

 @RunWith(Suite.class)

-@Suite.SuiteClasses( {ArtifactQueryPerformanceTests.class, ArtifactQueryTest.class})

+@Suite.SuiteClasses( {ArtifactQueryPerformanceTests.class, ArtifactQueryTestProduction.class})

 /**

  * @author Donald G. Dunne

  */

diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestDemo.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestDemo.java
new file mode 100644
index 00000000000..081e8996642
--- /dev/null
+++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestDemo.java
@@ -0,0 +1,57 @@
+/*******************************************************************************

+ * 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.framework.skynet.core.test.cases;

+

+import junit.framework.Assert;

+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.ArtifactTypeManager;

+import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;

+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;

+

+/**

+ * @author Donald G. Dunne

+ */

+public class ArtifactQueryTestDemo {

+

+   @org.junit.Test

+   public void testGetArtifactFromGUIDDeleted() throws OseeCoreException {

+      Artifact newArtifact =

+            ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralData, BranchManager.getCommonBranch());

+      newArtifact.persist();

+

+      // Should exist

+      Artifact searchedArtifact =

+            ArtifactQuery.getArtifactFromId(newArtifact.getGuid(), BranchManager.getCommonBranch());

+      Assert.assertNotNull(searchedArtifact);

+

+      // Should exist with allowDeleted

+      searchedArtifact = ArtifactQuery.getArtifactFromId(newArtifact.getGuid(), BranchManager.getCommonBranch(), true);

+      Assert.assertNotNull(searchedArtifact);

+

+      newArtifact.deleteAndPersist();

+

+      // Should NOT exist, cause deleted

+      try {

+         ArtifactQuery.getArtifactFromId(newArtifact.getGuid(), BranchManager.getCommonBranch());

+         Assert.fail("artifact query should have thrown does not exist exception");

+      } catch (ArtifactDoesNotExist ex) {

+         // do nothing, this is the expected case

+      }

+

+      // Should still exist with allowDeleted

+      searchedArtifact = ArtifactQuery.getArtifactFromId(newArtifact.getGuid(), BranchManager.getCommonBranch(), true);

+      Assert.assertNotNull(searchedArtifact);

+

+   }

+}
\ No newline at end of file
diff --git a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTest.java b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestProduction.java
index e0b167d19a8..0b541f5d197 100644
--- a/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTest.java
+++ b/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestProduction.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.skynet.core.test.cases;
 

 import static org.junit.Assert.assertEquals;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

-import org.eclipse.osee.framework.core.model.Branch;

 import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;

@@ -21,21 +20,20 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 /**

  * @author Ryan D. Brooks

  */

-public class ArtifactQueryTest {

+public class ArtifactQueryTestProduction {

 

    @org.junit.Test

    public void testGetArtifactFromHRID() throws OseeCoreException {

-      Branch common = BranchManager.getCommonBranch();

-      Artifact root = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(common);

-      Artifact artifact = ArtifactQuery.getArtifactFromId(root.getHumanReadableId(), common);

+      Artifact root = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(BranchManager.getCommonBranch());

+      Artifact artifact = ArtifactQuery.getArtifactFromId(root.getHumanReadableId(), BranchManager.getCommonBranch());

       assertEquals(root.getHumanReadableId(), artifact.getHumanReadableId());

    }

 

    @org.junit.Test

    public void testGetArtifactFromGUID() throws OseeCoreException {

-      Branch common = BranchManager.getCommonBranch();

-      Artifact root = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(common);

-      Artifact artifact = ArtifactQuery.getArtifactFromId(root.getGuid(), common);

+      Artifact root = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(BranchManager.getCommonBranch());

+      Artifact artifact = ArtifactQuery.getArtifactFromId(root.getGuid(), BranchManager.getCommonBranch());

       assertEquals(root.getGuid(), artifact.getGuid());

    }

+

 }
\ No newline at end of file
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java
index 687cd0bb2f4..b291a34a783 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java
@@ -178,12 +178,6 @@ public class ArtifactPersistenceManager {
       }

    }

 

-   /**

-    * @param artifact

-    * @param builder

-    * @param reorderReloations

-    * @throws Exception

-    */

    private static void deleteTrace(Artifact artifact, SkynetTransaction transaction, boolean reorderRelations) throws OseeCoreException {

       if (!artifact.isDeleted()) {

          // This must be done first since the the actual deletion of an artifact clears out the link manager

@@ -191,6 +185,7 @@ public class ArtifactPersistenceManager {
             deleteTrace(childArtifact, transaction, false);

          }

          try {

+            ArtifactCache.deCache(artifact);

             artifact.internalSetDeleted();

             RelationManager.deleteRelationsAll(artifact, reorderRelations);

             if (transaction != null) {

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java
index 7b5f791302c..4613ed5b626 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java
@@ -152,6 +152,7 @@ public class PurgeArtifacts extends DbTransaction {
                transactionJoinId);

 

          for (Artifact art : artifactsToPurge) {

+            ArtifactCache.deCache(art);

             art.internalSetDeleted();

             for (RelationLink rel : art.getRelationsAll(false)) {

                rel.markAsPurged();

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
index 4b992f19c65..7b637dec8dc 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
@@ -139,6 +139,9 @@ public class ArtifactQuery {
    private static Artifact getOrCheckArtifactFromId(String guidOrHrid, IOseeBranch branch, boolean allowDeleted, QueryType queryType) throws OseeCoreException {

       Artifact artifact = ArtifactCache.getActive(guidOrHrid, branch);

       if (artifact != null) {

+         if (artifact.isDeleted() && !allowDeleted) {

+            return null;

+         }

          return artifact;

       }

       return new ArtifactQueryBuilder(guidOrHrid, branch, allowDeleted, FULL).getOrCheckArtifact(queryType);

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java
index 641fb66211a..e65071ae888 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java
@@ -17,10 +17,8 @@ import java.util.Collection;
 import java.util.LinkedList;

 import java.util.List;

 import java.util.logging.Level;

-

 import net.jini.core.entry.Entry;

 import net.jini.core.lookup.ServiceItem;

-

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

@@ -453,13 +451,14 @@ public class RemoteEventManager {
                               new LoadedArtifacts(((NetworkArtifactPurgeEvent) event).getId(),

                                     ((NetworkArtifactPurgeEvent) event).getArtifactIds(),

                                     ((NetworkArtifactPurgeEvent) event).getArtifactTypeIds());

-                        for(Artifact artifact : loadedArtifacts.getLoadedArtifacts()){

+                        for (Artifact artifact : loadedArtifacts.getLoadedArtifacts()) {

                            //This is because applications may still have a reference to the artifact

-                           for(RelationLink link : RelationManager.getRelationsAll(artifact.getArtId(), artifact.getBranch().getId(), false)){

+                           for (RelationLink link : RelationManager.getRelationsAll(artifact.getArtId(),

+                                 artifact.getBranch().getId(), false)) {

                               link.internalRemoteEventDelete();

                            }

-                           artifact.internalSetDeleted();

                            ArtifactCache.deCache(artifact);

+                           artifact.internalSetDeleted();

                         }

                         InternalEventManager.kickArtifactsPurgedEvent(sender, loadedArtifacts);

                      } catch (Exception ex) {

@@ -587,6 +586,7 @@ public class RemoteEventManager {
                   xModifiedEvents.add(new ArtifactModifiedEvent(sender, ArtifactModType.Deleted, unloadedArtifact));

                } else if (!artifact.isHistorical()) {

                   if (!InternalEventManager.enableRemoteEventLoopback) {

+                     ArtifactCache.deCache(artifact);

                      artifact.internalSetDeleted();

                   }