Module:Convert/tester - Revision history

Johnuniq: fix typo in regex reported by DePiep

2023-04-30T23:44:41Z

fix typo in regex reported by DePiep

← Previous revision		Revision as of 23:44, 30 April 2023
Line 36:		Line 36:
	-- Return text with any strip markers normalized by replacing the		-- Return text with any strip markers normalized by replacing the
	-- unique number with a fixed value so comparisons work.		-- unique number with a fixed value so comparisons work.
	return text:gsub('(\127[^\127]UNIQ[^\127]%-)(%x\+)(-QINU[^\127]*\127)', '%100000000%3')		return text:gsub('(\127[^\127]UNIQ[^\127]%-)(%x+)(-QINU[^\127]*\127)', '%100000000%3')
	end		end

Johnuniq: add prefix parameter to compare so (I hope) |prefix=:* will indent

2021-10-27T06:25:08Z

add prefix parameter to compare so (I hope) |prefix=:* will indent

← Previous revision		Revision as of 06:25, 27 October 2021
Line 264:		Line 264:

	local function _compare(frame, page_pairs)		local function _compare(frame, page_pairs)
			local prefix = frame.args.prefix or '*'
	local function diff_link(title1, title2)		local function diff_link(title1, title2)
	return '<span class="plainlinks">[' ..		return '<span class="plainlinks">[' ..
Line 295:		Line 296:
	end		end
	end		end
	result:add(~~'*'~~ .. link(title1) .. ' • ' .. link(title2) .. ' • ' .. label)		result:add(prefix .. link(title1) .. ' • ' .. link(title2) .. ' • ' .. label)
	end		end
	return result:join('\n')		return result:join('\n')

Johnuniq: show name of template if it was forced

2020-12-15T09:19:20Z

show name of template if it was forced

← Previous revision		Revision as of 09:19, 15 December 2020
Line 67:		Line 67:

	local function status_text(stats)		local function status_text(stats)
	local bgcolor, ignored_text, msg		local bgcolor, ignored_text, msg, ttext
			if stats.template then
			ttext = "'''Using [[Template:" .. stats.template .. "]]:''' "
			else
			ttext = ''
			end
	if stats.fail == 0 then		if stats.fail == 0 then
	if stats.pass == 0 then		if stats.pass == 0 then
Line 86:		Line 91:
	ignored_text = string.format(', %d test%s ignored because expected text is blank', stats.ignored, stats.ignored == 1 and '' or 's')		ignored_text = string.format(', %d test%s ignored because expected text is blank', stats.ignored, stats.ignored == 1 and '' or 's')
	end		end
	return '<span style="font-size:120%;color:white;background-color:' .. bgcolor .. ';">' .. msg .. ignored_text .. '.</span>'		return ttext .. '<span style="font-size:120%;color:white;background-color:' .. bgcolor .. ';">' ..
			msg .. ignored_text .. '.</span>'
	end		end

Line 207:		Line 213:
	return text		return text
	end		end
	local stats = { pass = 0, fail = 0, ignored = 0 }		local stats = { pass = 0, fail = 0, ignored = 0, template = args.template }
	local result = Collection.new()		local result = Collection.new()
	result:add('{\| class="wikitable sortable"')		result:add('{\| class="wikitable sortable"')

Johnuniq: another attempt to normalize any strip markers while not interfering with those needed for rendered text

2020-12-13T06:49:14Z

another attempt to normalize any strip markers while not interfering with those needed for rendered text

← Previous revision		Revision as of 06:49, 13 December 2020
Line 31:		Line 31:
	-- Return text with no leading/trailing whitespace.		-- Return text with no leading/trailing whitespace.
	return text:match("^%s(.-)%s$")		return text:match("^%s(.-)%s$")
			end

			local function normalize(text)
			-- Return text with any strip markers normalized by replacing the
		⚫	-- unique number with a fixed value so comparisons work.
		⚫	return text:gsub('(\127[^\127]UNIQ[^\127]%-)(%x\+)(-QINU[^\127]*\127)', '%100000000%3')
	end		end

Line 43:		Line 49:
	stats.ignored = stats.ignored + 1		stats.ignored = stats.ignored + 1
	return '', actual		return '', actual
	elseif expected == actual then		elseif normalize(expected) == normalize(actual) then
	stats.pass = stats.pass + 1		stats.pass = stats.pass + 1
	actual = ''		actual = ''
Line 149:		Line 155:
	result = result:gsub('\n', '\\n')		result = result:gsub('\n', '\\n')
	end		end
			return result
⚫	-- ~~Normalize any strip markers by replacing the~~ unique number with a fixed value so comparisons work.
⚫	return ~~result~~:gsub('(\127[^\127]UNIQ[^\127]%-)(%x\+)(-QINU[^\127]*\127)', '%100000000%3')
	end		end

Line 219:		Line 224:
	result:add('\|-')		result:add('\|-')
	result:add('\| align="center"\| (above, nowiki)')		result:add('\| align="center"\| (above, nowiki)')
	result:add('\| ' .. nowiki_cell(expected, true))		result:add('\| ' .. nowiki_cell(normalize(expected), true))
	result:add('\| ' .. nowiki_cell(actual, true))		result:add('\| ' .. nowiki_cell(normalize(actual), true))
	result:add('\|')		result:add('\|')
	end		end

Johnuniq: normalize any strip markers so comparisons work; use new-fangled Collection

2020-12-12T08:46:14Z

normalize any strip markers so comparisons work; use new-fangled Collection

← Previous revision		Revision as of 08:46, 12 December 2020
Line 6:		Line 6:
	-- then executing run_tests (or make_tests).		-- then executing run_tests (or make_tests).

	local ~~function~~ ~~collection()~~		local Collection = {}
			Collection.__index = Collection
	-- Return a table to hold lines of text.
			do
	return {
			function Collection:add(item)
	n = 0,
			if item ~= nil then
	add = function (self, s)
	self.n = self.n + 1		self.n = self.n + 1
	self[self.n] = s		self[self.n] = item
	end,		end
		⚫	end
	join = function (self, sep)
			function Collection:join(sep)
	return table.concat(self, sep)		return table.concat(self, sep)
⚫	end,
	}		end
			function Collection.new()
			return setmetatable({n = 0}, Collection)
			end
	end		end

Line 146:		Line 149:
	result = result:gsub('\n', '\\n')		result = result:gsub('\n', '\\n')
	end		end
			-- Normalize any strip markers by replacing the unique number with a fixed value so comparisons work.
	return result
			return result:gsub('(\127[^\127]UNIQ[^\127]%-)(%x\+)(-QINU[^\127]*\127)', '%100000000%3')
	end		end

Line 161:		Line 165:
	end		end
	end		end
	local result = ~~collection~~()		local result = Collection.new()
	for _, item in ipairs(all_tests) do		for _, item in ipairs(all_tests) do
	local template = item[1]		local template = item[1]
Line 199:		Line 203:
	end		end
	local stats = { pass = 0, fail = 0, ignored = 0 }		local stats = { pass = 0, fail = 0, ignored = 0 }
	local result = ~~collection~~()		local result = Collection.new()
	result:add('{\| class="wikitable sortable"')		result:add('{\| class="wikitable sortable"')
	result:add('! Template !! Expected !! Actual, if different !! Status')		result:add('! Template !! Expected !! Actual, if different !! Status')
Line 262:		Line 266:
	return '<span style="color:' .. color .. ';">' .. text .. '</span>'		return '<span style="color:' .. color .. ';">' .. text .. '</span>'
	end		end
	local result = ~~collection~~()		local result = Collection.new()
	for _, item in ipairs(page_pairs) do		for _, item in ipairs(page_pairs) do
	local label		local label
Line 356:		Line 360:
	end		end
	local template_count = 0		local template_count = 0
	local all_tests = ~~collection~~()		local all_tests = Collection.new()
	for line in (tests):gmatch('([^\n]-)[\t\r ]*\n') do		for line in (tests):gmatch('([^\n]-)[\t\r ]*\n') do
	local template, expected = line:match('^({{.-}})%s(.-)%s$')		local template, expected = line:match('^({{.-}})%s(.-)%s$')

Izno: sortable

2020-12-11T23:19:00Z

sortable

← Previous revision		Revision as of 23:19, 11 December 2020
Line 200:		Line 200:
	local stats = { pass = 0, fail = 0, ignored = 0 }		local stats = { pass = 0, fail = 0, ignored = 0 }
	local result = collection()		local result = collection()
	result:add('{\| class="wikitable"')		result:add('{\| class="wikitable sortable"')
	result:add('! Template !! Expected !! Actual, if different !! Status')		result:add('! Template !! Expected !! Actual, if different !! Status')
	for _, item in ipairs(all_tests) do		for _, item in ipairs(all_tests) do

Johnuniq: add test item from c:Module:Convert/tester so modules are the same

2018-06-02T05:08:36Z

add test item from c:Module:Convert/tester so modules are the same

← Previous revision		Revision as of 05:08, 2 June 2018
Line 390:		Line 390:
	'Countries/Africa',		'Countries/Africa',
	'Countries/Americas',		'Countries/Americas',
			'Countries/Arab world',
	'Countries/Asia',		'Countries/Asia',
	'Countries/Caribbean',		'Countries/Caribbean',

Johnuniq: allow test=xxx to be injected into the template under test so previewing make_test need not show preview errors; include 'countries' for c:Module:Countries

2017-11-02T07:06:33Z

allow test=xxx to be injected into the template under test so previewing make_test need not show preview errors; include 'countries' for c:Module:Countries

← Previous revision		Revision as of 07:06, 2 November 2017
Line 80:		Line 80:
	end		end

	local function run_template(frame, template, ~~forcename~~, collapse_multiline)		local function run_template(frame, template, args, collapse_multiline)
	-- Template "{{ example \| 2 = def \| abc \| name = ghi jkl }}"		-- Template "{{ example \| 2 = def \| abc \| name = ghi jkl }}"
	-- gives ~~args~~ { " abc ", "def", name = "ghi jkl" }.		-- gives xargs { " abc ", "def", name = "ghi jkl" }.
	if template:sub(1, 2) == '{{' and template:sub(-2, -1) == '}}' then		if template:sub(1, 2) == '{{' and template:sub(-2, -1) == '}}' then
	template = template:sub(3, -3) .. '\|' -- append sentinel to get last field		template = template:sub(3, -3) .. '\|' -- append sentinel to get last field
Line 88:		Line 88:
	return '(invalid template)'		return '(invalid template)'
	end		end
	local ~~args~~ = {}		local xargs = {}
	local index = 1		local index = 1
	local templatename		local templatename
Line 101:		Line 101:
	end		end
	end		end
	~~args~~[k] = v		xargs[k] = v
	end		end
	template = template:gsub('(%[%[[^%[%]]-)\|(.-%]%])', '%1\0%2') -- replace pipe in piped link with a zero byte		template = template:gsub('(%[%[[^%[%]]-)\|(.-%]%])', '%1\0%2') -- replace pipe in piped link with a zero byte
Line 107:		Line 107:
	field = field:gsub('%z', '\|') -- restore pipe in piped link		field = field:gsub('%z', '\|') -- restore pipe in piped link
	if templatename == nil then		if templatename == nil then
	templatename = ~~forcename~~ or strip(field)		templatename = args.template or strip(field)
	if templatename == '' then		if templatename == '' then
	return '(invalid template)'		return '(invalid template)'
Line 122:		Line 122:
	end		end
	else		else
	while ~~args~~[index] ~= nil do		while xargs[index] ~= nil do
	-- Skip any explicit numbered parameters like "\|5=five".		-- Skip any explicit numbered parameters like "\|5=five".
	index = index + 1		index = index + 1
Line 129:		Line 129:
	end		end
	end		end
			end
			if args.test and not xargs.test then
			-- For convert, allow test=preview or test=nopreview to be injected into
			-- the convert under test, if it does not already use that parameter.
			-- That allows, for example, a preview of make_tests to show nopreview results.
			xargs.test = args.test
	end		end
	local function expand(t)		local function expand(t)
	return frame:expandTemplate(t)		return frame:expandTemplate(t)
	end		end
	local ok, result = pcall(expand, { title = templatename, args = ~~args~~ })		local ok, result = pcall(expand, { title = templatename, args = xargs })
	if not ok then		if not ok then
	result = 'Error: ' .. result		result = 'Error: ' .. result
Line 143:		Line 149:
	end		end

	local function _make_tests(frame, all_tests, ~~forcename~~)		local function _make_tests(frame, all_tests, args)
	local maxlen = 38		local maxlen = 38
	for _, item in ipairs(all_tests) do		for _, item in ipairs(all_tests) do
Line 159:		Line 165:
	local template = item[1]		local template = item[1]
	if template then		if template then
	local actual = run_template(frame, template, ~~forcename~~, true)		local actual = run_template(frame, template, args, true)
	local pad = string.rep(' ', maxlen - item.templen) .. ' '		local pad = string.rep(' ', maxlen - item.templen) .. ' '
	result:add(template .. pad .. actual)		result:add(template .. pad .. actual)
Line 173:		Line 179:
	end		end

	local function _run_tests(frame, all_tests, ~~forcename~~)		local function _run_tests(frame, all_tests, args)
	local function safe_cell(text, multiline)		local function safe_cell(text, multiline)
	-- For testing {{convert}}, want wikitext like '[[kilogram\|kg]]' to be unchanged		-- For testing {{convert}}, want wikitext like '[[kilogram\|kg]]' to be unchanged
Line 199:		Line 205:
	local template, expected = item[1], item[2] or ''		local template, expected = item[1], item[2] or ''
	if template then		if template then
	local actual = run_template(frame, template, ~~forcename~~, true)		local actual = run_template(frame, template, args, true)
	local sbox, actual, isfail = status_box(stats, expected, actual)		local sbox, actual, isfail = status_box(stats, expected, actual)
	result:add('\|-')		result:add('\|-')
Line 367:		Line 373:

	local function main(frame, p, worker)		local function main(frame, p, worker)
	local args = frame.args
	local ok, result = pcall(get_tests, frame, p.tests)		local ok, result = pcall(get_tests, frame, p.tests)
	if ok then		if ok then
	ok, result = pcall(worker, frame, result, ~~args~~.~~template~~)		ok, result = pcall(worker, frame, result, frame.args)
	if ok then		if ok then
	return result		return result
Line 381:		Line 386:
	-- For convenience, a key defined here can be used to refer to the		-- For convenience, a key defined here can be used to refer to the
	-- corresponding list of modules.		-- corresponding list of modules.
			countries = { -- Commons
			'Countries',
			'Countries/Africa',
			'Countries/Americas',
			'Countries/Asia',
			'Countries/Caribbean',
			'Countries/Central America',
			'Countries/Europe',
			'Countries/North America',
			'Countries/North America (subcontinent)',
			'Countries/Oceania',
			'Countries/South America',
			'Countries/United Kingdom',
			},
	convert = {		convert = {
	'Convert',		'Convert',

Johnuniq: continue testing other modules if a module does not exist

2017-09-15T03:37:23Z

continue testing other modules if a module does not exist

← Previous revision		Revision as of 03:37, 15 September 2017
Line 226:		Line 226:
	end		end

	local function get_page_content(page_title)		local function get_page_content(page_title, ignore_error)
	local t = mw.title.new(page_title)		local t = mw.title.new(page_title)
	if t then		if t then
Line 237:		Line 237:
	end		end
	end		end
			if not ignore_error then
	error('Could not read wikitext from "[[' .. page_title .. ']]".', 0)		error('Could not read wikitext from "[[' .. page_title .. ']]".', 0)
			end
	end		end

Line 262:		Line 264:
	label = message('same title', false)		label = message('same title', false)
	else		else
	local content1 = get_page_content(title1)		local content1 = get_page_content(title1, true)
	local content2 = get_page_content(title2)		local content2 = get_page_content(title2, true)
	if content1 == content2 then		if not content1 or not content2 then
			label = message('does not exist', false)
			elseif content1 == content2 then
	label = message('same content', true)		label = message('same content', true)
	else		else

Johnuniq: define team keyword for Module:Team appearances list modules

2016-11-26T06:02:19Z

define team keyword for Module:Team appearances list modules

← Previous revision		Revision as of 06:02, 26 November 2016
Line 394:		Line 394:
	'Citation/CS1/Whitelist',		'Citation/CS1/Whitelist',
	'Citation/CS1/Date validation',		'Citation/CS1/Date validation',
			},
			team = {
			'Team appearances list',
			'Team appearances list/data',
			'Team appearances list/show',
	},		},
	val = {		val = {