[MediaWiki-commits] [Gerrit] mediawiki...LabeledSectionTransclusion[master]: Makes sure that created articles in parser tests are unique

2016-09-15 Thread jenkins-bot (Code Review)
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 sec 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
 
!!endarticle + !!test LST: Substitute a tag from a template !!options pst noxml !!input -{{subst:sub|begin}} +{{subst:lst-sub|begin}} !!result !!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 middle !!end !!article -nest +lst-nest !!text I am outer @@ -213,10 +215,11 @@ !!endarticle + !!test LST: Nested sections - inner section marks removed by tag hook. !!input -{{#lst:nest|outer}} +{{#lst:lst-nest|outer}} !!result I am outer inner @@ -310,6 +313,7 @@ alert("Ownage!"); !!endarticle + !!test LST: javascript !!input @@ -320,14 +324,15 @@ !!end !!article -slash +lst-slash !!text slash !!endarticle + !!test LST: regexp special chars in section name !!input -{{#lst:Slash|/}} +{{#lst:lst-slash|/}} !!result slash @@ -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 -{{#lst:cycle|cycle}} +{{#lst:lst-cycle|cycle}} !!endarticle + !!test LST: cycle detection !!options !!input -{{#lst:cycle|cycle}} +{{#lst:lst-cycle|cycle}} !!result -Template loop detected: Cycle +Template loop detected: Lst-cycle !!end @@ -384,6 +390,7 @@ caps !!end + !!test LST: useless options !!input @@ -394,7 +401,7 @@ !!end !!article -fromsection +lst-fromsection !!text Before... SectionA @@ -402,11 +409,12 @@ SectionC ...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 SectionB SectionC @@ -415,7 +423,7 @@ !!end !!article -tosection +lst-tosection !!text Before... SectionA @@ -423,11 +431,12 @@ SectionC ...After !!endarticle + !!test LST: inclusion from beginning of article to a specified section !!options !!input -{{#lst:tosection||B}} +{{#lst:lst-tosection||B}} !!result Before... SectionA @@ -436,7 +445,7 @@ !!end !! article -status +lst-status !! text c sec 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 c: sec c !!end !!article -selfinclusion1 +lst-selfinclusion1 !!text Section A begin -{{#lst:selfinclusion2|B}} +{{#lst:lst-selfinclusion2|B}} Section A end !!endarticle !!article -selfinclusion2 +lst-selfinclusion2 !!text Section B begin -{{#lst:selfinclusion1|A}} +{{#lst:lst-selfinclusion1|A}} Section B end !!endarticle @@ -477,18 +486,18 @@ LST: verify self-inclusion fails !!options !!input -{{#lst:selfinclusion1|A}} +{{#lst:lst-selfinclusion1|A}} !!result Section A begin Section B begin -Template loop detected: Selfinclusion1 +Template loop detected: Lst-selfinclusion1 Section B end Section A end !!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 sec 1 !!end !!article -noinclude +lst-noinclude !!text before sec 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 sec a @@ -522,7 +531,7 @@ !!test LST: Noinclude tags should not be included - end at section !!input -{{#lst:noinclude||a}} +{{#lst:lst-noinclude||a}} !!result sec a -- To view, visit https://gerrit.wikimedia.org/r/310740 To unsubscribe, visit

[MediaWiki-commits] [Gerrit] mediawiki...LabeledSectionTransclusion[master]: Makes sure that created articles in parser tests are unique

2016-09-15 Thread Tpt (Code Review)
Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310740

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
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LabeledSectionTransclusion
 refs/changes/40/310740/1

diff --git a/lstIncorrectParserTest.txt b/lstIncorrectParserTest.txt
index 74e6cc3..8e366d8 100644
--- a/lstIncorrectParserTest.txt
+++ b/lstIncorrectParserTest.txt
@@ -21,7 +21,7 @@
 
 # Standard articles
 !! article
-Sections
+SectionsDuplicates
 !! text
 1 sec 1
 

-- 
To view, visit https://gerrit.wikimedia.org/r/310740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I833d884c50af4bda60738ebce4835cf9c00b7bce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LabeledSectionTransclusion
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits