feature[ats_8G0FW]: Remove HRIDs as an ID

Change-Id: I9cfa206f250840760f9a13691e2a48b34321eed2

2 files changed, 11 insertions, 11 deletions

diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/config/TeamDefinitionTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/config/TeamDefinitionTest.java
index 1bc36d862b6..c25247a040f 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/config/TeamDefinitionTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/config/TeamDefinitionTest.java
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.core.client.internal.config;
 
-import org.junit.Assert;
 import org.eclipse.osee.ats.api.version.IAtsVersionService;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -36,15 +36,15 @@ public class TeamDefinitionTest {
 
    @Test
    public void testGetTeamDefinitionHoldingVersions() throws OseeCoreException {
-      TeamDefinition teamDef1 = new TeamDefinition("Team Def 1", "td1guid", "ADSF");
+      TeamDefinition teamDef1 = new TeamDefinition("Team Def 1", "td1guid");
 
-      TeamDefinition teamDef1_child1 = new TeamDefinition("Team Def 1_1", "td1_1guid", "ADSF");
+      TeamDefinition teamDef1_child1 = new TeamDefinition("Team Def 1_1", "td1_1guid");
       teamDef1_child1.setParentTeamDef(teamDef1);
 
       Assert.assertNull(teamDef1.getTeamDefinitionHoldingVersions());
       Assert.assertNull(teamDef1_child1.getTeamDefinitionHoldingVersions());
 
-      teamDef1.getVersions().add(new Version(versionService, "ver1", "ver1guid", "ASDF"));
+      teamDef1.getVersions().add(new Version(versionService, "ver1", "ver1guid"));
 
       Assert.assertEquals(teamDef1, teamDef1.getTeamDefinitionHoldingVersions());
       Assert.assertEquals(teamDef1, teamDef1_child1.getTeamDefinitionHoldingVersions());
@@ -52,15 +52,15 @@ public class TeamDefinitionTest {
 
    @Test
    public void testIsTeamUsesVersions() throws OseeCoreException {
-      TeamDefinition teamDef1 = new TeamDefinition("Team Def 1", "td1guid", "ADSF");
+      TeamDefinition teamDef1 = new TeamDefinition("Team Def 1", "td1guid");
 
-      TeamDefinition teamDef1_child1 = new TeamDefinition("Team Def 1_1", "td1_1guid", "ADSF");
+      TeamDefinition teamDef1_child1 = new TeamDefinition("Team Def 1_1", "td1_1guid");
       teamDef1_child1.setParentTeamDef(teamDef1);
 
       Assert.assertFalse(teamDef1.isTeamUsesVersions());
       Assert.assertFalse(teamDef1_child1.isTeamUsesVersions());
 
-      teamDef1.getVersions().add(new Version(versionService, "ver1", "ver1guid", "ASDF"));
+      teamDef1.getVersions().add(new Version(versionService, "ver1", "ver1guid"));
 
       Assert.assertTrue(teamDef1.isTeamUsesVersions());
       Assert.assertTrue(teamDef1_child1.isTeamUsesVersions());
diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionCacheTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionCacheTest.java
index 62055febe3b..214d288b35f 100644
--- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionCacheTest.java
+++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionCacheTest.java
@@ -45,9 +45,9 @@ public class AtsVersionCacheTest {
       MockitoAnnotations.initMocks(this);
 
       when(teamWf.getGuid()).thenReturn("abcdefghijkl");
-      when(teamWf.getHumanReadableId()).thenReturn("ZAQWS");
+      when(teamWf.getAtsId()).thenReturn("ZAQWS");
       when(atsVersion.getName()).thenReturn("Test Version");
-      when(atsVersion.getHumanReadableId()).thenReturn("WSXZA");
+      when(atsVersion.getGuid()).thenReturn("adsf");
 
       AtsArtifactConfigCache cache = new AtsArtifactConfigCache();
       cache.cacheByTag(teamWf.getGuid(), atsVersion);
@@ -65,8 +65,8 @@ public class AtsVersionCacheTest {
    @Test
    public void testCache() throws Exception {
       IAtsVersion testVersion = atsVersionCache.cache(teamWf, atsVersionCache.getVersion(teamWf));
-      String hrid = testVersion.getHumanReadableId();
-      assertEquals("WSXZA", hrid);
+      String guid = testVersion.getGuid();
+      assertEquals("adsf", guid);
    }
 
    @Test