From b862255dd62b47f75ead38ae0ac52a17a08e51fb Mon Sep 17 00:00:00 2001 From: Michael Hwang Date: Tue, 19 Sep 2017 17:28:07 -0400 Subject: Get unit tests working Including fixing of broken test Change-Id: Ie5fa6a2c4bd59b7552480899616590c7944e5aa4 Issue-Id: DCAEGEN2-60 Signed-off-by: Michael Hwang --- src/test/java/DcaeServiceTypesApiServiceImplTests.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/DcaeServiceTypesApiServiceImplTests.java b/src/test/java/DcaeServiceTypesApiServiceImplTests.java index ce0011b..c4ada1f 100644 --- a/src/test/java/DcaeServiceTypesApiServiceImplTests.java +++ b/src/test/java/DcaeServiceTypesApiServiceImplTests.java @@ -47,6 +47,7 @@ import org.slf4j.LoggerFactory; import java.util.Arrays; import java.util.Objects; +import java.util.UUID; /** @@ -204,10 +205,12 @@ public class DcaeServiceTypesApiServiceImplTests { minimalFixture.setOwner("tester"); minimalFixture.setBlueprintTemplate("{ blueprint template goes here }"); - String expectedTypeId = String.format("%s:%s", minimalFixture.getTypeName(), minimalFixture.getTypeVersion()); + UUID expectedTypeIdUUID = UUID.randomUUID(); - when(mockTypesDAO.getByTypeId(expectedTypeId)).thenReturn(new DCAEServiceTypeObject()); - when(mockServicesDAO.countByType(DCAEServiceObject.DCAEServiceStatus.RUNNING, expectedTypeId)).thenReturn(10); + DCAEServiceTypeObject fakeExistingType = new DCAEServiceTypeObject(); + fakeExistingType.setTypeId(expectedTypeIdUUID.toString()); + when(mockTypesDAO.getByRequestFromNotASDC(minimalFixture)).thenReturn(fakeExistingType); + when(mockServicesDAO.countByType(DCAEServiceObject.DCAEServiceStatus.RUNNING, fakeExistingType.getTypeId())).thenReturn(10); try { Response response = api.dcaeServiceTypesTypeIdPost(minimalFixture, uriInfo, null); -- cgit 1.2.3-korg