aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services
diff options
context:
space:
mode:
authorsiddharth0905 <siddharth.singh4@amdocs.com>2018-02-01 12:14:27 +0530
committersiddharth0905 <siddharth.singh4@amdocs.com>2018-02-01 12:14:27 +0530
commit3c9f4df71b978e92a6eeb6f22bc7535e749d11c2 (patch)
tree6dfdc7fa5567936e61269838d50c90e3df63f03d /openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services
parenteedaaf983d731d0179916b3f3a8e4d3a0d80981b (diff)
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>
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml4
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java2
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker1
3 files changed, 4 insertions, 3 deletions
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