diff options
author | Ryan D. Brooks | 2016-10-20 23:10:58 +0000 |
---|---|---|
committer | donald.g.dunne | 2016-10-20 23:10:58 +0000 |
commit | 38437532280db829e658d7814693659cecb7fb56 (patch) | |
tree | 44487fa09c3b904b219614ac532d739fa4051381 /plugins/org.eclipse.osee.ats.core.test | |
parent | b71eeab7ade5d94fb6eb44326e5e4c6c6e5c06ee (diff) | |
download | org.eclipse.osee-38437532280db829e658d7814693659cecb7fb56.tar.gz org.eclipse.osee-38437532280db829e658d7814693659cecb7fb56.tar.xz org.eclipse.osee-38437532280db829e658d7814693659cecb7fb56.zip |
refactor: Remove more IArtifact usage
Change-Id: I4ccd2a5d29aa4b9ae43be03353fc6a0928a53f99
Diffstat (limited to 'plugins/org.eclipse.osee.ats.core.test')
2 files changed, 70 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java index a914c58ce2b..4022f713e67 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java @@ -41,15 +41,15 @@ public class AtsCoreServiceImplTest { @Test public void testGetAtsId() { - ArtifactToken artifact = ArtifactToken.valueOf(0, "guid", null, COMMON, null); + ArtifactToken artifact = ArtifactToken.valueOf(0, null, COMMON); when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn(null); String result = AtsCoreServiceImpl.getAtsId(attrResolver, artifact); - assertEquals(result, "guid"); + assertEquals(result, artifact.getGuid()); when(attrResolver.getSoleAttributeValue(atsObject, AtsAttributeTypes.AtsId, null)).thenReturn(null); when(atsObject.getStoreObject()).thenReturn(artifact); result = AtsCoreServiceImpl.getAtsId(attrResolver, atsObject); - assertEquals(result, "guid"); + assertEquals(result, artifact.getGuid()); when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn("ATS23"); result = AtsCoreServiceImpl.getAtsId(attrResolver, artifact); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java.orig b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java.orig new file mode 100644 index 00000000000..b7ffdc74628 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java.orig @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 2015 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.core.util; + +import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.when; +import org.eclipse.osee.ats.api.IAtsObject; +import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.workdef.IAttributeResolver; +import org.eclipse.osee.framework.core.data.ArtifactToken; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +/** + * Test Case for {@link AtsCoreServiceImpl} + * + * @author Donald G. Dunne + */ +public class AtsCoreServiceImplTest { + + // @formatter:off + @Mock private IAtsObject atsObject; + @Mock private IAttributeResolver attrResolver; + // @formatter:on + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + @Test + public void testGetAtsId() { +<<<<<<< HEAD + ArtifactToken artifact = ArtifactToken.valueOf(0, "guid", null, COMMON, null); +||||||| parent of be5246f... refactor: Remove more IArtifact usage + ArtifactToken artifact = ArtifactToken.valueOf(0, "guid", null, null, null); +======= + ArtifactToken artifact = ArtifactToken.valueOf(0, null, null); +>>>>>>> be5246f... refactor: Remove more IArtifact usage + when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn(null); + String result = AtsCoreServiceImpl.getAtsId(attrResolver, artifact); + assertEquals(result, artifact.getGuid()); + + when(attrResolver.getSoleAttributeValue(atsObject, AtsAttributeTypes.AtsId, null)).thenReturn(null); + when(atsObject.getStoreObject()).thenReturn(artifact); + result = AtsCoreServiceImpl.getAtsId(attrResolver, atsObject); + assertEquals(result, artifact.getGuid()); + + when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn("ATS23"); + result = AtsCoreServiceImpl.getAtsId(attrResolver, artifact); + assertEquals(result, "ATS23"); + + when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn("ATS23"); + assertEquals(result, "ATS23"); + } +}
\ No newline at end of file |