| commit | 3c9f4df71b978e92a6eeb6f22bc7535e749d11c2 | [log] [tgz] |
|---|---|---|
| author | siddharth0905 <siddharth.singh4@amdocs.com> | Thu Feb 01 12:14:27 2018 +0530 |
| committer | siddharth0905 <siddharth.singh4@amdocs.com> | Thu Feb 01 12:14:27 2018 +0530 |
| tree | 6dfdc7fa5567936e61269838d50c90e3df63f03d | |
| parent | eedaaf983d731d0179916b3f3a8e4d3a0d80981b [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>
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 baad898..21f5223 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 b8f3286..8170048 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 @@ @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 0000000..ca6ee9c --- /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