Add methods to GridUtils

[transportpce.git] / common / src / test / java / org / opendaylight / transportpce / common / fixedflex / GridUtilsTest.java

diff --git a/common/src/test/java/org/opendaylight/transportpce/common/fixedflex/GridUtilsTest.java b/common/src/test/java/org/opendaylight/transportpce/common/fixedflex/GridUtilsTest.java
index 3e7ed5835d8d8e3636a799d4f3947b031ae6103d..8f9f5f9adc65107decaba9383b0f56dfc3658f68 100644 (file)
--- a/common/src/test/java/org/opendaylight/transportpce/common/fixedflex/GridUtilsTest.java
+++ b/common/src/test/java/org/opendaylight/transportpce/common/fixedflex/GridUtilsTest.java
@@ -77,14 +77,14 @@ public class GridUtilsTest {
 
     @Test
     public void getWidthFromRateAndModulationFormatTest() {
-        assertEquals("Width should be 80", FrequencyGHz.getDefaultInstance("80"),
+        assertEquals("Width should be 80", new FrequencyGHz(GridConstant.WIDTH_80),
                 GridUtils.getWidthFromRateAndModulationFormat(ServiceRateConstant.RATE_400,
                         ModulationFormat.DpQam16));
     }
 
     @Test
     public void getWidthFromRateAndModulationFormatNotFoundTest() {
-        assertEquals("As not found width should be 40", FrequencyGHz.getDefaultInstance("40"),
+        assertEquals("As not found width should be 40", new FrequencyGHz(GridConstant.WIDTH_40),
                 GridUtils.getWidthFromRateAndModulationFormat(ServiceRateConstant.RATE_100,
                         ModulationFormat.DpQam16));
     }
@@ -95,4 +95,20 @@ public class GridUtilsTest {
                 new FrequencyTHz(BigDecimal.valueOf(191.35).setScale(3)),
                 GridUtils.getCentralFrequency(BigDecimal.valueOf(191.325), BigDecimal.valueOf(191.375)));
     }
+
+    @Test
+    public void getCentralFrequencyWithPrecisionTest() {
+        assertEquals("Central frequency should be 191.3500",
+                new FrequencyTHz(BigDecimal.valueOf(191.35).setScale(4)),
+                GridUtils.getCentralFrequencyWithPrecision(BigDecimal.valueOf(191.325),
+                        BigDecimal.valueOf(191.375), 4));
+    }
+
+    @Test
+    public void getCentralFrequencyWithPrecisionAndRoundTest() {
+        assertEquals("Central frequency should be 191.3499",
+                new FrequencyTHz(BigDecimal.valueOf(191.3499)),
+                GridUtils.getCentralFrequencyWithPrecision(BigDecimal.valueOf(191.3244445),
+                        BigDecimal.valueOf(191.3754457788), 4));
+    }
 }