feature: Coverage - Search Coverage Method hyperlink doesn't have Test_Unit in selection

4 files changed, 25 insertions, 6 deletions

diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerTest.java
index 1e7f0325320..ed4fa6b37a0 100644
--- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerTest.java
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerTest.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.coverage.test.model;
 
 import org.eclipse.osee.coverage.model.CoverageOption;
 import org.eclipse.osee.coverage.model.CoverageOptionManager;
+import org.eclipse.osee.coverage.model.CoverageOptionManager.EnabledOption;
 import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.junit.Assert;
@@ -29,7 +30,8 @@ public class CoverageOptionManagerTest {
       manager.add(new CoverageOption("New_One", "This is the description", false));
 
       Assert.assertEquals(2, manager.get().size());
-      Assert.assertEquals(1, manager.getEnabled().size());
+      Assert.assertEquals(1, manager.getEnabled(EnabledOption.Write).size());
+      Assert.assertEquals(2, manager.getEnabled(EnabledOption.Read).size());
       try {
          manager.add(new CoverageOption("New_One", "Another descr", true));
          Assert.fail("This should not be allowed");
@@ -41,7 +43,8 @@ public class CoverageOptionManagerTest {
       CoverageOptionManager newManager = new CoverageOptionManager(xml);
 
       Assert.assertEquals(2, newManager.get().size());
-      Assert.assertEquals(1, newManager.getEnabled().size());
+      Assert.assertEquals(1, manager.getEnabled(EnabledOption.Write).size());
+      Assert.assertEquals(2, manager.getEnabled(EnabledOption.Read).size());
       try {
          manager.add(new CoverageOption("New_One", "Another descr", true));
          Assert.fail("This should not be allowed");
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageMethodAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageMethodAction.java
index 951335cb8b8..e95ba06ac56 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageMethodAction.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageMethodAction.java
@@ -18,6 +18,7 @@ import org.eclipse.osee.coverage.editor.xcover.CoverageXViewer;
 import org.eclipse.osee.coverage.internal.Activator;
 import org.eclipse.osee.coverage.model.CoverageItem;
 import org.eclipse.osee.coverage.model.CoverageOption;
+import org.eclipse.osee.coverage.model.CoverageOptionManager.EnabledOption;
 import org.eclipse.osee.coverage.model.ICoverage;
 import org.eclipse.osee.coverage.util.ISaveable;
 import org.eclipse.osee.coverage.util.dialog.CoverageMethodListDialog;
@@ -78,7 +79,7 @@ public class EditCoverageMethodAction extends Action {
       }
 
       CoverageMethodListDialog dialog =
-         new CoverageMethodListDialog(coverageXViewer.getCoverageOptionManager().getEnabled());
+         new CoverageMethodListDialog(coverageXViewer.getCoverageOptionManager().getEnabled(EnabledOption.Write));
       if (dialog.open() == 0) {
          Set<ICoverage> coveragesToSave = new HashSet<ICoverage>();
          for (ICoverage coverageItem : selectedCoverageEditorItem.getSelectedCoverageEditorItems()) {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java
index 22de4301d40..f4662ea93e6 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java
@@ -37,6 +37,10 @@ public class CoverageOptionManager {
    public static CoverageOption Exception_Handling = new CoverageOption("Exception_Handling");
    public static CoverageOption Test_Unit = new CoverageOption("Test_Unit");
    public static CoverageOption Not_Covered = new CoverageOption("Not_Covered");
+   public static enum EnabledOption {
+      Write,
+      Read
+   }
 
    public CoverageOptionManager(List<CoverageOption> options) {
       this.options = options;
@@ -50,10 +54,19 @@ public class CoverageOptionManager {
       fromXml(xml);
    }
 
-   public Collection<CoverageOption> getEnabled() {
+   /**
+    * Return valid options. If Read, all values returned. This handles the search use case where wouldn't want to set
+    * values, but would want to search them. If Write, only enabled values are returned.
+    * 
+    * @param enabledOption
+    * @return
+    */
+   public Collection<CoverageOption> getEnabled(EnabledOption enabledOption) {
       List<CoverageOption> enabled = new ArrayList<CoverageOption>();
       for (CoverageOption option : options) {
-         if (option.isEnabled()) {
+         if (enabledOption == EnabledOption.Read) {
+            enabled.add(option);
+         } else if (enabledOption == EnabledOption.Write && option.isEnabled()) {
             enabled.add(option);
          }
       }
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java
index 1d0af83aa14..4a4d77b62db 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java
@@ -14,6 +14,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import org.eclipse.osee.coverage.model.CoverageOption;
 import org.eclipse.osee.coverage.model.CoverageOptionManager;
+import org.eclipse.osee.coverage.model.CoverageOptionManager.EnabledOption;
 import org.eclipse.osee.coverage.util.dialog.CoverageMethodListDialog;
 import org.eclipse.osee.framework.jdk.core.util.Collections;
 import org.eclipse.osee.framework.logging.OseeLevel;
@@ -65,7 +66,8 @@ public class XHyperlabelCoverageMethodSelection extends XHyperlinkLabelCmdValueS
    @Override
    public boolean handleSelection() {
       try {
-         dialog = new CoverageMethodListDialog(coverageOptionManager.getEnabled(), selectedCoverageMethods);
+         dialog =
+            new CoverageMethodListDialog(coverageOptionManager.getEnabled(EnabledOption.Read), selectedCoverageMethods);
          int result = dialog.open();
          if (result == 0) {
             selectedCoverageMethods.clear();