Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed tabs from prerelease 8.3.0 and corrected testlib 2.0.0, 2.1.0, 3.0.0 to properly test conflicts for lazy partners #172

Merged
merged 2 commits into from
Apr 27, 2024
Merged

Removed tabs from prerelease 8.3.0 and corrected testlib 2.0.0, 2.1.0, 3.0.0 to properly test conflicts for lazy partners #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce5a1ac
Updated the testlib and removed tabs from 8.3.0 wiki prerelease
VisLab Apr 27, 2024
0e9f00c
Updated the differences and xml for prerelease
VisLab Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions library_schemas/testlib/hedwiki/HED_testlib_2.0.0.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,10 @@ This schema tests the ordering effects of various combinations of rooted and ext
* Flute-subsound2
* Flute-subsound1

'''C-nonextension''' <nowiki>[These should not be sorted. C should be last]</nowiki>
* SubnodeC3
* SubnodeC1
* SubnodeC2

'''B-extensionallowed''' <nowiki>{extensionAllowed}[These should be sorted. This section should be second.]</nowiki>
* SubnodeE3
* SubnodeE1
* SubnodeE2

'''A-extensionallowed''' <nowiki>{extensionAllowed} [These should be sorted. This section should be first.]</nowiki>
* SubnodeD3
'''D-extensionallowed''' <nowiki>{extensionAllowed} [These should be sorted. This section should be first.]</nowiki>
* SubnodeD1
* SubnodeD2
* SubnodeD3

!# end schema

Expand Down
2 changes: 1 addition & 1 deletion library_schemas/testlib/hedwiki/HED_testlib_2.1.0.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This schema is designed to conflict with testlib 2.0.0 and testlib 3.0.0.
* SubnodeB1A
* SubnodeB2A

'''A-nonextension''' <nowiki>[These should not be sorted. A should be second]</nowiki>
'''A-nonextension''' <nowiki>[These should not be sorted. A should be second. Conflicts with testlib 2.0.0.]</nowiki>
* SubnodeA3
* SubnodeA1
* SubnodeA2
Expand Down
8 changes: 4 additions & 4 deletions library_schemas/testlib/hedwiki/HED_testlib_3.0.0.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ This schema is designed to be lazy partnered with testlib_2.0.0 but conflicts wi
* SubnodeE1
* SubnodeE2

'''D-nonextension'''
* SubnodeD3
* SubnodeD1
* SubnodeD2
'''F-nonextension'''
* SubnodeF6
* SubnodeF1
* SubnodeF2


!# end schema
Expand Down
63 changes: 1 addition & 62 deletions library_schemas/testlib/hedxml/HED_testlib_2.0.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,35 +139,6 @@
</attribute>
</node>
</node>
<node>
<name>C-nonextension</name>
<description>These should not be sorted. C should be last</description>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
<node>
<name>SubnodeC3</name>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
</node>
<node>
<name>SubnodeC1</name>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
</node>
<node>
<name>SubnodeC2</name>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
</node>
</node>
<node>
<name>Action</name>
<description>Do something.</description>
Expand Down Expand Up @@ -874,7 +845,7 @@
</node>
</node>
<node>
<name>A-extensionallowed</name>
<name>D-extensionallowed</name>
<description>These should be sorted. This section should be first.</description>
<attribute>
<name>extensionAllowed</name>
Expand Down Expand Up @@ -905,38 +876,6 @@
</attribute>
</node>
</node>
<node>
<name>B-extensionallowed</name>
<description>These should be sorted. This section should be second.</description>
<attribute>
<name>extensionAllowed</name>
</attribute>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
<node>
<name>SubnodeE1</name>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
</node>
<node>
<name>SubnodeE2</name>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
</node>
<node>
<name>SubnodeE3</name>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
</node>
</node>
<node>
<name>Item</name>
<description>An independently existing thing (living or nonliving).</description>
Expand Down
2 changes: 1 addition & 1 deletion library_schemas/testlib/hedxml/HED_testlib_2.1.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
</node>
<node>
<name>A-nonextension</name>
<description>These should not be sorted. A should be second</description>
<description>These should not be sorted. A should be second. Conflicts with testlib 2.0.0.</description>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
Expand Down
8 changes: 4 additions & 4 deletions library_schemas/testlib/hedxml/HED_testlib_3.0.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,27 +89,27 @@
</node>
</node>
<node>
<name>D-nonextension</name>
<name>F-nonextension</name>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
<node>
<name>SubnodeD3</name>
<name>SubnodeF6</name>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
</node>
<node>
<name>SubnodeD1</name>
<name>SubnodeF1</name>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
</attribute>
</node>
<node>
<name>SubnodeD2</name>
<name>SubnodeF2</name>
<attribute>
<name>inLibrary</name>
<value>testlib</value>
Expand Down
Loading