Add tests related to the supplements header field.

esa · Sep 11, 2023 · 81bc21f · 81bc21f
1 parent 2724297
commit 81bc21f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/...narios/Section4Scenarios/AllExceptPubSubTestCase/AllExceptPubSubTestProcedure/content.txt b/...narios/Section4Scenarios/AllExceptPubSubTestCase/AllExceptPubSubTestProcedure/content.txt
@@ -52,7 +52,7 @@ The transitions are checked by ensuring that the faulty messages are not receive
 
 |scenario| test interaction pattern | interaction | with transitions | trans | and behaviour id | id |
 |pattern | @interaction | with supplements | Empty | and transitions | @trans | and behaviour id | @id | test |
-#|pattern | @interaction | with supplements | Full | and transitions | @trans | and behaviour id | @id | test |
+|pattern | @interaction | with supplements | Full | and transitions | @trans | and behaviour id | @id | test |
 
 ***********!
 

diff --git a/testbeds/testbed-mal/src/main/java/org/ccsds/moims/mo/mal/test/patterns/PatternTest.java b/testbeds/testbed-mal/src/main/java/org/ccsds/moims/mo/mal/test/patterns/PatternTest.java
@@ -230,7 +230,7 @@ public boolean patternInitiationForWithMultiWithEmptyBodyAndSupplementsAndTransi
                 expectedInitialHeader.getOperation(),
                 MALPrototypeHelper.MALPROTOTYPE_AREA.getVersion(),
                 Boolean.FALSE,
-                supplementsValue);
+                Helper.supplementsIPTestProvider);
 
         sendInitialFaultyTransitions(initialFaultyTransList, expectedFinalHeader);
 

diff --git a/...beds/testbed-mal/src/main/java/org/ccsds/moims/mo/mal/test/suite/TestServiceProvider.java b/...beds/testbed-mal/src/main/java/org/ccsds/moims/mo/mal/test/suite/TestServiceProvider.java
@@ -37,6 +37,7 @@
 import org.ccsds.moims.mo.mal.test.patterns.IPTestHandlerImpl;
 import org.ccsds.moims.mo.mal.test.patterns.pubsub.IPTestHandlerWithSharedBroker;
 import org.ccsds.moims.mo.mal.test.transport.MALTestEndPointSendInterceptor;
+import org.ccsds.moims.mo.mal.test.util.Helper;
 import org.ccsds.moims.mo.malprototype.MALPrototypeHelper;
 import org.ccsds.moims.mo.malprototype.datatest.DataTestHelper;
 import org.ccsds.moims.mo.malprototype.datatest.DataTestServiceInfo;
@@ -151,7 +152,7 @@ protected void createProviders() throws MALException {
                 null,
                 Boolean.TRUE, // isPublisher
                 null,
-                null);
+                Helper.supplementsIPTestProvider);
 
         FileBasedDirectory.storePrivateBrokerAuthenticationId(
                 ipprovider.getBrokerAuthenticationId());

diff --git a/testbeds/testbed-mal/src/main/java/org/ccsds/moims/mo/mal/test/util/Helper.java b/testbeds/testbed-mal/src/main/java/org/ccsds/moims/mo/mal/test/util/Helper.java
@@ -42,6 +42,7 @@ public final class Helper {
 
     public static NamedValueList supplementsEmpty;
     public static NamedValueList supplementsFull;
+    public static NamedValueList supplementsIPTestProvider;
 
     public static final String EMPTY_SUPPLEMENTS = "Empty";
     public static final String FULL_SUPPLEMENTS = "Full";
@@ -73,6 +74,8 @@ public final class Helper {
       supplementsFull.add(new NamedValue(new Identifier("FineTime suppl"), new FineTime(Long.MAX_VALUE)));
       supplementsFull.add(new NamedValue(new Identifier("URI suppl"), new URI("URI suppl")));
       supplementsFull.add(new NamedValue(new Identifier("ObjectRef suppl"), new ObjectRef(testDomain, MyFirstObject.SHORT_FORM, new Identifier("ObjectRef suppl"), new UInteger(1))));
+      supplementsIPTestProvider = new NamedValueList();
+      supplementsIPTestProvider.add(new NamedValue(new Identifier("Provider name"), new Identifier("IPTest")));
     }
 
     private Helper() {