commit 068101696685529eafcc94848480cf563dc7b109
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Feb 24 12:52:32 2016 -0800
committer Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Mar 24 17:10:33 2016 -0700
tree 6cb71d17fe7eb82a41815280d2aed2e3cc05e5d8
parent c29171ac9a3829cd236211055fbdf66c54333b82

Remove IndexedLambdaCriterion deprecated in Emu

Change-Id: If1976963b49d28139d0002d9cd44414e4a8d9d50

core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java
index 10c5a63..b6f3fa9 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java
@@ -28,7 +28,9 @@
 import org.onlab.packet.MplsLabel;
 import org.onlab.packet.TpPort;
 import org.onlab.packet.VlanId;
-import org.onosproject.net.IndexedLambda;
+import org.onosproject.net.ChannelSpacing;
+import org.onosproject.net.GridType;
+import org.onosproject.net.OchSignal;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.flow.criteria.Criteria;
 import org.onosproject.net.flow.criteria.Criterion;
@@ -59,17 +61,14 @@
      */
     @Test
     public void testEquals() {
-        final short one = 1;
-        final short two = 2;
-
         final TrafficSelector selector1 = DefaultTrafficSelector.builder()
-                .add(Criteria.matchLambda(new IndexedLambda(one)))
+                .add(Criteria.matchLambda(new OchSignal(GridType.FLEX, ChannelSpacing.CHL_100GHZ, 1, 1)))
                 .build();
         final TrafficSelector sameAsSelector1 = DefaultTrafficSelector.builder()
-                .add(Criteria.matchLambda(new IndexedLambda(one)))
+                .add(Criteria.matchLambda(new OchSignal(GridType.FLEX, ChannelSpacing.CHL_100GHZ, 1, 1)))
                 .build();
         final TrafficSelector selector2 = DefaultTrafficSelector.builder()
-                .add(Criteria.matchLambda(new IndexedLambda(two)))
+                .add(Criteria.matchLambda(new OchSignal(GridType.FLEX, ChannelSpacing.CHL_50GHZ, 1, 1)))
                 .build();
 
         new EqualsTester()
@@ -265,7 +264,7 @@
         assertThat(selector, hasCriterionWithType(Type.IPV6_EXTHDR));
 
         selector = DefaultTrafficSelector.builder()
-                .add(Criteria.matchLambda(new IndexedLambda(shortValue))).build();
+                .add(Criteria.matchLambda(new OchSignal(GridType.DWDM, ChannelSpacing.CHL_100GHZ, 1, 1))).build();
         assertThat(selector, hasCriterionWithType(Type.OCH_SIGID));
     }
 }

core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java b/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
index 8b18ae6..40940fa 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
@@ -256,10 +256,6 @@
     Criterion sameAsMatchOchSignalType1 = Criteria.matchOchSignalType(OchSignalType.FIXED_GRID);
     Criterion matchOchSignalType2 = Criteria.matchOchSignalType(OchSignalType.FLEX_GRID);
 
-    Criterion matchIndexedLambda1 = Criteria.matchLambda(Lambda.indexedLambda(1));
-    Criterion sameAsMatchIndexedLambda1 = Criteria.matchLambda(Lambda.indexedLambda(1));
-    Criterion matchIndexedLambda2 = Criteria.matchLambda(Lambda.indexedLambda(2));
-
     Criterion matchOchSignal1 =
             Criteria.matchLambda(Lambda.ochSignal(GridType.DWDM, ChannelSpacing.CHL_100GHZ, 4, 8));
     Criterion sameAsMatchOchSignal1 =
@@ -1147,14 +1143,6 @@
     }
 
     @Test
-    public void testIndexedLambdaCriterionEquals() {
-        new EqualsTester()
-                .addEqualityGroup(matchIndexedLambda1, sameAsMatchIndexedLambda1)
-                .addEqualityGroup(matchIndexedLambda2)
-                .testEquals();
-    }
-
-    @Test
     public void testOchSignalCriterionEquals() {
         new EqualsTester()
                 .addEqualityGroup(matchOchSignal1, sameAsMatchOchSignal1)