Skip to content

Commit

Permalink
Add unnullable parameters in operation.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lacourte
lacourte committed Oct 23, 2023
1 parent 2c63a4e commit 455df08
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 24 deletions.
32 changes: 16 additions & 16 deletions ...beds/testbed-mal/src/main/java/org/ccsds/moims/mo/mal/test/datatype/DataTypeScenario.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,14 +432,14 @@ public String explicitMultiReturnWorks() throws MALInteractionException, MALExce
TestExplicitMultiReturnResponse tv = getDataTestStub().testExplicitMultiReturn(
TestData.testUOctet, TestData.testUShort,
TestData.testUInteger, TestData.testULong);
rv = subMultiTest(TestData.testMultiReturnExplicit.get_UOctet0(),
tv.get_UOctet0(), null, "explicit Multi return part 1");
rv = subMultiTest(TestData.testMultiReturnExplicit.get_UShort1(),
tv.get_UShort1(), rv, "explicit Multi return part 2");
rv = subMultiTest(TestData.testMultiReturnExplicit.get_UInteger2(),
tv.get_UInteger2(), rv, "explicit Multi return part 3");
rv = subMultiTest(TestData.testMultiReturnExplicit.get_ULong3(),
tv.get_ULong3(), rv, "explicit Multi return part 4");
rv = subMultiTest(TestData.testMultiReturnExplicit.getOut1(),
tv.getOut1(), null, "explicit Multi return part 1");
rv = subMultiTest(TestData.testMultiReturnExplicit.getOut2(),
tv.getOut2(), rv, "explicit Multi return part 2");
rv = subMultiTest(TestData.testMultiReturnExplicit.getOut3(),
tv.getOut3(), rv, "explicit Multi return part 3");
rv = subMultiTest(TestData.testMultiReturnExplicit.getOut4(),
tv.getOut4(), rv, "explicit Multi return part 4");
} catch (MALInteractionException ex) {
rv = subSingleTestExceptionHandler(ex, "explicit Multi return");
}
Expand Down Expand Up @@ -505,14 +505,14 @@ public String multiReturnWithNullsWork() throws MALInteractionException, MALExce
TestExplicitMultiReturnResponse tv = getDataTestStub().testExplicitMultiReturn(
TestData.testUOctet, TestData.testUShort,
TestData.testUInteger, null);
rv = subMultiTest(TestData.testMultiReturnNull.getBodyElement0(),
tv.getBodyElement0(), null, "null Multi return part 1");
rv = subMultiTest(TestData.testMultiReturnNull.getBodyElement1(),
tv.getBodyElement1(), rv, "null Multi return part 2");
rv = subMultiTest(TestData.testMultiReturnNull.getBodyElement2(),
tv.getBodyElement2(), rv, "null Multi return part 3");
rv = subMultiTest(TestData.testMultiReturnNull.getBodyElement3(),
tv.getBodyElement3(), rv, "null Multi return part 4");
rv = subMultiTest(TestData.testMultiReturnNull.getOut1(),
tv.getOut1(), null, "null Multi return part 1");
rv = subMultiTest(TestData.testMultiReturnNull.getOut2(),
tv.getOut2(), rv, "null Multi return part 2");
rv = subMultiTest(TestData.testMultiReturnNull.getOut3(),
tv.getOut3(), rv, "null Multi return part 3");
rv = subMultiTest(TestData.testMultiReturnNull.getOut4(),
tv.getOut4(), rv, "null Multi return part 4");
} catch (MALInteractionException ex) {
rv = subSingleTestExceptionHandler(ex, "null Multi return");
}
Expand Down
32 changes: 24 additions & 8 deletions testbeds/xml-tests/src/main/resources/MALPrototype.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,16 +739,32 @@
comment="This operation checks that multiple types can be sent and received explicitly">
<smc:messages>
<smc:request>
<smc:type area="MAL" name="UOctet" />
<smc:type area="MAL" name="UShort" />
<smc:type area="MAL" name="UInteger" />
<smc:type area="MAL" name="ULong" />
<smc:field name = "in1" canBeNull ="false" comment = "">
<smc:type area="MAL" name="UOctet" />
</smc:field>
<smc:field name = "in2" canBeNull ="false" comment = "">
<smc:type area="MAL" name="UShort" />
</smc:field>
<smc:field name = "in3" canBeNull ="false" comment = "">
<smc:type area="MAL" name="UInteger" />
</smc:field>
<smc:field name = "in4" canBeNull ="true" comment = "">
<smc:type area="MAL" name="ULong" />
</smc:field>
</smc:request>
<smc:response>
<smc:type area="MAL" name="UOctet" />
<smc:type area="MAL" name="UShort" />
<smc:type area="MAL" name="UInteger" />
<smc:type area="MAL" name="ULong" />
<smc:field name = "out1" canBeNull ="false" comment = "">
<smc:type area="MAL" name="UOctet" />
</smc:field>
<smc:field name = "out2" canBeNull ="false" comment = "">
<smc:type area="MAL" name="UShort" />
</smc:field>
<smc:field name = "out3" canBeNull ="false" comment = "">
<smc:type area="MAL" name="UInteger" />
</smc:field>
<smc:field name = "out4" canBeNull ="true" comment = "">
<smc:type area="MAL" name="ULong" />
</smc:field>
</smc:response>
</smc:messages>
<smc:errors>
Expand Down

0 comments on commit 455df08

Please sign in to comment.