From 0f58e7454804f7437b66567891e5c3985213f0b3 Mon Sep 17 00:00:00 2001 From: jmisinco Date: Mon, 5 Nov 2012 10:22:06 -0700 Subject: refactor[ats_T9TNA]: Replace yes/no with true/false for BooleanAttributes Change-Id: I7ff641d708ec9160b0d75d1040c0d98b159bcfba --- .../osee/ats/core/client/util/AtsUtilCore.java | 2 +- .../validator/AtsXComboBooleanValidatorTest.java | 8 ++++---- .../core/validator/AtsXComboBooleanValidator.java | 4 ++-- .../osee/ats/navigate/AtsRemoteEventTestItem.java | 8 ++++---- .../support/OseeTypes_ATS.osee | 22 +++++++++++----------- .../osee/framework/skynet/core/UserManager.java | 4 ++-- .../skynet/core/attribute/BooleanAttribute.java | 8 ++++---- .../support/OseeTypes_Framework.osee | 16 ++++++++-------- .../ui/skynet/widgets/XComboBooleanDam.java | 6 +++--- .../widgets/util/FrameworkXWidgetProvider.java | 4 ++-- .../attribute/primitives/BooleanAttribute.java | 7 +++---- .../osee/orcs/db/intergration/LoaderTest.java | 8 ++++---- .../osee/orcs/api/OrcsAttributeSearchTest.java | 2 +- .../support/OseeTypes_OTE.osee | 6 +++--- 14 files changed, 52 insertions(+), 53 deletions(-) diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilCore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilCore.java index f846cb39352..f6a08042c87 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilCore.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilCore.java @@ -70,7 +70,7 @@ public class AtsUtilCore { * @param active state to validate against; Both will return all artifacts matching type * @param clazz type of artifacts to consider; null for all * @return set of Artifacts of type clazz that match the given active state of the "Active" or "ats.Active" attribute - * value. If no attribute exists, Active == true; If does exist then attribute value "yes" == true, "no" == false. + * value. If no attribute exists, Active == true; */ @SuppressWarnings("unchecked") public static List getActive(Collection artifacts, Active active, Class clazz) throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java index bedfc40c946..f6bb04b8b89 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java @@ -55,13 +55,13 @@ public class AtsXComboBooleanValidatorTest { result = validator.validateTransition(ValidatorTestUtil.emptyValueProvider, widgetDef, fromStateDef, toStateDef); Assert.assertEquals(WidgetStatus.Invalid_Incompleted, result.getStatus()); - // Check for "yes" value - MockValueProvider valueProvider = new MockValueProvider(Arrays.asList("yes")); + // Check for "true" value + MockValueProvider valueProvider = new MockValueProvider(Arrays.asList("true")); result = validator.validateTransition(valueProvider, widgetDef, fromStateDef, toStateDef); Assert.assertEquals(WidgetStatus.Valid, result.getStatus()); - // Check for "no" value - valueProvider = new MockValueProvider(Arrays.asList("no")); + // Check for "false" value + valueProvider = new MockValueProvider(Arrays.asList("false")); result = validator.validateTransition(valueProvider, widgetDef, fromStateDef, toStateDef); Assert.assertEquals(WidgetStatus.Valid, result.getStatus()); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidator.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidator.java index 8b61e159d7c..a1c9ef05168 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidator.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidator.java @@ -30,8 +30,8 @@ public class AtsXComboBooleanValidator extends AtsXWidgetValidator { return result; } for (String value : provider.getValues()) { - if (!"yes".equals(value) && !"no".equals(value)) { - return new WidgetResult(WidgetStatus.Invalid_Range, widgetDef, "[%s] value [%s] must be yes or no", + if (!"true".equals(value) && !"false".equals(value)) { + return new WidgetResult(WidgetStatus.Invalid_Range, widgetDef, "[%s] value [%s] must be true or false", provider.getName(), value); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java index 7002e8831b4..263488c99b3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java @@ -182,13 +182,13 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { private void makeChanges6(TeamWorkFlowArtifact teamArt) throws OseeCoreException { // Make changes and transition AtsVersionService.get().setTargetedVersionAndStore(teamArt, getVersion257()); - teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "no"); + teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "false"); teamArt.persist("Remote Event Test"); } private void makeChanges5(TeamWorkFlowArtifact teamArt) throws OseeCoreException { // Make changes and persist - teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "yes"); + teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "true"); teamArt.persist(getClass().getSimpleName()); } @@ -206,7 +206,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { private void makeChanges3(TeamWorkFlowArtifact teamArt) throws OseeCoreException { // Make changes and persist AtsVersionService.get().setTargetedVersionAndStore(teamArt, getVersion257()); - teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "no"); + teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "false"); teamArt.persist(getClass().getSimpleName()); } @@ -222,7 +222,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { teamArt.setSoleAttributeFromString(AtsAttributeTypes.Description, "description 2"); ChangeTypeUtil.setChangeType(teamArt, ChangeType.Problem); teamArt.setSoleAttributeFromString(AtsAttributeTypes.PriorityType, "2"); - teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "yes"); + teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "true"); AtsVersionService.get().setTargetedVersionAndStore(teamArt, getVersion256()); teamArt.persist("Remote Event Test"); } diff --git a/plugins/org.eclipse.osee.ats/support/OseeTypes_ATS.osee b/plugins/org.eclipse.osee.ats/support/OseeTypes_ATS.osee index 0991adc5d15..c78bbdf8b13 100644 --- a/plugins/org.eclipse.osee.ats/support/OseeTypes_ATS.osee +++ b/plugins/org.eclipse.osee.ats/support/OseeTypes_ATS.osee @@ -214,7 +214,7 @@ attributeType "ats.Validation Required" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "ats.Current State Type" extends StringAttribute { @@ -271,7 +271,7 @@ attributeType "ats.Active" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 1 max 1 - defaultValue "yes" + defaultValue "true" } attributeType "ats.Uses Resolution Options" extends BooleanAttribute { @@ -280,7 +280,7 @@ attributeType "ats.Uses Resolution Options" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "ats.Released" extends BooleanAttribute { @@ -289,7 +289,7 @@ attributeType "ats.Released" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "ats.Version Locked" extends BooleanAttribute { @@ -298,7 +298,7 @@ attributeType "ats.Version Locked" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "ats.Next Version" extends BooleanAttribute { @@ -307,7 +307,7 @@ attributeType "ats.Next Version" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "ats.Team Uses Versions" extends BooleanAttribute { @@ -316,7 +316,7 @@ attributeType "ats.Team Uses Versions" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "ats.Require Targeted Version" extends BooleanAttribute { @@ -325,7 +325,7 @@ attributeType "ats.Require Targeted Version" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "ats.Actionable" extends BooleanAttribute { @@ -334,7 +334,7 @@ attributeType "ats.Actionable" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "yes" + defaultValue "true" } attributeType "ats.Allow Create Branch" extends BooleanAttribute { @@ -343,7 +343,7 @@ attributeType "ats.Allow Create Branch" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "yes" + defaultValue "true" } attributeType "ats.Allow Commit Branch" extends BooleanAttribute { @@ -352,7 +352,7 @@ attributeType "ats.Allow Commit Branch" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "yes" + defaultValue "true" } attributeType "ats.Need By" extends DateAttribute { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java index 3202b872d3d..1ca7dfbc7a1 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core; -import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.core.enums.DeletionFlag.*; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -294,7 +294,7 @@ public final class UserManager { private static void addUserToUserGroups(Artifact user) throws OseeCoreException { Collection userGroups = ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.UserGroup, - CoreAttributeTypes.DefaultGroup, "yes", CoreBranches.COMMON); + CoreAttributeTypes.DefaultGroup, "true", CoreBranches.COMMON); for (Artifact userGroup : userGroups) { userGroup.addRelation(CoreRelationTypes.Users_User, user); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BooleanAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BooleanAttribute.java index 4af04cd3637..2ec3d1be202 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BooleanAttribute.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BooleanAttribute.java @@ -16,20 +16,20 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; * @author Ryan D. Brooks */ public class BooleanAttribute extends CharacterBackedAttribute { - public static final String[] booleanChoices = new String[] {"yes", "no"}; + public static final String[] booleanChoices = {"true", "false"}; @Override public Boolean getValue() throws OseeCoreException { - return getAttributeDataProvider().getValueAsString().equals(booleanChoices[0]); + return Boolean.valueOf(getAttributeDataProvider().getValueAsString()); } @Override public boolean subClassSetValue(Boolean value) throws OseeCoreException { - return getAttributeDataProvider().setValue(value ? booleanChoices[0] : booleanChoices[1]); + return getAttributeDataProvider().setValue(String.valueOf(value)); } @Override protected Boolean convertStringToValue(String value) { - return value != null && value.equalsIgnoreCase(booleanChoices[0]); + return Boolean.parseBoolean(value); } } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee b/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee index e8b06778805..8b4ede6b248 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee +++ b/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee @@ -93,7 +93,7 @@ attributeType "Active" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 1 max 1 - defaultValue "yes" + defaultValue "true" } attributeType "Company" extends StringAttribute { @@ -301,7 +301,7 @@ attributeType "Default Group" extends BooleanAttribute { max 1 taggerId DefaultAttributeTaggerProvider description "Specifies whether to automatically add new users into this group" - defaultValue "no" + defaultValue "false" } artifactType "User Group" extends "Abstract Access Controlled" , "Group Artifact" { @@ -816,7 +816,7 @@ attributeType "Common NAL Requirement" extends BooleanAttribute { max 1 description "Requirement that is common to all NCORE (Networked Common Operating Real-time Environment) Application Layers" - defaultValue "no" + defaultValue "false" } attributeType "Crew Interface Requirement" extends BooleanAttribute { @@ -825,7 +825,7 @@ attributeType "Crew Interface Requirement" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "Legacy Id" extends StringAttribute { @@ -852,7 +852,7 @@ attributeType "System Security Requirement" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } attributeType "Training Effectivity" extends BooleanAttribute { @@ -861,7 +861,7 @@ attributeType "Training Effectivity" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 0 max 1 - defaultValue "no" + defaultValue "false" } oseeEnumType "enum.req.partition" { @@ -1129,7 +1129,7 @@ attributeType "Technical Performance Parameter" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 1 max 1 - defaultValue "no" + defaultValue "false" } oseeEnumType "enum.req.verification.event" { @@ -1527,7 +1527,7 @@ attributeType "Developmental" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 1 max 1 - defaultValue "yes" + defaultValue "true" } attributeType "Hazard" extends StringAttribute { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java index 9cfe42c03b7..738d802a106 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java @@ -53,7 +53,7 @@ public class XComboBooleanDam extends XCombo implements IAttributeWidget { if (result == null) { super.set(""); } else { - super.set(result ? "yes" : "no"); + super.set(result ? "true" : "false"); } } @@ -64,7 +64,7 @@ public class XComboBooleanDam extends XCombo implements IAttributeWidget { artifact.deleteSoleAttribute(attributeType); } else { String enteredValue = get(); - artifact.setSoleAttributeValue(attributeType, (enteredValue != null && enteredValue.equals("yes"))); + artifact.setSoleAttributeValue(attributeType, (enteredValue != null && enteredValue.equals("true"))); } } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); @@ -77,7 +77,7 @@ public class XComboBooleanDam extends XCombo implements IAttributeWidget { try { String enteredValue = get(); boolean storedValueBoolean = artifact.getSoleAttributeValue(attributeType); - String storedValue = storedValueBoolean ? "yes" : "no"; + String storedValue = storedValueBoolean ? "true" : "false"; if (!enteredValue.equals(storedValue)) { return new Result(true, attributeType + " is dirty"); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java index 254a4981406..9c9e96f8266 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java @@ -255,9 +255,9 @@ public final class FrameworkXWidgetProvider { if (Strings.isValid(xWidgetLayoutData.getDefaultValue())) { String value = xWidgetLayoutData.getDefaultValue(); if ("true".equals(value) || "yes".equals(value)) { - combo.set("yes"); + combo.set("true"); } else if ("false".equals(value) || "no".equals(value)) { - combo.set("no"); + combo.set("false"); } else { combo.set(""); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/primitives/BooleanAttribute.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/primitives/BooleanAttribute.java index f4fe07e553e..9b52e2554fb 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/primitives/BooleanAttribute.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/primitives/BooleanAttribute.java @@ -19,20 +19,19 @@ import org.eclipse.osee.orcs.core.internal.attribute.CharacterBackedAttribute; */ @OseeAttribute("BooleanAttribute") public class BooleanAttribute extends CharacterBackedAttribute { - public static final String[] booleanChoices = new String[] {"yes", "no"}; @Override public Boolean getValue() throws OseeCoreException { - return getDataProxy().getValueAsString().equals(booleanChoices[0]); + return Boolean.valueOf(getDataProxy().getValueAsString()); } @Override public boolean subClassSetValue(Boolean value) throws OseeCoreException { - return getDataProxy().setValue(value ? booleanChoices[0] : booleanChoices[1]); + return getDataProxy().setValue(String.valueOf(value)); } @Override protected Boolean convertStringToValue(String value) { - return value != null && value.equalsIgnoreCase(booleanChoices[0]); + return Boolean.valueOf(value); } } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java index fb6f262c3b2..a4755f33ba8 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java @@ -112,11 +112,11 @@ public class LoaderTest { //@formatter:off verifyData(attrs.next(), 12, 6, ModificationType.NEW, Name.getGuid(), 2, 5, -1, 21L, "org.eclipse.osee.coverage.OseeTypes_Coverage", ""); verifyData(attrs.next(), 13, 6, ModificationType.NEW, UriGeneralStringData.getGuid(), 2, 5, -1, 24L, "", "attr://24/AEmKsTkcwh02JspUtYQA.zip"); - verifyData(attrs.next(), 14, 6, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 23L, "yes", ""); + verifyData(attrs.next(), 14, 6, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 23L, "true", ""); verifyData(attrs.next(), 15, 7, ModificationType.NEW, Name.getGuid(), 2, 5, -1, 10L, "org.eclipse.osee.ats.config.demo.OseeTypes_Demo", ""); verifyData(attrs.next(), 16, 7, ModificationType.NEW, UriGeneralStringData.getGuid(), 2, 5, -1, 11L, "", "attr://11/AEmKsWXLBwVrvjcQvPwA.zip"); - verifyData(attrs.next(), 17, 7, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 12L, "yes", ""); + verifyData(attrs.next(), 17, 7, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 12L, "true", ""); verifyData(attrs.next(), 20, 8, ModificationType.NEW, Name.getGuid(), 2, 6, -1, 48L, "User Groups", ""); //@formatter:on @@ -212,8 +212,8 @@ public class LoaderTest { Iterator attrs = attributeCaptor.getAllValues().iterator(); //@formatter:off - verifyData(attrs.next(), 14, 6, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 23L, "yes", ""); - verifyData(attrs.next(), 17, 7, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 12L, "yes", ""); + verifyData(attrs.next(), 14, 6, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 23L, "true", ""); + verifyData(attrs.next(), 17, 7, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 12L, "true", ""); //@formatter:on sort(relationCaptor.getAllValues()); diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java index 8475da692d9..6d911be16a6 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java @@ -107,7 +107,7 @@ public class OrcsAttributeSearchTest { @Test public void testBooleanAttributeSearch() throws OseeCoreException { QueryBuilder builder = - queryFactory.fromBranch(CoreBranches.COMMON).and(CoreAttributeTypes.DefaultGroup, Operator.EQUAL, "yes"); + queryFactory.fromBranch(CoreBranches.COMMON).and(CoreAttributeTypes.DefaultGroup, Operator.EQUAL, "true"); ResultSet resultSet = builder.getResults(); List moreArts = resultSet.getList(); diff --git a/plugins/org.eclipse.osee.ote.define/support/OseeTypes_OTE.osee b/plugins/org.eclipse.osee.ote.define/support/OseeTypes_OTE.osee index e715eefede1..6afeb7cd4e6 100644 --- a/plugins/org.eclipse.osee.ote.define/support/OseeTypes_OTE.osee +++ b/plugins/org.eclipse.osee.ote.define/support/OseeTypes_OTE.osee @@ -215,7 +215,7 @@ attributeType "Script Aborted" extends BooleanAttribute { min 1 max 1 taggerId DefaultAttributeTaggerProvider description "Test Abort status" - defaultValue "yes" + defaultValue "true" } attributeType "Test Script GUID" extends StringAttribute { @@ -232,7 +232,7 @@ attributeType "Ran In Batch Mode" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 1 max 1 description "Run was performed as part of a batch" - defaultValue "no" + defaultValue "false" } attributeType "Is Batch Mode Allowed" extends BooleanAttribute { @@ -241,7 +241,7 @@ attributeType "Is Batch Mode Allowed" extends BooleanAttribute { dataProvider DefaultAttributeDataProvider min 1 max 1 description "Whether Test Script is allowed to run as part of a batch" - defaultValue "yes" + defaultValue "true" } attributeType "Last Date Uploaded" extends DateAttribute { -- cgit v1.2.3