Skip to content

Commit 3c6ab84

Browse files
costas80costas80
committed
Pull request #43: Development
Merge in ITB/gitb-types from development to master * commit 'c67a18a2528aab0bc6e62b655cdee3baa0e59325': Preparation for release 1.29.0 [ITB-2064] Extend interact steps to allow specifying the types of accepted files in UPLOAD inputs [ITB-2067] Include instruct elements in the step report for interact steps [ITB-2056] Include the test session identifier in PDF and XML test case reports [ITB-2046] Allow setting a test suite's execution and display order via the test suite's definition file Copyright update for 2026 [ITB-1965] Support default values for interaction step requests [ITB-1997] Extend the interact step's instructions to render messages with optional severity styling [ITB-1998] Extend the interact step's instructions to allow hiding the copy and view controls [ITB-1995] Support specifying the number of rows to show for an interact step's MULTILINE_TEXT input [ITB-1986, ITB-1987] Support for custom ordering and naming for the tester, administrator and test engine actors [ITB-63] Allow test steps to appear under any actor Preparation for next development phase
2 parents bf1af07 + c67a18a commit 3c6ab84

18 files changed

Lines changed: 74 additions & 26 deletions

File tree

‎NOTICE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Notice
22

3-
Copyright (C) 2025 European Union
3+
Copyright (C) 2026 European Union
44

55
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions
66
of the EUPL (the "Licence"); You may not use this work except in compliance with the Licence.

‎etc/licence/third-party-licence-template.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</#function>
2727
# Notice
2828

29-
Copyright (C) 2025 European Union
29+
Copyright (C) 2026 European Union
3030

3131
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions
3232
of the EUPL (the "Licence"); You may not use this work except in compliance with the Licence.

‎gitb-types-jakarta/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.28.5</version>
9+
<version>1.29.0</version>
1010
</parent>
1111
<artifactId>gitb-types-jakarta</artifactId>
1212
<name>${project.groupId}:${project.artifactId}</name>

‎gitb-types-javax/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.28.5</version>
9+
<version>1.29.0</version>
1010
</parent>
1111
<artifactId>gitb-types</artifactId>
1212
<name>${project.groupId}:${project.artifactId}</name>

‎gitb-types-specs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.28.5</version>
9+
<version>1.29.0</version>
1010
</parent>
1111
<artifactId>gitb-types-specs</artifactId>
1212
<name>${project.groupId}:${project.artifactId}</name>

‎gitb-types-specs/src/main/resources/schema/gitb_core.xsd‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<!--
3-
~ Copyright (C) 2025 European Union
3+
~ Copyright (C) 2026 European Union
44
~
55
~ Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European Commission - subsequent
66
~ versions of the EUPL (the "Licence"); You may not use this work except in compliance with the Licence.
@@ -123,6 +123,12 @@
123123
<xsd:sequence>
124124
<xsd:element name="actor" type="TestRole" maxOccurs="unbounded"/>
125125
</xsd:sequence>
126+
<xsd:attribute name="engineDisplayOrder" type="xsd:short"/>
127+
<xsd:attribute name="userDisplayOrder" type="xsd:short"/>
128+
<xsd:attribute name="adminDisplayOrder" type="xsd:short"/>
129+
<xsd:attribute name="engineName" type="xsd:string"/>
130+
<xsd:attribute name="userName" type="xsd:string"/>
131+
<xsd:attribute name="adminName" type="xsd:string"/>
126132
</xsd:complexType>
127133
<!--List of Testcase Role definition-->
128134
<xsd:complexType name="TestRole">
@@ -384,4 +390,13 @@
384390
<xsd:enumeration value="DEBUG"/>
385391
</xsd:restriction>
386392
</xsd:simpleType>
393+
<xsd:simpleType name="InstructionLevel">
394+
<xsd:restriction base="xsd:string">
395+
<xsd:enumeration value="ERROR"/>
396+
<xsd:enumeration value="WARNING"/>
397+
<xsd:enumeration value="INFO"/>
398+
<xsd:enumeration value="SUCCESS"/>
399+
<xsd:enumeration value="NONE"/>
400+
</xsd:restriction>
401+
</xsd:simpleType>
387402
</xsd:schema>

‎gitb-types-specs/src/main/resources/schema/gitb_ms.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<!--
3-
~ Copyright (C) 2025 European Union
3+
~ Copyright (C) 2026 European Union
44
~
55
~ Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European Commission - subsequent
66
~ versions of the EUPL (the "Licence"); You may not use this work except in compliance with the Licence.

‎gitb-types-specs/src/main/resources/schema/gitb_ps.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<!--
3-
~ Copyright (C) 2025 European Union
3+
~ Copyright (C) 2026 European Union
44
~
55
~ Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European Commission - subsequent
66
~ versions of the EUPL (the "Licence"); You may not use this work except in compliance with the Licence.

‎gitb-types-specs/src/main/resources/schema/gitb_tbs.xsd‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<!--
3-
~ Copyright (C) 2025 European Union
3+
~ Copyright (C) 2026 European Union
44
~
55
~ Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European Commission - subsequent
66
~ versions of the EUPL (the "Licence"); You may not use this work except in compliance with the Licence.
@@ -159,6 +159,8 @@
159159
<xsd:attribute name="desc" type="xsd:string"/>
160160
<xsd:attribute name="with" type="xsd:string"/>
161161
<xsd:attribute name="forceDisplay" type="xsd:boolean" default="false"/>
162+
<xsd:attribute name="showControls" type="xsd:boolean" default="true"/>
163+
<xsd:attribute name="level" type="gitb:InstructionLevel"/>
162164
</xsd:extension>
163165
</xsd:complexContent>
164166
</xsd:complexType>
@@ -176,6 +178,9 @@
176178
<xsd:attribute name="inputType" type="gitb:InputRequestInputType"/>
177179
<xsd:attribute name="mimeType" type="xsd:string"/>
178180
<xsd:attribute name="required" type="xsd:boolean" default="false"/>
181+
<xsd:attribute name="size" type="xsd:positiveInteger"/>
182+
<xsd:attribute name="default" type="xsd:string"/>
183+
<xsd:attribute name="accept" type="xsd:string"/>
179184
</xsd:complexType>
180185
<xsd:complexType name="TestStepStatus">
181186
<xsd:sequence>

‎gitb-types-specs/src/main/resources/schema/gitb_tdl.xsd‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<!--
3-
~ Copyright (C) 2025 European Union
3+
~ Copyright (C) 2026 European Union
44
~
55
~ Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European Commission - subsequent
66
~ versions of the EUPL (the "Licence"); You may not use this work except in compliance with the Licence.
@@ -36,6 +36,7 @@
3636
<xsd:element name="testcase" type="TestCaseEntry" minOccurs="0" maxOccurs="unbounded"/>
3737
</xsd:sequence>
3838
<xsd:attribute name="id" type="xsd:string" use="required"/>
39+
<xsd:attribute name="order" type="xsd:short"/>
3940
</xsd:complexType>
4041
<xsd:complexType name="TestCaseEntry">
4142
<xsd:sequence>
@@ -343,7 +344,8 @@
343344
<xsd:extension base="TestStep">
344345
<xsd:attribute name="success" type="gitb:BooleanOrVariable" default="false"/>
345346
<xsd:attribute name="undefined" type="gitb:BooleanOrVariable" default="false"/>
346-
</xsd:extension>
347+
<xsd:attribute name="actor" type="gitb:StringOrVariable"/>
348+
</xsd:extension>
347349
</xsd:complexContent>
348350
</xsd:complexType>
349351
<xsd:complexType name="FlowStep">
@@ -400,6 +402,7 @@
400402
<xsd:attribute name="invert" type="xsd:boolean" default="false"/>
401403
<xsd:attribute name="handlerTimeout" type="gitb:NumberOrVariable"/>
402404
<xsd:attribute name="handlerTimeoutFlag" type="gitb:VariableName"/>
405+
<xsd:attribute name="actor" type="gitb:StringOrVariable"/>
403406
</xsd:extension>
404407
</xsd:complexContent>
405408
</xsd:complexType>
@@ -440,6 +443,7 @@
440443
<xsd:attribute name="handler" type="gitb:StringOrVariable"/>
441444
<xsd:attribute name="handlerTimeout" type="gitb:NumberOrVariable"/>
442445
<xsd:attribute name="handlerTimeoutFlag" type="gitb:VariableName"/>
446+
<xsd:attribute name="actor" type="gitb:StringOrVariable"/>
443447
</xsd:extension>
444448
</xsd:complexContent>
445449
</xsd:complexType>
@@ -486,13 +490,17 @@
486490
<xsd:attribute name="invert" type="xsd:boolean" default="false"/>
487491
<xsd:attribute name="handlerTimeout" type="gitb:NumberOrVariable"/>
488492
<xsd:attribute name="handlerTimeoutFlag" type="gitb:VariableName"/>
493+
<xsd:attribute name="actor" type="gitb:StringOrVariable"/>
489494
</xsd:extension>
490495
</xsd:complexContent>
491496
</xsd:complexType>
492497
<xsd:complexType name="Instruction">
493498
<xsd:complexContent>
494499
<xsd:extension base="InstructionOrRequest">
495500
<xsd:attribute name="forceDisplay" type="xsd:boolean" default="false"/>
501+
<xsd:attribute name="showControls" type="xsd:boolean" default="true"/>
502+
<xsd:attribute name="level" type="InstructionLevelOrVariable" />
503+
<xsd:attribute name="report" type="xsd:boolean" default="false"/>
496504
</xsd:extension>
497505
</xsd:complexContent>
498506
</xsd:complexType>
@@ -506,6 +514,9 @@
506514
<xsd:attribute name="report" type="xsd:boolean" default="true"/>
507515
<xsd:attribute name="fileName" type="gitb:StringOrVariable"/>
508516
<xsd:attribute name="required" type="gitb:BooleanOrVariable" default="false"/>
517+
<xsd:attribute name="size" type="gitb:NumberOrVariable"/>
518+
<xsd:attribute name="default" type="gitb:StringOrVariable"/>
519+
<xsd:attribute name="accept" type="gitb:StringOrVariable"/>
509520
</xsd:extension>
510521
</xsd:complexContent>
511522
</xsd:complexType>
@@ -581,6 +592,11 @@
581592
<xsd:pattern value="($[a-zA-Z][a-zA-Z\-_0-9]*(\{[${}a-zA-Z\-._0-9]*\})?)|ERROR|WARNING|INFO|DEBUG"/>
582593
</xsd:restriction>
583594
</xsd:simpleType>
595+
<xsd:simpleType name="InstructionLevelOrVariable">
596+
<xsd:restriction base="xsd:string">
597+
<xsd:pattern value="($[a-zA-Z][a-zA-Z\-_0-9]*(\{[${}a-zA-Z\-._0-9]*\})?)|ERROR|WARNING|INFO|SUCCESS|NONE"/>
598+
</xsd:restriction>
599+
</xsd:simpleType>
584600
<xsd:complexType name="Output">
585601
<xsd:sequence>
586602
<xsd:element name="success" type="OutputCaseSet" minOccurs="0"/>

0 commit comments

Comments
 (0)