Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
XWiki
xwiki-rendering
Commits
c56c5991
Unverified
Commit
c56c5991
authored
Jan 18, 2022
by
Thomas Mortagne
Committed by
GitHub
Jan 18, 2022
Browse files
Merge pull request #200 from michitux/XRENDERING-639
parents
153dd915
da1fa26b
Changes
1
Hide whitespace changes
Inline
Side-by-side
xwiki-rendering-test/src/main/java/org/xwiki/rendering/test/cts/TestDataParser.java
View file @
c56c5991
...
...
@@ -139,9 +139,13 @@ public List<TestData> parseSingleTestData(String syntaxDirectory, String ctsRoot
// If the inherit configuration property is set and if the returned syntax is empty load from the inherit
// syntax.
if
(
configuration
.
inheritSyntax
!=
null
)
{
TestDataConfiguration
currentConfiguration
=
configuration
;
while
((
testDataIN
.
syntaxData
==
null
||
testDataOUT
.
syntaxData
==
null
)
&&
currentConfiguration
.
inheritSyntax
!=
null
)
{
final
String
inheritedSyntaxDirectory
=
computeSyntaxDirectory
(
currentConfiguration
.
inheritSyntax
);
Pair
<
Pair
<
String
,
String
>,
Pair
<
String
,
String
>>
inheritedSyntaxData
=
readDataForPrefix
(
compu
teSyntaxDirectory
(
configuration
.
inheritSyntax
)
+
SLASH
+
relativeDirectoryName
,
readDataForPrefix
(
inheri
te
d
SyntaxDirectory
+
SLASH
+
relativeDirectoryName
,
configuration
.
fileExtension
,
classLoader
);
if
(
testDataIN
.
syntaxData
==
null
)
{
testDataIN
.
syntaxData
=
inheritedSyntaxData
.
getLeft
().
getLeft
();
...
...
@@ -151,6 +155,13 @@ public List<TestData> parseSingleTestData(String syntaxDirectory, String ctsRoot
testDataOUT
.
syntaxData
=
inheritedSyntaxData
.
getRight
().
getLeft
();
testDataOUT
.
syntaxExtension
=
inheritedSyntaxData
.
getRight
().
getRight
();
}
try
{
currentConfiguration
=
parseTestConfiguration
(
inheritedSyntaxDirectory
,
ctsRootPackageName
,
classLoader
);
}
catch
(
Exception
ignored
)
{
break
;
}
}
List
<
TestData
>
result
=
new
ArrayList
<>();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment