Remove deprecated instructions() method in the traffic treatment class
Change-Id: I739b35bdcbf9867c639c7b6ca4006f3eeafbb055
diff --git a/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java
index 1086585..ad04602 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java
@@ -75,14 +75,24 @@
final TrafficTreatment treatment1 = builder1.build();
- final List<Instruction> instructions1 = treatment1.instructions();
+ final List<Instruction> instructions1 = treatment1.immediate();
assertThat(instructions1, hasSize(9));
builder1.drop();
builder1.add(instruction1);
- final List<Instruction> instructions2 = builder1.build().instructions();
+ final List<Instruction> instructions2 = builder1.build().immediate();
assertThat(instructions2, hasSize(11));
+
+ builder1.deferred()
+ .popVlan()
+ .pushVlan()
+ .setVlanId(VlanId.vlanId((short) 5));
+
+ final List<Instruction> instructions3 = builder1.build().immediate();
+ assertThat(instructions3, hasSize(11));
+ final List<Instruction> instructions4 = builder1.build().deferred();
+ assertThat(instructions4, hasSize(3));
}
/**
diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
index 4ae09fb..14abd83 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
@@ -93,18 +93,13 @@
*/
public static class MockTreatment implements TrafficTreatment {
@Override
- public List<Instruction> instructions() {
- return new ArrayList<>();
- }
-
- @Override
public List<Instruction> deferred() {
return null;
}
@Override
public List<Instruction> immediate() {
- return null;
+ return new ArrayList<>();
}
@Override