refinement: Remove ArtifactCache.cacheByText

Change-Id: I9476306f7dda1a131e150d4ec81edaa7728f331e

3 files changed, 0 insertions, 288 deletions

diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java
deleted file mode 100644
index c3a83519790..00000000000
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*******************************************************************************
- * 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.client.integration.tests.integration.skynet.core;
-
-import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO;
-import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule;
-import org.eclipse.osee.client.test.framework.OseeLogMonitorRule;
-import org.eclipse.osee.client.test.framework.TestInfo;
-import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
-import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCacheQuery;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * Test unit for {@link ArtifactCacheQuery}
- * 
- * @author Donald G. Dunne
- */
-public class ArtifactCacheQueryTest {
-
-   @Rule
-   public OseeClientIntegrationRule integration = new OseeClientIntegrationRule(OSEE_CLIENT_DEMO);
-
-   @Rule
-   public OseeLogMonitorRule monitorRule = new OseeLogMonitorRule();
-
-   @Rule
-   public TestInfo method = new TestInfo();
-
-   private static final String STATIC_ID_AAA = "aaa";
-   private static final String STATIC_ID_BBB = "bbb";
-   private static final String STATIC_ID_CCC = "ccc";
-   private static final String STATIC_ID_DDD = "ddd";
-   private static final String STATIC_ID_EEE = "eee";
-
-   private static final String[] ALL_STATIC_IDS =
-      new String[] {STATIC_ID_AAA, STATIC_ID_BBB, STATIC_ID_CCC, STATIC_ID_DDD, STATIC_ID_EEE};
-
-   private static final BranchId branch = CoreBranches.COMMON;
-
-   @After
-   public void tearDown() throws OseeCoreException {
-      SkynetTransaction transaction =
-         TransactionManager.createTransaction(branch, "Static ID Manager test cleanup for re-run");
-      for (String staticIdValue : ALL_STATIC_IDS) {
-         List<Artifact> artifacts =
-            ArtifactQuery.getArtifactListFromAttribute(CoreAttributeTypes.StaticId, staticIdValue, branch);
-         for (Artifact artifact : artifacts) {
-            artifact.deleteAndPersist(transaction);
-         }
-      }
-      transaction.execute();
-
-      for (String staticIdValue : ALL_STATIC_IDS) {
-         Collection<Artifact> artifacts = ArtifactQuery.getArtifactListFromTypeAndAttribute(
-            CoreArtifactTypes.GeneralData, CoreAttributeTypes.StaticId, staticIdValue, branch);
-         for (Artifact artifact : artifacts) {
-            System.err.println("Search returned non-deleted " + artifact.getGuid());
-         }
-         assertTrue("Expected 0 artifacts; Returned " + artifacts.size(), artifacts.isEmpty());
-      }
-   }
-
-   /**
-    * Test method for (@link ArtifactCacheQuery.getOrCreateSingletonArtifactByText, ArtifactCache.getListByTextId}
-    */
-   @Test
-   public void testStaticIdsGettingCached() throws OseeCoreException {
-      String staticId = "org." + GUID.create();
-      Artifact artifact = ArtifactCacheQuery.getOrCreateSingletonArtifactByText(CoreArtifactTypes.GeneralData,
-         CoreAttributeTypes.StaticId, staticId, branch);
-      assertNotNull(artifact);
-      artifact.addAttribute(CoreAttributeTypes.StaticId, staticId);
-      artifact.persist(getClass().getSimpleName());
-
-      Collection<Artifact> artifacts = ArtifactCache.getListByTextId(staticId, branch);
-      assertTrue("Should be 1; Returned " + artifacts.size(), artifacts.size() == 1);
-
-      artifact.deleteAndPersist();
-      artifacts = ArtifactCache.getListByTextId(staticId, branch);
-      assertTrue("Should be 0; Returned " + artifacts.size(), artifacts.isEmpty());
-   }
-
-   /**
-    * Test method for {@link ArtifactCacheQuery.getSingletonArtifactByText,
-    * ArtifactCacheQuery.getOrCreateSingletonArtifactByText}
-    */
-   @Test
-   public void testGetSingletonArtifact() throws OseeCoreException {
-      Artifact artifact = ArtifactCacheQuery.getSingletonArtifactByText(CoreArtifactTypes.GeneralData,
-         CoreAttributeTypes.StaticId, STATIC_ID_AAA, branch, true);
-      assertNull(artifact);
-
-      artifact = ArtifactCacheQuery.getOrCreateSingletonArtifactByText(CoreArtifactTypes.GeneralData,
-         CoreAttributeTypes.StaticId, STATIC_ID_AAA, branch);
-      assertNotNull(artifact);
-
-      deleteArtifacts(Arrays.asList(artifact), STATIC_ID_AAA);
-   }
-
-   /**
-    * Test unif or {@link ArtifactCacheQuery.getSingletonArtifactByText, Artifact.setSingletonAttributeValue}
-    */
-   @org.junit.Test
-   public void testSetSingletonAttributeValue() throws OseeCoreException {
-      // create artifact with two of same static id values
-      Artifact artifact = ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralData, branch);
-      artifact.persist(getClass().getSimpleName());
-      artifact.addAttribute(CoreAttributeTypes.StaticId, STATIC_ID_BBB);
-      artifact.addAttribute(CoreAttributeTypes.StaticId, STATIC_ID_BBB);
-      ArtifactCache.cacheByTextId(STATIC_ID_BBB, artifact);
-      ArtifactCache.cacheByTextId(STATIC_ID_BBB, artifact);
-
-      // call to search for artifact with STATIC_ID_BBB
-      Artifact artifactWithDoubleBbb = ArtifactCacheQuery.getSingletonArtifactByText(CoreArtifactTypes.GeneralData,
-         CoreAttributeTypes.StaticId, STATIC_ID_BBB, branch, false);
-      assertNotNull(artifactWithDoubleBbb);
-
-      // should be two static id attributes
-      int count = artifactWithDoubleBbb.getAttributeCount(CoreAttributeTypes.StaticId);
-      assertTrue("Expected 2 attributes; Returned " + count, count == 2);
-
-      count = artifactWithDoubleBbb.getAttributeCount(CoreAttributeTypes.StaticId);
-      assertTrue("Expected 2 attributes; Returned " + count, count == 2);
-
-      // call to set singleton which should resolve duplicates
-      artifactWithDoubleBbb.setSingletonAttributeValue(CoreAttributeTypes.StaticId, STATIC_ID_BBB);
-
-      // should now be only one static id attributes
-      count = artifactWithDoubleBbb.getAttributeCount(CoreAttributeTypes.StaticId);
-      assertTrue("Expected 1 attributes; Returned " + count, count == 1);
-
-      deleteArtifacts(Arrays.asList(artifact), STATIC_ID_BBB);
-   }
-
-   /**
-    * Test method for {@link ArtifactCacheQuery#getSingletonArtifactCacheByTextOrException} .
-    */
-   @org.junit.Test
-   public void testGetSingletonArtifactOrException() throws OseeCoreException {
-      try {
-         ArtifactCacheQuery.getSingletonArtifactByTextOrException(CoreArtifactTypes.GeneralData,
-            CoreAttributeTypes.StaticId, STATIC_ID_DDD, COMMON);
-         fail("ArtifactDoesNotExist should have been thrown.");
-      } catch (Exception ex) {
-         assertTrue("Was not ArtifactDoesNotExist was: " + ex.getClass().getSimpleName(),
-            ex instanceof ArtifactDoesNotExist);
-      }
-
-      Collection<Artifact> artifacts = new ArrayList<>();
-      SkynetTransaction transaction =
-         TransactionManager.createTransaction(branch, "testGetSingletonArtifactOrException");
-      for (int index = 0; index < 2; index++) {
-         Artifact artifact = ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralData, branch);
-         artifact.setSingletonAttributeValue(CoreAttributeTypes.StaticId, STATIC_ID_DDD);
-         ArtifactCache.cacheByTextId(STATIC_ID_DDD, artifact);
-         artifact.persist(transaction);
-         assertNotNull(artifact);
-         artifacts.add(artifact);
-      }
-      transaction.execute();
-
-      try {
-         ArtifactCacheQuery.getSingletonArtifactByTextOrException(CoreArtifactTypes.GeneralData,
-            CoreAttributeTypes.StaticId, STATIC_ID_DDD, COMMON);
-         fail("MultipleArtifactsExist should have been thrown");
-      } catch (Exception ex) {
-         assertTrue("Was not MultipleArtifactsExist was: " + ex.getClass().getSimpleName(),
-            ex instanceof MultipleArtifactsExist);
-      }
-
-      deleteArtifacts(artifacts, STATIC_ID_DDD);
-   }
-
-   /**
-    * Test unit for {@link ArtifactCache.getListByTextId} that deleted artifacts not returned
-    */
-   private void deleteArtifacts(Collection<Artifact> toDelete, String staticId) throws OseeCoreException {
-      if (!toDelete.isEmpty()) {
-         if (toDelete.size() == 1) {
-            toDelete.iterator().next().deleteAndPersist();
-         } else {
-            SkynetTransaction transaction =
-               TransactionManager.createTransaction(branch, "Delete collection of artifacts");
-            for (Artifact artifact : toDelete) {
-               artifact.delete();
-            }
-            for (Artifact artifact : toDelete) {
-               artifact.persist(transaction);
-            }
-            transaction.execute();
-         }
-
-         Collection<Artifact> artifacts = ArtifactCache.getListByTextId(staticId, branch);
-         assertTrue("Should be 0; Returned " + artifacts.size(), artifacts.isEmpty());
-      }
-   }
-
-   /**
-    * Test method for {@link ArtifactCacheQuery.getOrCreateSingletonArtifactByText,
-    * ArtifactCacheQuery.getSingletonArtifactByText} .
-    */
-   @org.junit.Test
-   public void testGetSingletonArtifactStringStringBranch() throws OseeCoreException {
-      List<Artifact> itemsCreated = new ArrayList<>();
-
-      // create single artifact with eee staticId
-      Artifact artifact = ArtifactCacheQuery.getOrCreateSingletonArtifactByText(CoreArtifactTypes.GeneralData,
-         CoreAttributeTypes.StaticId, STATIC_ID_EEE, branch);
-      artifact.persist("create single artifact with eee staticId");
-      assertNotNull(artifact);
-
-      itemsCreated.add(artifact);
-
-      // test that singleton comes back
-      artifact = ArtifactCacheQuery.getSingletonArtifactByText(CoreArtifactTypes.GeneralData,
-         CoreAttributeTypes.StaticId, STATIC_ID_EEE, branch, false);
-      assertNotNull(artifact);
-
-      // create another artifact with eee staticId
-      artifact = ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralData, branch);
-      artifact.setSingletonAttributeValue(CoreAttributeTypes.StaticId, STATIC_ID_EEE);
-      artifact.persist("create another artifact with eee staticId");
-      assertNotNull(artifact);
-      itemsCreated.add(artifact);
-
-      // test that there are now two artifacts with eee
-      Collection<Artifact> artifacts = ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.GeneralData,
-         CoreAttributeTypes.StaticId, STATIC_ID_EEE, branch);
-      assertTrue("Expected 2 artifacts; Returned " + artifacts.size(), artifacts.size() == 2);
-
-      // test that call to get singleton does NOT exception
-      try {
-         artifact = ArtifactCacheQuery.getSingletonArtifactByText(CoreArtifactTypes.GeneralData,
-            CoreAttributeTypes.StaticId, STATIC_ID_EEE, branch, false);
-         assertNotNull(artifact);
-      } catch (Exception ex) {
-         fail("Exception should not have occurred " + ex.getLocalizedMessage());
-      }
-      deleteArtifacts(itemsCreated, STATIC_ID_EEE);
-   }
-}
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/XSkynetCoreIntegrationTestSuite.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/XSkynetCoreIntegrationTestSuite.java
index d518e5a486d..b47bab0f129 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/XSkynetCoreIntegrationTestSuite.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/XSkynetCoreIntegrationTestSuite.java
@@ -15,7 +15,6 @@ import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-   ArtifactCacheQueryTest.class,
    ArtifactEventLoopbackTest.class,
    ArtifactEventTest.class,
    ArtifactGetLastModifiedTest.class,
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ImageManagerTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ImageManagerTest.java
index 3aff9b690f0..ef11ff28b4b 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ImageManagerTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ImageManagerTest.java
@@ -10,9 +10,6 @@
  *******************************************************************************/
 package org.eclipse.osee.client.integration.tests.integration.ui.skynet;
 
-import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.Folder;
-import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.StaticId;
-import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -29,9 +26,6 @@ import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.eclipse.osee.framework.logging.IHealthStatus;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCacheQuery;
 import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
 import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
@@ -103,14 +97,6 @@ public abstract class ImageManagerTest {
 
    }
 
-   @org.junit.Test
-   public void testGetImageByArtifact() throws Exception {
-      Artifact folder = ArtifactCacheQuery.getOrCreateSingletonArtifactByText(Folder, StaticId, "user.groups", COMMON);
-      assertTrue("Image returned not a folder image.",
-         ArtifactImageManager.getImage(folder).equals(ImageManager.getImage(PluginUiImage.FOLDER)));
-      ArtifactCache.deCache(folder);
-   }
-
    public static ByteArrayInputStream getByteArrayInputStream(String imageFilename) throws Exception {
       URL imageFile = Platform.getBundle(PLUGIN_ID).getResource("images/" + imageFilename);
       if (imageFile == null) {