feature: Convert ATS to XText for Work Definitions and Config

2 files changed, 28 insertions, 31 deletions

diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoUsers.java b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoUsers.java
index 56ae700aa99..89cc430ceaa 100644
--- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoUsers.java
+++ b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoUsers.java
@@ -27,57 +27,40 @@ import org.eclipse.osee.framework.core.data.IOseeUserInfo;
  * @author Donald G. Dunne
  */
 public enum DemoUsers implements IOseeUserInfo {
-   Joe_Smith("Joe Smith", "Joe Smith", "Joe Smith", true),
-   Kay_Jones("Kay Jones", "Kay Jones", "Kay Jones", true),
-   Jason_Michael("Jason Michael", "Jason Michael", "Jason Michael", true),
-   Alex_Kay("Alex Kay", "Alex Kay", "Alex Kay", true),
-   Inactive_Steve("Inactive Steve", "Inactive Steve", "Inactive Steve", false);
+   Joe_Smith("Joe Smith"),
+   Kay_Jones("Kay Jones"),
+   Jason_Michael("Jason Michael"),
+   Alex_Kay("Alex Kay"),
+   Inactive_Steve("Inactive Steve");
    private final String name;
-   private final String email;
-   private final String userID;
-   private final boolean active;
 
-   DemoUsers(String name, String email, String userId, boolean active) {
+   DemoUsers(String name) {
       this.name = name;
-      this.email = email;
-      this.userID = userId;
-      this.active = active;
    }
 
-   /**
-    * @return Returns the email.
-    */
    @Override
-   public String getEmail() {
-      return email;
+   public String getName() {
+      return name;
    }
 
-   /**
-    * @return Returns the name.
-    */
    @Override
-   public String getName() {
+   public String getUserID() {
       return name;
    }
 
-   /**
-    * @return Returns the userID.
-    */
    @Override
-   public String getUserID() {
-      return userID;
+   public String getEmail() {
+      return name;
    }
 
-   /**
-    * @return Returns the active.
-    */
    @Override
    public boolean isActive() {
-      return active;
+      return name.contains("Inactive");
    }
 
    @Override
    public boolean isCreationRequired() {
       return false;
    }
+
 }
diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java
index 5043776d206..5afdc0ce960 100644
--- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java
+++ b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java
@@ -30,7 +30,21 @@ public class TestUtil {
    private static final String DEMO_DB_TYPE = "demo";
    public static final Collection<String> ignoreLogging = Arrays.asList("No image was defined for art type",
       "Unable to load the image for [SAVED]");
-   public static boolean isInTest = false;
+   private static boolean inTest = false;
+
+   /**
+    * Need to match methods in OseeProperties
+    */
+   public static boolean isInTest() {
+      return inTest;
+   }
+
+   /**
+    * Need to match methods in OseeProperties
+    */
+   public static void setIsInTest(boolean isInTest) {
+      inTest = isInTest;
+   }
 
    public static boolean isProductionDb() throws OseeCoreException {
       return ClientSessionManager.isProductionDataStore();