From 458097945996fd40d822c6938c1aedd349bfcfeb Mon Sep 17 00:00:00 2001 From: "Madheswaran, Saravanan" Date: Wed, 21 Mar 2018 10:36:54 -0400 Subject: Added Junits Issue-ID: PORTAL-136 Includes JUNITS, Analytics module Change-Id: Ie4234c6d940d72866e11b56619840cdc707e4005 Change-Id: I8ed32ab32c8455fccf9baa1ce66441aea08f4d75 Signed-off-by: Madheswaran, Saravanan --- .../analytics/controller/WizardProcessorTest.java | 61 ++++++++++++---------- 1 file changed, 34 insertions(+), 27 deletions(-) (limited to 'ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java') diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java index 837c2c32..7af40812 100644 --- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java @@ -73,6 +73,7 @@ import org.onap.portalsdk.analytics.xmlobj.ColFilterType; import org.onap.portalsdk.analytics.xmlobj.DataColumnType; import org.onap.portalsdk.analytics.xmlobj.DataSourceType; import org.onap.portalsdk.analytics.xmlobj.FormFieldType; +import org.onap.portalsdk.analytics.xmlobj.FormatType; import org.onap.portalsdk.analytics.xmlobj.JavascriptItemType; import org.onap.portalsdk.analytics.xmlobj.ReportMap; import org.onap.portalsdk.analytics.xmlobj.SemaphoreList; @@ -141,6 +142,9 @@ public class WizardProcessorTest { @Mock Encoder encoder; + @Mock + FormatType formatingType; + private String REPORT_ID="1000"; private String DETAIL_ID="3000"; @@ -3058,25 +3062,24 @@ public class WizardProcessorTest { } - /*** - @Test + @Test(expected=Exception.class) public void testProcessSemaphorePopup_case1() throws Exception { mockHttpAttribute("semaphoreId", "Id"); mockHttpAttribute("semaphoreName", "Name"); mockHttpAttribute("semaphoreType", "Type"); - String [] formatId = {"", ""}; - String [] lessThanValue = {"1", "1"}; - String [] expression = {"", ""}; - String [] bold = {"", ""}; - String [] italic = {"", ""}; - String [] underline = {"", ""}; - String [] bgColor = {"", ""}; - String [] fontColor = {"", ""}; - String [] fontFace = {"", ""}; - String [] fontSize = {"", ""}; + String [] formatId = {"1"}; + String [] lessThanValue = {"1"}; + String [] expression = {""}; + String [] bold = {""}; + String [] italic = {""}; + String [] underline = {""}; + String [] bgColor = {""}; + String [] fontColor = {""}; + String [] fontFace = {""}; + String [] fontSize = {""}; mockHttpParameterValues("formatId", formatId); mockHttpParameterValues("lessThanValue", lessThanValue); @@ -3091,27 +3094,31 @@ public class WizardProcessorTest { SemaphoreType semaphoreType = new SemaphoreType(); - //Mockito.when(reportDefinition.getSemaphoreFormatById(Mockito.anyObject(), Mockito.anyString())).thenReturn(new FormatType()); - //PowerMockito.when(reportDefinition.addEmptyFormatType(Mockito.anyObject(), Mockito.anyObject())).thenReturn(new FormatType()); - - Mockito.when(reportDefinition.addSemaphoreType( Mockito.anyObject(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn(new SemaphoreType()); - - Mockito.when(reportDefinition.getSemaphoreById("Id")).thenReturn(semaphoreType); - - PowerMockito.when(ReportDefinition.getSemaphoreFormatById( Mockito.anyObject(), Mockito.anyString())).thenReturn(new FormatType()); - - //Mockito.when(reportDefinition.getSemaphoreById("Id")).thenReturn(null); + semaphoreType.setSemaphoreName("TEST SEMAPHORE"); - //Mockito.when(reportRuntime.getSemaphoreList()).thenReturn(semaphoreList); + Mockito.when(reportDefinition.getSemaphoreById("Id")).thenReturn(semaphoreType); + Mockito.when(reportDefinition.addSemaphoreType( Mockito.anyObject(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn(semaphoreType); + + /* + FormatType formatType = new FormatType(); + formatType.setBgColor("blue"); + formatType.setFontColor("black"); + formatType.setBold(true); + formatType.setItalic(true); + formatType.setFontFace("Calibri"); + formatType.setItalic(true); + formatType.setUnderline(true); + formatType.setUnderline(true); + formatType.setFontSize("20"); + */ + Mockito.when(reportDefinition.getSemaphoreById("Id")).thenReturn(semaphoreType); - //Mockito.when(reportDefinition.addSemaphore(Mockito.anyObject(), Mockito.anyObject())).thenReturn(st1); + //Mockito.when(reportDefinition.getSemaphoreFormatById(Mockito.anyObject(), Mockito.anyString())).thenReturn(formatingType); wizardProcessor.processSemaphorePopup(httpServletRequest); - Mockito.verify(wizardProcessor, Mockito.times(1)).processSemaphorePopup(httpServletRequest); + //Mockito.verify(wizardProcessor, Mockito.times(1)).processSemaphorePopup(httpServletRequest); } - ***/ - /* -- cgit 1.2.3-korg