This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
commit cc1f7e7da10019c4ed553cf0c0be3c25a831bf6a
Author: Timothy Bish <tabish...@gmail.com>
AuthorDate: Thu Aug 22 16:15:51 2024 -0400
PROTON-2845 Override base class optional API to return specific types
Make writing some tests simpler by returning the correct type from the
optional() API method in the base class of performative expectations
---
.../qpid/protonj2/test/driver/expectations/AttachExpectation.java | 5 +++++
.../qpid/protonj2/test/driver/expectations/CloseExpectation.java | 5 +++++
.../qpid/protonj2/test/driver/expectations/DeclareExpectation.java | 5 +++++
.../qpid/protonj2/test/driver/expectations/DetachExpectation.java | 5 +++++
.../qpid/protonj2/test/driver/expectations/DischargeExpectation.java | 5 +++++
.../protonj2/test/driver/expectations/DispositionExpectation.java | 5 +++++
.../protonj2/test/driver/expectations/EmptyFrameExpectation.java | 5 +++++
.../qpid/protonj2/test/driver/expectations/EndExpectation.java | 5 +++++
.../qpid/protonj2/test/driver/expectations/FlowExpectation.java | 5 +++++
.../qpid/protonj2/test/driver/expectations/OpenExpectation.java | 5 +++++
.../qpid/protonj2/test/driver/expectations/TransferExpectation.java | 5 +++++
11 files changed, 55 insertions(+)
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/AttachExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/AttachExpectation.java
index aa951f15..ad076921 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/AttachExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/AttachExpectation.java
@@ -88,6 +88,11 @@ public class AttachExpectation extends
AbstractExpectation<Attach> {
return this;
}
+ @Override
+ public AttachExpectation optional() {
+ return (AttachExpectation) super.optional();
+ }
+
@Override
public AttachExpectation withPredicate(Predicate<Attach> predicate) {
super.withPredicate(predicate);
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/CloseExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/CloseExpectation.java
index bbb4c925..8078485c 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/CloseExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/CloseExpectation.java
@@ -48,6 +48,11 @@ public class CloseExpectation extends
AbstractExpectation<Close> {
super(driver);
}
+ @Override
+ public CloseExpectation optional() {
+ return (CloseExpectation) super.optional();
+ }
+
public CloseInjectAction respond() {
response = new CloseInjectAction(driver);
driver.addScriptedElement(response);
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DeclareExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DeclareExpectation.java
index 0c6b86dc..cf563efc 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DeclareExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DeclareExpectation.java
@@ -102,6 +102,11 @@ public class DeclareExpectation extends
TransferExpectation {
//----- Type specific with methods that perform simple equals checks
+ @Override
+ public DeclareExpectation optional() {
+ return (DeclareExpectation) super.optional();
+ }
+
@Override
public DeclareExpectation onChannel(int channel) {
super.onChannel(channel);
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DetachExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DetachExpectation.java
index 8a127e0b..7ebaaddd 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DetachExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DetachExpectation.java
@@ -62,6 +62,11 @@ public class DetachExpectation extends
AbstractExpectation<Detach> {
return this;
}
+ @Override
+ public DetachExpectation optional() {
+ return (DetachExpectation) super.optional();
+ }
+
public DetachInjectAction respond() {
response = new DetachInjectAction(driver);
driver.addScriptedElement(response);
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DischargeExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DischargeExpectation.java
index f3956dda..35addffd 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DischargeExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DischargeExpectation.java
@@ -43,6 +43,11 @@ public class DischargeExpectation extends
TransferExpectation {
withPayload(matcher);
}
+ @Override
+ public DischargeExpectation optional() {
+ return (DischargeExpectation) super.optional();
+ }
+
@Override
public DischargeExpectation onChannel(int channel) {
super.onChannel(channel);
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DispositionExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DispositionExpectation.java
index add9614f..b664518c 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DispositionExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/DispositionExpectation.java
@@ -61,6 +61,11 @@ public class DispositionExpectation extends
AbstractExpectation<Disposition> {
withFirst(notNullValue());
}
+ @Override
+ public DispositionExpectation optional() {
+ return (DispositionExpectation) super.optional();
+ }
+
@Override
public DispositionExpectation onChannel(int channel) {
super.onChannel(channel);
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/EmptyFrameExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/EmptyFrameExpectation.java
index b29a027a..d7f95d0c 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/EmptyFrameExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/EmptyFrameExpectation.java
@@ -42,6 +42,11 @@ public class EmptyFrameExpectation extends
AbstractExpectation<HeartBeat> {
return this;
}
+ @Override
+ public EmptyFrameExpectation optional() {
+ return (EmptyFrameExpectation) super.optional();
+ }
+
public EmptyFrameInjectAction respond() {
EmptyFrameInjectAction response = new EmptyFrameInjectAction(driver);
driver.addScriptedElement(response);
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/EndExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/EndExpectation.java
index edc84868..401055d2 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/EndExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/EndExpectation.java
@@ -56,6 +56,11 @@ public class EndExpectation extends AbstractExpectation<End>
{
return this;
}
+ @Override
+ public EndExpectation optional() {
+ return (EndExpectation) super.optional();
+ }
+
public EndInjectAction respond() {
response = new EndInjectAction(driver);
driver.addScriptedElement(response);
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/FlowExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/FlowExpectation.java
index 3a2cb410..fb9d2a82 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/FlowExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/FlowExpectation.java
@@ -57,6 +57,11 @@ public class FlowExpectation extends
AbstractExpectation<Flow> {
withOutgoingWindow(notNullValue());
}
+ @Override
+ public FlowExpectation optional() {
+ return (FlowExpectation) super.optional();
+ }
+
@Override
public FlowExpectation onChannel(int channel) {
super.onChannel(channel);
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/OpenExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/OpenExpectation.java
index e3e446f9..20c8a0a5 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/OpenExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/OpenExpectation.java
@@ -59,6 +59,11 @@ public class OpenExpectation extends
AbstractExpectation<Open> {
onChannel(0); // Open must used channel zero.
}
+ @Override
+ public OpenExpectation optional() {
+ return (OpenExpectation) super.optional();
+ }
+
@Override
public OpenExpectation withPredicate(Predicate<Open> predicate) {
super.withPredicate(predicate);
diff --git
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/TransferExpectation.java
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/TransferExpectation.java
index 4788aa58..e26fcd99 100644
---
a/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/TransferExpectation.java
+++
b/protonj2-test-driver/src/main/java/org/apache/qpid/protonj2/test/driver/expectations/TransferExpectation.java
@@ -74,6 +74,11 @@ public class TransferExpectation extends
AbstractExpectation<Transfer> {
withHandle(notNullValue());
}
+ @Override
+ public TransferExpectation optional() {
+ return (TransferExpectation) super.optional();
+ }
+
@Override
public TransferExpectation withPredicate(Predicate<Transfer> predicate) {
super.withPredicate(predicate);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
