diff options
8 files changed, 292 insertions, 5 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java index 71e6d75c..47af1b71 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java @@ -43,10 +43,12 @@ import java.util.Calendar; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import org.onap.portalsdk.analytics.error.RaptorException; import org.onap.portalsdk.analytics.error.ValidationException; @@ -105,9 +107,19 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; */ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject { - + public static Calendar getCalendar(XMLGregorianCalendar xmlCalendar){ + // log.debug("Zone ID is " + xmlCalendar.getTimezone()); + TimeZone timeZone = xmlCalendar.getTimeZone(xmlCalendar.getTimezone()); + Calendar calendar = Calendar.getInstance(timeZone); + calendar.set(Calendar.YEAR,xmlCalendar.getYear()); + calendar.set(Calendar.MONTH,xmlCalendar.getMonth()-1); + calendar.set(Calendar.DATE,xmlCalendar.getDay()); + calendar.set(Calendar.HOUR_OF_DAY,xmlCalendar.getHour()); + calendar.set(Calendar.MINUTE,xmlCalendar.getMinute()); + calendar.set(Calendar.SECOND,xmlCalendar.getSecond()); + return calendar; + } private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WizardProcessor.class); - public WizardProcessor() { } @@ -1159,7 +1171,7 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject { && fieldSQL.equals(nvl(currField.getFieldSQL())) && fieldDefaultSQL.equals(nvl(currField.getFieldDefaultSQL())) && dependsOn.equals(nvl(currField.getDependsOn(), "N")) - && (start == null || (start != null && currField.getRangeStartDate() == null) || (start.equals(currField.getRangeStartDate()))) + && (start == null || (start != null && currField.getRangeStartDate() == null) || (start.compareTo(getCalendar(currField.getRangeStartDate())) )==0) && (end == null || (end != null && currField.getRangeEndDate() == null) || (end.equals(currField.getRangeEndDate()))) && rangeStartDateSQL.equals(nvl(currField.getRangeStartDateSQL())) && rangeEndDateSQL.equals(nvl(currField.getRangeEndDateSQL())) diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/map/NovaMap.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/map/NovaMap.java index 37f457c8..90d16649 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/map/NovaMap.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/map/NovaMap.java @@ -46,6 +46,7 @@ import java.awt.geom.NoninvertibleTransformException; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashSet; @@ -146,9 +147,9 @@ public class NovaMap { public int getBestZoomLevel(double Latitude1, double Longitude1, double Latitude2, double Longitude2, double height, double width) { - if (height == 0) + if (BigDecimal.ZERO.compareTo(BigDecimal.valueOf(height)) == 0) height = 700; - if (width == 0) + if (BigDecimal.ZERO.compareTo(BigDecimal.valueOf(width)) == 0) width = 1200; double lat1 = Math.min(Latitude1, Latitude1); diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/AdapterSessionFactoryContainerTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/AdapterSessionFactoryContainerTest.java new file mode 100644 index 00000000..80a04272 --- /dev/null +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/AdapterSessionFactoryContainerTest.java @@ -0,0 +1,37 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : Portal SDK +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* 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. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.onap.portalsdk.analytics.system.fusion.adapter; + +import static org.junit.Assert.*; +import java.util.LinkedHashMap; +import org.junit.Test; + +public class AdapterSessionFactoryContainerTest { + + AdapterSessionFactoryContainer asfc=new AdapterSessionFactoryContainer(); + LinkedHashMap sessionFactories; + @Test + public void test() { + asfc.setSessionFactories(sessionFactories); + assertEquals(asfc.getSessionFactories(), sessionFactories); + + } + +} diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/FusionAdapterTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/FusionAdapterTest.java new file mode 100644 index 00000000..27bd839b --- /dev/null +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/FusionAdapterTest.java @@ -0,0 +1,58 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : Portal SDK +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* 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. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.onap.portalsdk.analytics.system.fusion.adapter; + +import static org.junit.Assert.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.beans.PropertyVetoException; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Map; + +import javax.servlet.ServletContext; +import javax.sql.ConnectionPoolDataSource; +import javax.sql.PooledConnection; + +import org.junit.Test; +import org.mockito.Mock; + +import com.mchange.v2.c3p0.ComboPooledDataSource; +import com.mchange.v2.c3p0.impl.AbstractPoolBackedDataSource; +import com.mchange.v2.c3p0.impl.C3P0PooledConnectionPoolManager; +import com.mchange.v2.c3p0.impl.DbAuth; + +public class FusionAdapterTest { + + FusionAdapter fa=new FusionAdapter(); + ComboPooledDataSource dataSource; + Map<String,ComboPooledDataSource> dataSourceMap; + ServletContext servletContext; + @Test + public void test() { + fa.setDataSource(dataSource); + fa.setdataSourceMap(dataSourceMap); + fa.setServletContext(servletContext); + assertEquals(fa.getDataSource(), dataSource); + assertEquals(fa.getServletContext(), servletContext); + } +} diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/IdNameTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/IdNameTest.java new file mode 100644 index 00000000..29e1665a --- /dev/null +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/IdNameTest.java @@ -0,0 +1,51 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : Portal SDK +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* 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. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ + +package org.onap.portalsdk.analytics.system.fusion.adapter; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class IdNameTest { + + IdName idname = new IdName(); + IdName idname2 = new IdName(); + + @Test + public void test() { + + idname.setId(1L); + idname.setName("name"); + idname2.setName(null); + assertEquals(new Long(1L),idname.getId()); + assertEquals("name",idname.getName()); + assertEquals(1,idname.compareTo(idname2)); + idname.setName(null); + assertEquals(1,idname.compareTo(idname2)); + + //for false condition + idname2.setName("name"); + idname.setName("name"); + assertEquals(0,idname.compareTo(idname2)); + + } + +} diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/ItemTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/ItemTest.java new file mode 100644 index 00000000..a510f1dd --- /dev/null +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/ItemTest.java @@ -0,0 +1,44 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : Portal SDK +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* 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. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ + +package org.onap.portalsdk.analytics.system.fusion.adapter; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class ItemTest { + + Item item = new Item(); + Item item2 = new Item("id1","name1"); + + @Test + public void test() { + + item.setId("id"); + item.setName("name"); + + assertEquals("id", item.getId()); + assertEquals("name", item.getName()); + assertEquals("name", item.toString()); + + } + +} diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/LookupTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/LookupTest.java new file mode 100644 index 00000000..ad394c3f --- /dev/null +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/LookupTest.java @@ -0,0 +1,49 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : Portal SDK +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* 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. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.onap.portalsdk.analytics.system.fusion.adapter; + +import static org.junit.Assert.*; +import org.junit.Test; +import org.onap.portalsdk.core.domain.support.NameValueId; + +public class LookupTest { + Lookup lu1=new Lookup("label1", "value2"); + Lookup lu=new Lookup(); + NameValueId nameValueId = new NameValueId(); + @Test + public void test() { + lu.setNameValueId(nameValueId); + lu.setLabel("label"); + lu.setValue("value"); + assertEquals(lu.getLabel(),"label"); + assertEquals(lu.getNameValueId(),nameValueId); + assertEquals(lu.getValue(),"value"); + assertTrue(lu.equals(lu)); + } + @Test + public void testHashCode(){ + lu.setNameValueId(nameValueId); + lu.setLabel("label"); + lu.setValue("value"); + int hash = lu.getValue().hashCode(); + hash=hash + lu.getLabel().hashCode(); + assertEquals(lu.hashCode(), hash); + } +} diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/SpringContextTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/SpringContextTest.java new file mode 100644 index 00000000..8a04e685 --- /dev/null +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/SpringContextTest.java @@ -0,0 +1,35 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : Portal SDK +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* 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. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.onap.portalsdk.analytics.system.fusion.adapter; + +import static org.junit.Assert.*; +import org.junit.Test; +import org.springframework.context.ApplicationContext; + +public class SpringContextTest { + SpringContext sc=new SpringContext(); + ApplicationContext context; + @Test + public void test() { + sc.setApplicationContext(context); + assertEquals(sc.getApplicationContext(), context); + } + +} |