code coverage

9 files changed, 256 insertions, 41 deletions

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/Coverage_Db_Suite.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/Coverage_Db_Suite.java
index c70dc3184e8..114f4a164c3 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/Coverage_Db_Suite.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/Coverage_Db_Suite.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.coverage.test;
 import static org.junit.Assert.assertTrue;

 import org.eclipse.osee.coverage.test.model.CoverageItemPersistTest;

 import org.eclipse.osee.coverage.test.model.CoverageUnitPersistTest;

+import org.eclipse.osee.coverage.test.model.TestUnitStoreTest;

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

 import org.eclipse.osee.support.test.util.TestUtil;

 import org.junit.AfterClass;

@@ -21,8 +22,8 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

 

 @RunWith(Suite.class)

-@Suite.SuiteClasses( {Coverage_Suite.class, CoverageParametersTest.class, CoverageItemPersistTest.class,

-      CoverageUnitPersistTest.class, CoveragePackageImportTest.class})

+@Suite.SuiteClasses( {TestUnitStoreTest.class, Coverage_Suite.class, CoverageParametersTest.class,

+      CoverageItemPersistTest.class, CoverageUnitPersistTest.class, CoveragePackageImportTest.class})

 /**

  * @author Donald G. Dunne

  */

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/SimpleTestUnitProviderTest.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/SimpleTestUnitProviderTest.java
index 832e7f67098..3d48cf2eaa5 100644
--- a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/SimpleTestUnitProviderTest.java
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/SimpleTestUnitProviderTest.java
@@ -31,25 +31,17 @@ public class SimpleTestUnitProviderTest {
 

    /**

     * Test method for

-    * {@link org.eclipse.osee.coverage.model.SimpleTestUnitProvider#addTestUnitName(org.eclipse.osee.coverage.model.CoverageItem, java.lang.String)}

+    * {@link org.eclipse.osee.coverage.model.SimpleTestUnitProvider#getTestUnits(org.eclipse.osee.coverage.model.CoverageItem)}

     * .

     */

    @Test

-   public void testAddTestUnitName() {

+   public void testAddGetTestUnits() {

       provider.addTestUnitName(coverageItem1, "Test Unit 1");

       provider.addTestUnitName(coverageItem1, "Test Unit 2");

       provider.addTestUnitName(coverageItem1, "Test Unit 3");

       provider.addTestUnitName(coverageItem1, "Test Unit 3");

       provider.addTestUnitName(coverageItem1, "Test Unit 4");

-   }

 

-   /**

-    * Test method for

-    * {@link org.eclipse.osee.coverage.model.SimpleTestUnitProvider#getTestUnits(org.eclipse.osee.coverage.model.CoverageItem)}

-    * .

-    */

-   @Test

-   public void testGetTestUnits() {

       Assert.assertEquals(4, provider.getTestUnits(coverageItem1).size());

 

       // Should equal cause CoverageItems are "equal" (guids are same)

diff --git a/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/TestUnitStoreTest.java b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/TestUnitStoreTest.java
new file mode 100644
index 00000000000..2d639683a9b
--- /dev/null
+++ b/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/TestUnitStoreTest.java
@@ -0,0 +1,113 @@
+/*

+ * Created on Jan 21, 2010

+ *

+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

+ */

+package org.eclipse.osee.coverage.test.model;

+

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.List;

+import junit.framework.Assert;

+import org.eclipse.osee.coverage.model.CoverageItem;

+import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;

+import org.eclipse.osee.coverage.store.TestUnitStore;

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

+import org.junit.AfterClass;

+import org.junit.BeforeClass;

+import org.junit.Test;

+

+/**

+ * @author Donald G. Dunne

+ */

+public class TestUnitStoreTest {

+

+   public static CoverageItem item, item2;

+

+   @BeforeClass

+   public static void setup() throws OseeCoreException {

+      item = new CoverageItem(null, CoverageOptionManagerDefault.Test_Unit, "1");

+      item2 = new CoverageItem(null, CoverageOptionManagerDefault.Test_Unit, "2");

+      TestUnitStore.clearTestUnitNames();

+   }

+

+   @AfterClass

+   public static void cleanup() throws OseeCoreException {

+      TestUnitStore.clearTestUnitNames();

+   }

+

+   /**

+    * Test method for

+    * {@link org.eclipse.osee.coverage.store.TestUnitStore#addTestUnitNameToDb(java.lang.String, java.lang.String)}.

+    * 

+    * @throws OseeCoreException

+    */

+   @Test

+   public void testAddTestUnitNameToDb() throws OseeCoreException {

+      int count = TestUnitStore.getNameCount();

+      Assert.assertEquals(0, count);

+      TestUnitStore.getNameId("This.java", true);

+      int newCount = TestUnitStore.getNameCount();

+      Assert.assertEquals(1, newCount);

+

+      Integer nameId = TestUnitStore.getNameId("NotThis.java", false);

+      Assert.assertNull(nameId);

+      // Count should not have changed

+      newCount = TestUnitStore.getNameCount();

+      Assert.assertEquals(1, newCount);

+   }

+

+   /**

+    * Test method for

+    * {@link org.eclipse.osee.coverage.store.TestUnitStore#setTestUnits(org.eclipse.osee.coverage.model.CoverageUnit, java.util.Collection)}

+    * .

+    */

+   @Test

+   public void testSetTestUnits() throws OseeCoreException {

+      List<String> names = Arrays.asList("Now.java", "Is.java", "The.java", "Time.java");

+      TestUnitStore.setTestUnits(item, names);

+      Integer id = TestUnitStore.getNameId("Now.java", false);

+      Assert.assertNotNull(id);

+      Assert.assertEquals(2, id.intValue());

+   }

+

+   /**

+    * Test method for

+    * {@link org.eclipse.osee.coverage.store.TestUnitStore#getTestUnits(org.eclipse.osee.coverage.model.CoverageUnit)}.

+    * 

+    * @throws OseeCoreException

+    */

+   @Test

+   public void testGetTestUnits() throws OseeCoreException {

+      Collection<String> names = TestUnitStore.getTestUnitNames(item);

+      Assert.assertEquals(4, names.size());

+

+      TestUnitStore.setTestUnits(item2, Arrays.asList("Time.java", "The.java", "NewOne.java"));

+

+      // ensure that only unique name entries exist

+      Assert.assertEquals(6, TestUnitStore.getNameCount());

+

+      // Ensure that can retrieve items specific to coverageItem

+      names = TestUnitStore.getTestUnitNames(item);

+      Assert.assertEquals(4, names.size());

+      names = TestUnitStore.getTestUnitNames(item2);

+      Assert.assertEquals(3, names.size());

+

+   }

+

+   /**

+    * Test method for

+    * {@link org.eclipse.osee.coverage.store.TestUnitStore#removeTestUnitsFromDb(java.lang.String, java.util.List)}.

+    * 

+    * @throws OseeCoreException

+    */

+   @Test

+   public void testRemoveTestUnitsFromDb() throws OseeCoreException {

+      Assert.assertEquals(3, TestUnitStore.getTestUnitNames(item2).size());

+      TestUnitStore.removeTestUnits(item2, Arrays.asList("Time.java"));

+      Assert.assertEquals(2, TestUnitStore.getTestUnitNames(item2).size());

+      TestUnitStore.removeTestUnits(item2);

+      Assert.assertEquals(0, TestUnitStore.getTestUnitNames(item2).size());

+   }

+

+}

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchType.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchType.java
index bf69b0aa949..5d809b089c4 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchType.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchType.java
@@ -19,7 +19,6 @@ public enum MatchType {
 

    // Item has no match; __<reason>

    No_Match__Namespace,

-   No_Match__Name,

    No_Match__Class,

    No_Match__Name_Or_Order_Num;

 

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java
index dcf000faaaa..a383344b0dd 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java
@@ -19,6 +19,7 @@ import org.eclipse.osee.coverage.model.CoverageItem;
 import org.eclipse.osee.coverage.model.CoveragePackage;

 import org.eclipse.osee.coverage.model.CoveragePackageBase;

 import org.eclipse.osee.coverage.model.ICoverage;

+import org.eclipse.osee.coverage.util.CoverageUtil;

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

 

 /**

@@ -68,9 +69,9 @@ public class MergeManager {
          Map<ICoverage, MatchItem> importItemToMatchItem = new HashMap<ICoverage, MatchItem>(10);

          boolean moreImportChildrenThanPackageChildren = importItemChildren.size() > packageItemChildren.size();

          boolean morePackageChildrenThanImportChildren = packageItemChildren.size() > importItemChildren.size();

-         boolean sameNumberChilren = importItemChildren.size() == packageItemChildren.size();

+         boolean sameNumberChildren = importItemChildren.size() == packageItemChildren.size();

 

-         if (importCoverage.getGuid().equals("AAF9mnqbqltZqbmN7iwA")) {

+         if (importCoverage.getGuid().equals("AAte3i2bH3L1MvsFMqAA")) {

             System.out.println("here");

          }

          if (importCoverage.getName().equals("agp_threat_audio.2.ada")) {

@@ -90,13 +91,42 @@ public class MergeManager {
 

          // Case A - All match and package # children == import # children

          // Action: continue and check children's children

-         if (sameNumberChilren && MatchItem.isAllMatchType(MatchType.FullMatches, importItemToMatchItem.values())) {

+         if (sameNumberChildren && MatchItem.isAllMatchType(MatchType.FullMatches, importItemToMatchItem.values())) {

             // process all children

             for (ICoverage childCoverage : importItemChildren) {

                processImportCoverage(childCoverage);

             }

          }

-

+         // Same number children coverage items and either matches or just name is different, name change; 

+         // Remove all package stored data cause it's invalid now

+         else if (sameNumberChildren && CoverageUtil.isAllCoverageItems(importItemToMatchItem.keySet()) && MatchItem.isAllMatchType(

+               Arrays.asList(MatchType.Match__Name_And_Order_Num, MatchType.No_Match__Name_Or_Order_Num),

+               importItemToMatchItem.values())) {

+            boolean errorFound = false;

+            List<IMergeItem> groupMergeItems = new ArrayList<IMergeItem>();

+            for (Entry<ICoverage, MatchItem> pair : importItemToMatchItem.entrySet()) {

+               ICoverage importChild = pair.getKey();

+               if (pair.getValue().getMatchType() == MatchType.No_Match__Name_Or_Order_Num) {

+                  boolean found = false;

+                  // Find child that matches name

+                  for (ICoverage packageChild : packageItemChildren) {

+                     if (packageChild.getOrderNumber().equals(importChild.getOrderNumber())) {

+                        if (packageChild instanceof CoverageItem) {

+                           groupMergeItems.add(new MergeItem(MergeType.Rename_Coverage_Item, null, packageChild, false));

+                           found = true;

+                        }

+                     }

+                  }

+                  if (!found) {

+                     errorFound = true;

+                     mergeItems.add(new MergeItem(MergeType.Error__UnMergable, null, importCoverage, false));

+                  }

+               }

+            }

+            if (!errorFound && groupMergeItems.size() > 0) {

+               mergeItems.add(new MergeItemGroup(MergeType.Rename_Coverage_Item, groupMergeItems, true));

+            }

+         }

          // Deletion of package item; see if can handle

          else if (morePackageChildrenThanImportChildren) {

             // If all import match package items, but there are more package items, delete package items

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeType.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeType.java
index 6bebfe331da..41852fc4d0d 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeType.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeType.java
@@ -16,6 +16,8 @@ public enum MergeType {
    Add_With_Moves,

    // This will result in deleting this child and re-ordering

    Delete,

+   // This will result in changing name of package to match import, clearing rationale and setting coverage method 

+   Rename_Coverage_Item,

    // Group option that contains deletions and re-order items

    Delete_And_Reorder,

    // Just update package item's order with import item's order

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitStore.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitStore.java
index 5c76ef96145..3adba4df183 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitStore.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitStore.java
@@ -11,11 +11,10 @@ import java.util.HashMap;
 import java.util.List;

 import java.util.Map;

 import java.util.Map.Entry;

-import org.eclipse.osee.coverage.model.CoverageUnit;

+import org.eclipse.osee.coverage.model.CoverageItem;

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

 import org.eclipse.osee.framework.database.core.ConnectionHandler;

 import org.eclipse.osee.framework.database.core.IOseeStatement;

-import org.eclipse.osee.framework.jdk.core.util.Collections;

 

 /**

  * @author Donald G. Dunne

@@ -24,39 +23,57 @@ public class TestUnitStore {
 

    Map<Integer, String> testIdToNameMap = new HashMap<Integer, String>();

    public static String TEST_UNIT_QUERY =

-         "select name, cvgn.name_id from osee_cvg_testunit_names cvgn, osee_cvg_test_units cvgu where cvgn.name_id = cvgu.name_id and cvgu.item_guid = ?";

+         "select name, cvgn.name_id from osee_cvg_testunit_names cvgn, osee_cvg_testunits cvgu where cvgn.name_id = cvgu.name_id and cvgu.item_guid = ?";

    public static String TEST_UNIT_ID_QUERY = "select name, name_id from osee_cvg_testunit_names where name_id = ?";

-   public static String ITEM_TO_ID_QUERY = "select name_id from osee_cvg_test_units where cvgu.item_guid = ?";

-   public static String DELETE_TEST_UNIT_ID = "delete from osee_cvg_test_units where item_guid = ? and name_id in (?)";

-   public static String INSERT_TEST_UNIT_ID = "insert into osee_cvg_test_units set (name_id, guid) values (?,?)";

+   public static String ITEM_TO_ID_QUERY = "select name_id from osee_cvg_testunits where cvgu.item_guid = ?";

+   public static String DELETE_TEST_UNIT_ID = "delete from osee_cvg_testunits where item_guid = ? and name_id = ?";

+   public static String INSERT_TEST_UNIT_ID = "insert into osee_cvg_testunits (name_id, item_guid) values (?,?)";

+   public static String INSERT_TEST_UNIT_NAME = "insert into osee_cvg_testunit_names (name_id, name) values (?,?)";

+   public static String DELETE_ALL_TEST_NAMES = "delete from osee_cvg_testunit_names";

 

-   public static void setTestUnits(CoverageUnit coverageUnit, Collection<String> testUnitNames) throws OseeCoreException {

+   public static void setTestUnits(CoverageItem coverageItem, Collection<String> testUnitNames) throws OseeCoreException {

       List<Integer> toDelete = new ArrayList<Integer>();

       // Remove old values

-      for (Entry<Integer, String> entry : getTestUnits(coverageUnit).entrySet()) {

+      for (Entry<Integer, String> entry : getTestUnitMap(coverageItem).entrySet()) {

          if (!testUnitNames.contains(entry.getValue())) {

             toDelete.add(entry.getKey());

          }

       }

       if (toDelete.size() > 0) {

-         removeTestUnitsFromDb(coverageUnit.getGuid(), toDelete);

+         removeTestUnitsFromDb(coverageItem.getGuid(), toDelete);

       }

 

       // Add new values

-      Map<Integer, String> currentTestUnits = getTestUnits(coverageUnit);

+      Map<Integer, String> currentTestUnits = getTestUnitMap(coverageItem);

       for (String testUnitName : testUnitNames) {

          if (!currentTestUnits.values().contains(testUnitName)) {

-            addTestUnitToDb(coverageUnit.getGuid(), testUnitName);

+            addTestUnitToDb(coverageItem.getGuid(), testUnitName);

          }

       }

+   }

+

+   public static void removeTestUnits(CoverageItem coverageItem) throws OseeCoreException {

+      removeTestUnits(coverageItem, null);

+   }

 

+   public static void removeTestUnits(CoverageItem coverageItem, Collection<String> testUnitNames) throws OseeCoreException {

+      List<Integer> toDelete = new ArrayList<Integer>();

+      // Remove old values

+      for (Entry<Integer, String> entry : getTestUnitMap(coverageItem).entrySet()) {

+         if (testUnitNames == null || testUnitNames.contains(entry.getValue())) {

+            toDelete.add(entry.getKey());

+         }

+      }

+      if (toDelete.size() > 0) {

+         removeTestUnitsFromDb(coverageItem.getGuid(), toDelete);

+      }

    }

 

-   public static Map<Integer, String> getTestUnits(CoverageUnit coverageUnit) throws OseeCoreException {

+   public static Map<Integer, String> getTestUnitMap(CoverageItem coverageItem) throws OseeCoreException {

       IOseeStatement chStmt = ConnectionHandler.getStatement();

       Map<Integer, String> names = new HashMap<Integer, String>();

       try {

-         chStmt.runPreparedQuery(TEST_UNIT_QUERY, coverageUnit.getGuid());

+         chStmt.runPreparedQuery(TEST_UNIT_QUERY, coverageItem.getGuid());

          while (chStmt.next()) {

             names.put(chStmt.getInt("name_id"), chStmt.getString("name"));

          }

@@ -66,30 +83,82 @@ public class TestUnitStore {
       return names;

    }

 

-   public static Map<Integer, String> addTestUnitToDb(String guid, String name) throws OseeCoreException {

-      // TODO Check if in name table

-      // TODO Insert into name table

-      // TODO Insert into test unit table

+   public static Collection<String> getTestUnitNames(CoverageItem coverageItem) throws OseeCoreException {

+      return getTestUnitMap(coverageItem).values();

+   }

+

+   private static Map<Integer, String> addTestUnitToDb(String item_guid, String name) throws OseeCoreException {

+      int name_id = getNameId(name, true);

       IOseeStatement chStmt = ConnectionHandler.getStatement();

       Map<Integer, String> names = new HashMap<Integer, String>();

       try {

-         chStmt.runPreparedQuery(INSERT_TEST_UNIT_ID, guid, name);

-         while (chStmt.next()) {

-            names.put(chStmt.getInt("name_id"), chStmt.getString("name"));

-         }

+         chStmt.runCallableStatement(INSERT_TEST_UNIT_ID, name_id, item_guid);

       } finally {

          chStmt.close();

       }

       return names;

    }

 

-   public static void removeTestUnitsFromDb(String guid, List<Integer> toDelete) throws OseeCoreException {

+   private static int addTestUnitNameToDb(String name) throws OseeCoreException {

+      IOseeStatement chStmt = ConnectionHandler.getStatement();

+      int nextId = getNextNameId();

+      try {

+         chStmt.runCallableStatement(INSERT_TEST_UNIT_NAME, nextId, name);

+      } finally {

+         chStmt.close();

+      }

+      return nextId;

+   }

+

+   public static void clearTestUnitNames() throws OseeCoreException {

       IOseeStatement chStmt = ConnectionHandler.getStatement();

       try {

-         chStmt.runPreparedQuery(DELETE_TEST_UNIT_ID, guid, Collections.toString(",", toDelete));

+         chStmt.runCallableStatement(DELETE_ALL_TEST_NAMES);

       } finally {

          chStmt.close();

       }

    }

 

+   private static void removeTestUnitsFromDb(String item_guid, List<Integer> toDelete) throws OseeCoreException {

+      IOseeStatement chStmt = ConnectionHandler.getStatement();

+      try {

+         for (Integer nameId : toDelete) {

+            chStmt.runCallableStatement(DELETE_TEST_UNIT_ID, item_guid, nameId);

+         }

+      } finally {

+         chStmt.close();

+      }

+   }

+

+   private static int getNextNameId() throws OseeCoreException {

+      return getNameCount() + 1;

+   }

+

+   public static int getNameCount() throws OseeCoreException {

+      IOseeStatement chStmt = ConnectionHandler.getStatement();

+      try {

+         chStmt.runPreparedQuery("SELECT count(name) from osee_cvg_testunit_names");

+         chStmt.next();

+         return chStmt.getInt(1);

+      } finally {

+         chStmt.close();

+      }

+   }

+

+   public static Integer getNameId(String name, boolean add) throws OseeCoreException {

+      IOseeStatement chStmt = ConnectionHandler.getStatement();

+      try {

+         chStmt.runPreparedQuery("SELECT name_id from osee_cvg_testunit_names where name = ?", name);

+         if (chStmt.next()) {

+            return chStmt.getInt(1);

+         }

+         if (add) {

+            return addTestUnitNameToDb(name);

+         } else {

+            return null;

+         }

+      } finally {

+         chStmt.close();

+      }

+   }

 }

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java
index 2d100ecea1d..9fbc9143658 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java
@@ -216,4 +216,12 @@ public class CoverageUtil {
       return String.format("%d%% %d/%d", percent, complete, total);

    }

 

+   public static boolean isAllCoverageItems(Collection<ICoverage> coverages) {

+      for (ICoverage coverage : coverages) {

+         if (!(coverage instanceof CoverageItem)) {

+            return false;

+         }

+      }

+      return true;

+   }

 }

diff --git a/org.eclipse.osee.support.test/src/org/eclipse/osee/support/test/MasterTestSuite_TestDbTests.java b/org.eclipse.osee.support.test/src/org/eclipse/osee/support/test/MasterTestSuite_TestDbTests.java
index f0a92172a2f..efd6d85c83e 100644
--- a/org.eclipse.osee.support.test/src/org/eclipse/osee/support/test/MasterTestSuite_TestDbTests.java
+++ b/org.eclipse.osee.support.test/src/org/eclipse/osee/support/test/MasterTestSuite_TestDbTests.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.support.test;
 import static org.junit.Assert.assertTrue;

 import org.eclipse.osee.ats.test.AtsTest_TestDb_Suite;

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

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

 import org.eclipse.osee.framework.ui.skynet.test.FrameworkUi_TestDb_Suite;

 import org.eclipse.osee.support.test.util.TestUtil;

 import org.junit.AfterClass;

@@ -21,7 +22,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

 

 @RunWith(Suite.class)

-@Suite.SuiteClasses( {AtsTest_TestDb_Suite.class, FrameworkUi_TestDb_Suite.class})

+@Suite.SuiteClasses( {ArtifactQueryTestDemo.class, AtsTest_TestDb_Suite.class, FrameworkUi_TestDb_Suite.class})

 /**

  * This Test Suite is to run against a postgres database with ATS Developer as the DbInit.<br>

  * <br>