diff options
Diffstat (limited to 'src/test/java/io/swagger/api/impl')
3 files changed, 13 insertions, 5 deletions
diff --git a/src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java b/src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java index bd13abe..5630c40 100644 --- a/src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java +++ b/src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java @@ -3,14 +3,14 @@ package io.swagger.api.impl;/*- * dcae-inventory * ================================================================================ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2020 Nokia Intellectual Property. All rights reserved. + * Copyright (C) 2020 Nokia. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -42,6 +42,7 @@ import org.onap.dcae.inventory.daos.InventoryDAOManager; import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; import org.onap.dcae.inventory.dbthings.models.DCAEServiceTypeObject; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.slf4j.Logger; @@ -55,6 +56,7 @@ import io.swagger.model.DCAEServiceTypeRequest; * Created by mhwang on 10/27/16. */ @PrepareForTest({InventoryDAOManager.class}) +@PowerMockIgnore("jdk.internal.reflect.*") @RunWith(PowerMockRunner.class) public class DcaeServiceTypesApiServiceImplTests { diff --git a/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplH2Tests.java b/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplH2Tests.java index 32cc664..a431687 100644 --- a/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplH2Tests.java +++ b/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplH2Tests.java @@ -3,6 +3,7 @@ * dcae-inventory * ================================================================================ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2020 Nokia. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,6 +41,7 @@ import org.onap.dcae.inventory.daos.DCAEServicesDAO; import org.onap.dcae.inventory.daos.InventoryDAOManager; import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.skife.jdbi.v2.DBI; @@ -64,6 +66,7 @@ import io.swagger.model.DCAEServiceRequest; * test here was not included in the original class because of conflicting setup operations. */ @PrepareForTest({InventoryDAOManager.class}) +@PowerMockIgnore("jdk.internal.reflect.*") @RunWith(PowerMockRunner.class) public class DcaeServicesApiServiceImplH2Tests { diff --git a/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplTests.java b/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplTests.java index 9599ca5..9c8d688 100644 --- a/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplTests.java +++ b/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplTests.java @@ -3,6 +3,7 @@ package io.swagger.api.impl;/*- * dcae-inventory * ================================================================================ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2020 Nokia. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,6 +44,7 @@ import org.onap.dcae.inventory.daos.InventoryDAOManager; import org.onap.dcae.inventory.dbthings.models.DCAEServiceComponentObject; import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.slf4j.Logger; @@ -57,6 +59,7 @@ import io.swagger.model.DCAEServiceRequest; * Created by mhwang on 9/25/17. */ @PrepareForTest({InventoryDAOManager.class}) +@PowerMockIgnore("jdk.internal.reflect.*") @RunWith(PowerMockRunner.class) public class DcaeServicesApiServiceImplTests { @@ -88,7 +91,7 @@ public class DcaeServicesApiServiceImplTests { // This block is a trick to make a private method accessible for testing try { - createDCAEService = DcaeServicesApiServiceImpl.class.getDeclaredMethod("createDCAEService", + createDCAEService = DcaeServicesApiServiceImpl.class.getDeclaredMethod("createDCAEService", DCAEServiceObject.class, Collection.class, UriInfo.class); createDCAEService.setAccessible(true); } catch (NoSuchMethodException e) { @@ -137,7 +140,7 @@ public class DcaeServicesApiServiceImplTests { } /* - Commented this unit test because could not get past Nullpointer in the line trying to mock the explicit "bind" + Commented this unit test because could not get past Nullpointer in the line trying to mock the explicit "bind" function call. Mockito does not handle mocking overloaded functions well so it goes into the actual method where an member variable called foreman is null. @Test |