jenkins-bot has submitted this change and it was merged.
Change subject: Makes sure that created articles in parser tests are unique
......................................................................
Makes sure that created articles in parser tests are unique
Change-Id: I833d884c50af4bda60738ebce4835cf9c00b7bce
---
M lstIncorrectParserTest.txt
M lstParserTests.txt
2 files changed, 41 insertions(+), 32 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lstIncorrectParserTest.txt b/lstIncorrectParserTest.txt
index 74e6cc3..aa2b604 100644
--- a/lstIncorrectParserTest.txt
+++ b/lstIncorrectParserTest.txt
@@ -21,7 +21,7 @@
# Standard articles
!! article
-Sections
+SectionsDuplicates
!! text
1 <section begin=1/>sec 1<section end=1/>
@@ -35,7 +35,7 @@
!! endarticle
!! article
-LsthSections
+LsthSectionsNotASection
!! text
this is the intro
==1==
diff --git a/lstParserTests.txt b/lstParserTests.txt
index cdb55e4..17f7444 100644
--- a/lstParserTests.txt
+++ b/lstParserTests.txt
@@ -175,36 +175,38 @@
!!end
!!article
-template:sub
+template:lst-sub
!!text
<<includeonly>section {{{1}}}=test</includeonly>/>
!!endarticle
+
!!test
LST: Substitute a tag from a template
!!options
pst noxml
!!input
-{{subst:sub|begin}}
+{{subst:lst-sub|begin}}
!!result
<section begin=test/>
!!end
!!article
-sub
+lst-sub
!!text
-begin {{subst:sub|begin}}middle{{subst:sub|end}} end
+begin {{subst:lst-sub|begin}}middle{{subst:lst-sub|end}} end
!!endarticle
+
!!test
LST: Indirect substitution
!!input
-{{#lst:sub|test}}
+{{#lst:lst-sub|test}}
!!result
<p>middle
</p>
!!end
!!article
-nest
+lst-nest
!!text
<section begin=outer/>
I am outer
@@ -213,10 +215,11 @@
<section end=inner/>
<section end=outer/>
!!endarticle
+
!!test
LST: Nested sections - inner section marks removed by tag hook.
!!input
-{{#lst:nest|outer}}
+{{#lst:lst-nest|outer}}
!!result
<p>I am outer
</p><p>inner
@@ -310,6 +313,7 @@
<script>alert("Ownage!");</script>
<section end=ownage />
!!endarticle
+
!!test
LST: javascript
!!input
@@ -320,14 +324,15 @@
!!end
!!article
-slash
+lst-slash
!!text
<section begin="/"/>slash<section end="/"/>
!!endarticle
+
!!test
LST: regexp special chars in section name
!!input
-{{#lst:Slash|/}}
+{{#lst:lst-slash|/}}
!!result
<p>slash
</p>
@@ -337,17 +342,18 @@
# from a regression test (bug 8158). This test will segv if the cycle
# detection code in the extension fails.
!!article
-cycle
+lst-cycle
!!text
-<section begin=cycle/>{{#lst:cycle|cycle}}<section end=cycle/>
+<section begin=cycle/>{{#lst:lst-cycle|cycle}}<section end=cycle/>
!!endarticle
+
!!test
LST: cycle detection
!!options
!!input
-{{#lst:cycle|cycle}}
+{{#lst:lst-cycle|cycle}}
!!result
-<p><span class="error">Template loop detected: <a href="/wiki/Cycle"
title="Cycle">Cycle</a></span>
+<p><span class="error">Template loop detected: <a href="/wiki/Lst-cycle"
title="Lst-cycle">Lst-cycle</a></span>
</p>
!!end
@@ -384,6 +390,7 @@
<p>caps
</p>
!!end
+
!!test
LST: useless options
!!input
@@ -394,7 +401,7 @@
!!end
!!article
-fromsection
+lst-fromsection
!!text
Before...
<section begin="A"/>SectionA<section end="A"/>
@@ -402,11 +409,12 @@
<section begin="C"/>SectionC<section end="C"/>
...After
!!endarticle
+
!!test
LST: inclusion starting at a specified section till the end of article
!!options
!!input
-{{#lst:fromsection|B|}}
+{{#lst:lst-fromsection|B|}}
!!result
<p>SectionB
SectionC
@@ -415,7 +423,7 @@
!!end
!!article
-tosection
+lst-tosection
!!text
Before...
<section begin="A"/>SectionA<section end="A"/>
@@ -423,11 +431,12 @@
<section begin="C"/>SectionC<section end="C"/>
...After
!!endarticle
+
!!test
LST: inclusion from beginning of article to a specified section
!!options
!!input
-{{#lst:tosection||B}}
+{{#lst:lst-tosection||B}}
!!result
<p>Before...
SectionA
@@ -436,7 +445,7 @@
!!end
!! article
-status
+lst-status
!! text
<section begin="latest" />c<section end="latest" />
<section begin="a" />sec a<section end="a" />
@@ -447,28 +456,28 @@
!!test
LST: Allow subtransclusion in lst argument (bug 42481)
!!input
-{{#lst:status|latest}}: {{#lst:status|{{#lst:status|latest}}}}
+{{#lst:lst-status|latest}}: {{#lst:lst-status|{{#lst:lst-status|latest}}}}
!!result
<p>c: sec c
</p>
!!end
!!article
-selfinclusion1
+lst-selfinclusion1
!!text
<section begin="A"/>
Section A begin
-{{#lst:selfinclusion2|B}}
+{{#lst:lst-selfinclusion2|B}}
Section A end
<section end="A"/>
!!endarticle
!!article
-selfinclusion2
+lst-selfinclusion2
!!text
<section begin="B"/>
Section B begin
-{{#lst:selfinclusion1|A}}
+{{#lst:lst-selfinclusion1|A}}
Section B end
<section end="B"/>
!!endarticle
@@ -477,18 +486,18 @@
LST: verify self-inclusion fails
!!options
!!input
-{{#lst:selfinclusion1|A}}
+{{#lst:lst-selfinclusion1|A}}
!!result
<p>Section A begin
</p><p>Section B begin
-<span class="error">Template loop detected: <a href="/wiki/Selfinclusion1"
title="Selfinclusion1">Selfinclusion1</a></span>
+<span class="error">Template loop detected: <a href="/wiki/Lst-selfinclusion1"
title="Lst-selfinclusion1">Lst-selfinclusion1</a></span>
Section B end
</p><p>Section A end
</p>
!!end
!!article
-redirected
+lst-redirected
!!text
#REDIRECT[[Sections]]
!!endarticle
@@ -496,14 +505,14 @@
!!test
LST: Transclude a section via a redirect
!!input
-{{#lst:redirected|1}}
+{{#lst:lst-redirected|1}}
!!result
<p>sec 1
</p>
!!end
!!article
-noinclude
+lst-noinclude
!!text
<noinclude>before</noinclude>
<section begin="a" />sec a<section end="a" />
@@ -513,7 +522,7 @@
!!test
LST: Noinclude tags should not be included - start at section
!!input
-{{#lst:noinclude|a|}}
+{{#lst:lst-noinclude|a|}}
!!result
<p>sec a
</p>
@@ -522,7 +531,7 @@
!!test
LST: Noinclude tags should not be included - end at section
!!input
-{{#lst:noinclude||a}}
+{{#lst:lst-noinclude||a}}
!!result
<p>sec a
</p>
--
To view, visit https://gerrit.wikimedia.org/r/310740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I833d884c50af4bda60738ebce4835cf9c00b7bce
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/LabeledSectionTransclusion
Gerrit-Branch: master
Gerrit-Owner: Tpt <thoma...@hotmail.fr>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
