From 3c9f4df71b978e92a6eeb6f22bc7535e749d11c2 Mon Sep 17 00:00:00 2001
From: siddharth0905 <siddharth.singh4@amdocs.com>
Date: Thu, 1 Feb 2018 12:14:27 +0530
Subject: [PATCH] Fix for Feature Toggle rest module

With this change we will be able to Mock enum as well

Change-Id: I61321c54ae458a93398eacb1a43ae22ce755e793
Issue-ID: SDC-988
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
---
 .../togglz-rest/togglz-rest-services/pom.xml                          | 4 ++--
 .../src/test/java/org/openecomp/TogglzFeatureRestTest.java            | 2 +-
 .../test/resources/mockito-extensions/org.mockito.plugins.MockMaker   | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml
index baad898ff1..21f5223c03 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml
@@ -58,9 +58,9 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
-            <version>${mockito.all.version}</version>
+            <version>${mockito.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java
index b8f3286823..8170048acd 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java
@@ -27,7 +27,7 @@ public class TogglzFeatureRestTest {
 
     @Test
     public void shouldConvertDataProperly() {
-        ToggleStatus tf = mock(ToggleStatus.class);
+        ToggleableFeature tf = mock(ToggleableFeature.class);
         final String TF_NAME = "tf";
         final boolean ACTIVE = true;
         when(tf.name()).thenReturn(TF_NAME);
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000..ca6ee9cea8
--- /dev/null
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file
-- 
2.16.6