Updated master to commit id 6ee8aa3e67ce89908a8c93aa9445c6f71a18f986

Change-Id: I94b055ee2f298daf71e2ec794fd0f2495bd8081f

1 files changed, 0 insertions, 65 deletions

diff --git a/framework/src/onos/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java b/framework/src/onos/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
index ee294f6f..95d605c6 100644
--- a/framework/src/onos/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
+++ b/framework/src/onos/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
@@ -225,12 +225,6 @@ public class CriteriaTest {
     Criterion matchIpv6ExthdrFlags2 =
         Criteria.matchIPv6ExthdrFlags(ipv6ExthdrFlags2);
 
-    int lambda1 = 1;
-    int lambda2 = 2;
-    Criterion matchLambda1 = Criteria.matchLambda(lambda1);
-    Criterion sameAsMatchLambda1 = Criteria.matchLambda(lambda1);
-    Criterion matchLambda2 = Criteria.matchLambda(lambda2);
-
     Criterion matchOchSignalType1 = Criteria.matchOchSignalType(OchSignalType.FIXED_GRID);
     Criterion sameAsMatchOchSignalType1 = Criteria.matchOchSignalType(OchSignalType.FIXED_GRID);
     Criterion matchOchSignalType2 = Criteria.matchOchSignalType(OchSignalType.FLEX_GRID);
@@ -239,12 +233,6 @@ public class CriteriaTest {
     Criterion sameAsMatchIndexedLambda1 = Criteria.matchLambda(Lambda.indexedLambda(1));
     Criterion matchIndexedLambda2 = Criteria.matchLambda(Lambda.indexedLambda(2));
 
-    short signalLambda1 = 1;
-    short signalLambda2 = 2;
-    Criterion matchSignalLambda1 = Criteria.matchOpticalSignalType(signalLambda1);
-    Criterion sameAsMatchSignalLambda1 = Criteria.matchOpticalSignalType(signalLambda1);
-    Criterion matchSignalLambda2 = Criteria.matchOpticalSignalType(signalLambda2);
-
     Criterion matchOchSignal1 =
             Criteria.matchLambda(Lambda.ochSignal(GridType.DWDM, ChannelSpacing.CHL_100GHZ, 4, 8));
     Criterion sameAsMatchOchSignal1 =
@@ -306,7 +294,6 @@ public class CriteriaTest {
         assertThatClassIsImmutable(MplsCriterion.class);
         assertThatClassIsImmutable(IPv6ExthdrFlagsCriterion.class);
         assertThatClassIsImmutable(LambdaCriterion.class);
-        assertThatClassIsImmutable(OpticalSignalTypeCriterion.class);
     }
 
     // PortCriterion class
@@ -1057,32 +1044,6 @@ public class CriteriaTest {
                 .testEquals();
     }
 
-    // LambdaCriterion class
-
-    /**
-     * Test the matchLambda method.
-     */
-    @Test
-    public void testMatchLambdaMethod() {
-        Criterion matchLambda = Criteria.matchLambda(lambda1);
-        LambdaCriterion lambdaCriterion =
-                checkAndConvert(matchLambda,
-                        Criterion.Type.OCH_SIGID,
-                        LambdaCriterion.class);
-        assertThat(lambdaCriterion.lambda(), is(equalTo(lambda1)));
-    }
-
-    /**
-     * Test the equals() method of the LambdaCriterion class.
-     */
-    @Test
-    public void testLambdaCriterionEquals() {
-        new EqualsTester()
-                .addEqualityGroup(matchLambda1, sameAsMatchLambda1)
-                .addEqualityGroup(matchLambda2)
-                .testEquals();
-    }
-
     @Test
     public void testIndexedLambdaCriterionEquals() {
         new EqualsTester()
@@ -1109,30 +1070,4 @@ public class CriteriaTest {
                 .addEqualityGroup(matchOchSignalType2)
                 .testEquals();
     }
-
-    // OpticalSignalTypeCriterion class
-
-    /**
-     * Test the matchOpticalSignalType method.
-     */
-    @Test
-    public void testMatchOpticalSignalTypeMethod() {
-        Criterion matchLambda = Criteria.matchOpticalSignalType(signalLambda1);
-        OpticalSignalTypeCriterion opticalSignalTypeCriterion =
-                checkAndConvert(matchLambda,
-                        Criterion.Type.OCH_SIGTYPE,
-                        OpticalSignalTypeCriterion.class);
-        assertThat(opticalSignalTypeCriterion.signalType(), is(equalTo(signalLambda1)));
-    }
-
-    /**
-     * Test the equals() method of the OpticalSignalTypeCriterion class.
-     */
-    @Test
-    public void testOpticalSignalTypeCriterionEquals() {
-        new EqualsTester()
-                .addEqualityGroup(matchSignalLambda1, sameAsMatchSignalLambda1)
-                .addEqualityGroup(matchSignalLambda2)
-                .testEquals();
-    }
 }