diff options
Diffstat (limited to 'framework/src/onos/core/common/src/test/java/org')
4 files changed, 8 insertions, 10 deletions
diff --git a/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/ConstraintCodecTest.java b/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/ConstraintCodecTest.java index 2a47d115..a84dab48 100644 --- a/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/ConstraintCodecTest.java +++ b/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/ConstraintCodecTest.java @@ -134,7 +134,7 @@ public class ConstraintCodecTest { assertThat(constraint, instanceOf(BandwidthConstraint.class)); BandwidthConstraint bandwidthConstraint = (BandwidthConstraint) constraint; - assertThat(bandwidthConstraint.bandwidth().toDouble(), is(345.678D)); + assertThat(bandwidthConstraint.bandwidth().bps(), is(345.678D)); } /** @@ -146,7 +146,7 @@ public class ConstraintCodecTest { assertThat(constraint, instanceOf(LambdaConstraint.class)); LambdaConstraint lambdaConstraint = (LambdaConstraint) constraint; - assertThat(lambdaConstraint.lambda().toInt(), is(444)); + assertThat(lambdaConstraint.lambda().index(), is(444L)); } /** diff --git a/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java b/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java index b00632c3..7d8580a6 100644 --- a/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java +++ b/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java @@ -138,8 +138,8 @@ public final class CriterionJsonMatcher extends * @return true if the JSON matches the criterion, false otherwise. */ private boolean matchCriterion(EthTypeCriterion criterion) { - final int ethType = criterion.ethType().toShort(); - final int jsonEthType = jsonCriterion.get("ethType").intValue(); + final int ethType = criterion.ethType().toShort() & 0xffff; + final int jsonEthType = Integer.decode(jsonCriterion.get("ethType").textValue()) & 0xffff; if (ethType != jsonEthType) { description.appendText("ethType was " + Integer.toString(jsonEthType)); diff --git a/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/IntentCodecTest.java b/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/IntentCodecTest.java index 2f933966..596c7ef9 100644 --- a/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/IntentCodecTest.java +++ b/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/IntentCodecTest.java @@ -63,8 +63,6 @@ import org.onosproject.net.intent.constraint.LambdaConstraint; import org.onosproject.net.intent.constraint.LatencyConstraint; import org.onosproject.net.intent.constraint.ObstacleConstraint; import org.onosproject.net.intent.constraint.WaypointConstraint; -import org.onosproject.net.resource.link.BandwidthResource; -import org.onosproject.net.resource.link.LambdaResource; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -181,8 +179,8 @@ public class IntentCodecTest extends AbstractIntentTest { final List<Constraint> constraints = ImmutableList.of( - new BandwidthConstraint(new BandwidthResource(Bandwidth.bps(1.0))), - new LambdaConstraint(LambdaResource.valueOf(3)), + new BandwidthConstraint(Bandwidth.bps(1.0)), + new LambdaConstraint(new IndexedLambda(3)), new AnnotationConstraint("key", 33.0), new AsymmetricPathConstraint(), new LatencyConstraint(Duration.ofSeconds(2)), diff --git a/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/IntentJsonMatcher.java b/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/IntentJsonMatcher.java index e485a5fa..acc1f0e8 100644 --- a/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/IntentJsonMatcher.java +++ b/framework/src/onos/core/common/src/test/java/org/onosproject/codec/impl/IntentJsonMatcher.java @@ -141,7 +141,7 @@ public final class IntentJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode> final JsonNode bandwidthJson = constraintJson.get("bandwidth"); return bandwidthJson != null && constraintJson.get("bandwidth").asDouble() - == bandwidthConstraint.bandwidth().toDouble(); + == bandwidthConstraint.bandwidth().bps(); } /** @@ -157,7 +157,7 @@ public final class IntentJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode> final JsonNode lambdaJson = constraintJson.get("lambda"); return lambdaJson != null && constraintJson.get("lambda").asInt() - == lambdaConstraint.lambda().toInt(); + == lambdaConstraint.lambda().index(); } /** |