jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 56663) Add PageAnnotationImportSystemTest
......................................................................
(Bug 56663) Add PageAnnotationImportSystemTest
Load a XML file to simulate a Special:Import in order to verify necessary
components are integrated and working
Foo-1-19-7.xml contains an export from MW 1.19.7
Change-Id: Ie790be6879b818fda0992a97175d8b955d85e546
---
M SemanticMediaWiki.hooks.php
M tests/phpunit/README.md
R tests/phpunit/integration/FunctionHookDBIntegrationTest.php
R tests/phpunit/integration/ParserFunctionIntegrationTest.php
R tests/phpunit/system/ResourcesTest.php
R tests/phpunit/system/SplAutoloadRegisterTest.php
A tests/phpunit/system/import/Foo-1-19-7.xml
A tests/phpunit/system/import/PageAnnotationImportSystemTest.php
8 files changed, 297 insertions(+), 1 deletion(-)
Approvals:
Mwjames: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SemanticMediaWiki.hooks.php b/SemanticMediaWiki.hooks.php
index 768e231..0860243 100644
--- a/SemanticMediaWiki.hooks.php
+++ b/SemanticMediaWiki.hooks.php
@@ -271,7 +271,7 @@
* @return boolean
*/
public static function registerUnitTests( array &$files ) {
- $directoryIterator = new RecursiveDirectoryIterator( __DIR__ .
'/tests/phpunit/includes/' );
+ $directoryIterator = new RecursiveDirectoryIterator( __DIR__ .
'/tests/phpunit/' );
/**
* @var SplFileInfo $fileInfo
diff --git a/tests/phpunit/README.md b/tests/phpunit/README.md
index 26d47f0..217da08 100644
--- a/tests/phpunit/README.md
+++ b/tests/phpunit/README.md
@@ -1,5 +1,16 @@
[PHPUnit][phpunit] provides the necessary environment to execute the in the
subsequent directories provided unit tests together with the following base
elements. Information about how to work with PHPunit can be found at
[smw.org][smw] and [mediawiki.org][mw].
+### TestTypes
+
+#### Unit test
+Testing technical specifications of a unit, module, or class.
+
+#### Integration test
+An approach where multiple components are combined together to verify the
interplay between those modules.
+
+#### System test
+The system (and its individual modules) is treated as "black-box" in order to
observe its behaviour as a whole rather than its units.
+
### TestCases
#### SemanticMediaWikiTestCase
SemanticMediaWikiTestCase derives directly from PHPUnit_Framework_TestCase and
adds some convenient functions and a assertSemanticData() method.
diff --git a/tests/phpunit/includes/hooks/FunctionHookDBIntegrationTest.php
b/tests/phpunit/integration/FunctionHookDBIntegrationTest.php
similarity index 100%
rename from tests/phpunit/includes/hooks/FunctionHookDBIntegrationTest.php
rename to tests/phpunit/integration/FunctionHookDBIntegrationTest.php
diff --git
a/tests/phpunit/includes/parserhooks/ParserFunctionIntegrationTest.php
b/tests/phpunit/integration/ParserFunctionIntegrationTest.php
similarity index 100%
rename from tests/phpunit/includes/parserhooks/ParserFunctionIntegrationTest.php
rename to tests/phpunit/integration/ParserFunctionIntegrationTest.php
diff --git a/tests/phpunit/includes/resources/ResourcesTest.php
b/tests/phpunit/system/ResourcesTest.php
similarity index 100%
rename from tests/phpunit/includes/resources/ResourcesTest.php
rename to tests/phpunit/system/ResourcesTest.php
diff --git a/tests/phpunit/includes/SplAutoloadRegisterTest.php
b/tests/phpunit/system/SplAutoloadRegisterTest.php
similarity index 100%
rename from tests/phpunit/includes/SplAutoloadRegisterTest.php
rename to tests/phpunit/system/SplAutoloadRegisterTest.php
diff --git a/tests/phpunit/system/import/Foo-1-19-7.xml
b/tests/phpunit/system/import/Foo-1-19-7.xml
new file mode 100644
index 0000000..9e9ccf6
--- /dev/null
+++ b/tests/phpunit/system/import/Foo-1-19-7.xml
@@ -0,0 +1,112 @@
+<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.6/";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.6/
http://www.mediawiki.org/xml/export-0.6.xsd"; version="0.6" xml:lang="en-gb">
+ <siteinfo>
+ <sitename>MW-19</sitename>
+ <base>http://localhost:8080/mw-19/index.php/Main_Page</base>
+ <generator>MediaWiki 1.19.7</generator>
+ <case>first-letter</case>
+ <namespaces>
+ <namespace key="-2" case="first-letter">Media</namespace>
+ <namespace key="-1" case="first-letter">Special</namespace>
+ <namespace key="0" case="first-letter" />
+ <namespace key="1" case="first-letter">Talk</namespace>
+ <namespace key="2" case="first-letter">User</namespace>
+ <namespace key="3" case="first-letter">User talk</namespace>
+ <namespace key="4" case="first-letter">MW-19</namespace>
+ <namespace key="5" case="first-letter">MW-19 talk</namespace>
+ <namespace key="6" case="first-letter">File</namespace>
+ <namespace key="7" case="first-letter">File talk</namespace>
+ <namespace key="8" case="first-letter">MediaWiki</namespace>
+ <namespace key="9" case="first-letter">MediaWiki talk</namespace>
+ <namespace key="10" case="first-letter">Template</namespace>
+ <namespace key="11" case="first-letter">Template talk</namespace>
+ <namespace key="12" case="first-letter">Help</namespace>
+ <namespace key="13" case="first-letter">Help talk</namespace>
+ <namespace key="14" case="first-letter">Category</namespace>
+ <namespace key="15" case="first-letter">Category talk</namespace>
+ <namespace key="102" case="first-letter">Property</namespace>
+ <namespace key="103" case="first-letter">Property talk</namespace>
+ <namespace key="108" case="first-letter">Concept</namespace>
+ <namespace key="109" case="first-letter">Concept talk</namespace>
+ <namespace key="160" case="first-letter">Foo</namespace>
+ <namespace key="161" case="first-letter">Foo talk</namespace>
+ </namespaces>
+ </siteinfo>
+ <page>
+ <title>Foo-1-19-7</title>
+ <ns>0</ns>
+ <id>158</id>
+ <sha1>kyhp4t0b6nu2rvzftnzcxnbrxxwfa9d</sha1>
+ <revision>
+ <id>399</id>
+ <timestamp>2013-11-07T23:09:16Z</timestamp>
+ <contributor>
+ <ip>127.0.0.1</ip>
+ </contributor>
+ <text xml:space="preserve" bytes="267">[[Quux::garply]],
{{#subobject:|Qeey=bam}}, {{#show: Foo-1-19-7|?Foo}}, {{#ask: [[Modification
date::+]]|?Modification date}}
+
+{{FooTemplate|Foo=bar}}, {{FooSubobject|Qeey=bam}},
{{FooShow|Page=Foo-1-19-7}}, {{FooAsk|Query=[[Modification date::+]]}}
+
+[[Category:Foo]]</text>
+ </revision>
+ </page>
+ <page>
+ <title>Template:FooAsk</title>
+ <ns>10</ns>
+ <id>163</id>
+ <sha1>rxf4lv2hmwxsgr5n4wk6oiqcpgk5gcq</sha1>
+ <revision>
+ <id>394</id>
+ <timestamp>2013-11-07T19:39:59Z</timestamp>
+ <contributor>
+ <ip>127.0.0.1</ip>
+ </contributor>
+ <comment>Created page with "{{#ask: {{{Query}}} |?Modification
date}}"</comment>
+ <text xml:space="preserve" bytes="41">{{#ask: {{{Query}}} |?Modification
date}}</text>
+ </revision>
+ </page>
+ <page>
+ <title>Template:FooShow</title>
+ <ns>10</ns>
+ <id>162</id>
+ <sha1>lmye013mwzch8f6pzb1zpirqmaju4y4</sha1>
+ <revision>
+ <id>393</id>
+ <timestamp>2013-11-07T19:38:58Z</timestamp>
+ <contributor>
+ <ip>127.0.0.1</ip>
+ </contributor>
+ <comment>Created page with "{{#show: {{{Page}}}
|?Foo}}"</comment>
+ <text xml:space="preserve" bytes="27">{{#show: {{{Page}}} |?Foo}}</text>
+ </revision>
+ </page>
+ <page>
+ <title>Template:FooSubobject</title>
+ <ns>10</ns>
+ <id>161</id>
+ <sha1>0ae8yc3i99f9n266mhtwnt63unxvsa5</sha1>
+ <revision>
+ <id>392</id>
+ <timestamp>2013-11-07T19:37:53Z</timestamp>
+ <contributor>
+ <ip>127.0.0.1</ip>
+ </contributor>
+ <comment>Created page with "{{#subobject:|Qeey={{{Qeey}}}
}}"</comment>
+ <text xml:space="preserve" bytes="32">{{#subobject:|Qeey={{{Qeey}}}
}}</text>
+ </revision>
+ </page>
+ <page>
+ <title>Template:FooTemplate</title>
+ <ns>10</ns>
+ <id>160</id>
+ <sha1>c2jf6txk9oex7bcfoggqg31n7fm9kxn</sha1>
+ <revision>
+ <id>391</id>
+ <timestamp>2013-11-07T19:34:39Z</timestamp>
+ <contributor>
+ <ip>127.0.0.1</ip>
+ </contributor>
+ <comment>Created page with "[[Foo::{{{Foo}}}]]"</comment>
+ <text xml:space="preserve" bytes="18">[[Foo::{{{Foo}}}]]</text>
+ </revision>
+ </page>
+</mediawiki>
diff --git a/tests/phpunit/system/import/PageAnnotationImportSystemTest.php
b/tests/phpunit/system/import/PageAnnotationImportSystemTest.php
new file mode 100644
index 0000000..8fe9789
--- /dev/null
+++ b/tests/phpunit/system/import/PageAnnotationImportSystemTest.php
@@ -0,0 +1,173 @@
+<?php
+
+namespace SMW\Test;
+
+use SMw\SemanticData;
+use SMW\ParserData;
+
+use ImportStreamSource;
+use ImportReporter;
+use WikiImporter;
+use MWException;
+use RequestContext;
+use WikiPage;
+use Title;
+use User;
+
+/**
+ * This test is being used to run a sanity check to verify that necessary
+ * components (hooks, extensions etc.) do act according to their specification
+ * when content is imported
+ *
+ * @ingroup Test
+ *
+ * @group SMW
+ * @group SMWExtension
+ * @group Database
+ * @group medium
+ *
+ * @licence GNU GPL v2+
+ * @since 1.9
+ *
+ * @author mwjames
+ */
+class PageAnnotationImportSystemTest extends \MediaWikiTestCase {
+
+ /**
+ * @dataProvider importProvider
+ *
+ * @since 1.9
+ */
+ public function testImportRunner( $setup, $expected ) {
+
+ $title = Title::newFromText( $setup['title'] );
+
+ $this->assertFalse(
+ $title->exists(),
+ 'Asserts that the Title does not exist prior the import'
+ );
+
+ $this->assertTrue( $this->runImporter( $setup['file'] ) );
+
+ $this->assertTrue(
+ $title->exists(),
+ 'Asserts that the Title does exist after the import'
+ );
+
+ // FIXME Apparently accessing the Store using the DB unit test
table
+ // will cause:
+ //
+ // DBQueryError: A database error has occurred.
+ // Function: SMW::getSemanticData
+ // Error: 1137 Can't reopen table: 'p' (localhost)
+ //
+ // We suspend running this particular test until it is clear
what
+ // is causing this issue
+ // SMW_SQLStore3_Readers.php:328 is causing the error
+
+ // $this->assertPropertiesAreSet(
+ // $this->fetchSemanticDataFromOutput( $title ),
+ // $expected
+ // );
+
+ }
+
+ /**
+ * @since 1.9
+ */
+ protected function runImporter( $file ) {
+
+ $source = ImportStreamSource::newFromFile( $file );
+
+ $this->assertTrue(
+ $source->isGood(),
+ 'Assert that the source was available'
+ );
+
+ $importer = new WikiImporter( $source->value );
+
+ $reporter = new ImportReporter(
+ $importer,
+ false,
+ '',
+ false
+ );
+
+ $reporter->setContext( new RequestContext() );
+ $exception = false;
+
+ $reporter->open();
+
+ try {
+ $importer->doImport();
+ } catch ( MWException $e ) {
+ $exception = $e;
+ }
+
+ $result = $reporter->close();
+
+ $this->assertTrue(
+ $result->isGood(),
+ 'Asserts that the import was successful'
+ );
+
+ return true;
+ }
+
+ /**
+ * @since 1.9
+ */
+ protected function fetchSemanticDataFromOutput( Title $title ) {
+
+ $wikiPage = WikiPage::factory( $title );
+ $revision = $wikiPage->getRevision();
+
+ $parserOutput = $wikiPage->getParserOutput(
+ $wikiPage->makeParserOptions( User::newFromId(
$revision->getUser() ) ),
+ $revision->getId()
+ );
+
+ $parserData = new ParserData( $title, $parserOutput );
+
+ return $parserData->getData();
+ }
+
+ /**
+ * @since 1.9
+ */
+ protected function assertPropertiesAreSet( SemanticData $semanticData,
array $expected ) {
+
+ foreach ( $semanticData->getProperties() as $property ) {
+
+ $this->assertInstanceOf( '\SMW\DIProperty', $property );
+
+ $this->assertContains(
+ $property->getKey(),
+ $expected['propertyKey'],
+ 'Asserts that a specific property key is set'
+ );
+
+ }
+ }
+
+ /**
+ * @return array
+ */
+ public function importProvider() {
+
+ $provider = array();
+
+ $provider[] = array(
+ array(
+ 'file' => __DIR__ . '/' . 'Foo-1-19-7.xml',
+ 'title' => 'Foo-1-19-7'
+ ),
+ array(
+ 'propertyKey' => array( 'Foo', 'Quux', '_ASK',
'_LEDT', '_MDAT', '_SKEY', '_SOBJ', '_INST' ),
+ )
+ );
+
+ return $provider;
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/94176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie790be6879b818fda0992a97175d8b955d85e546
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Mwjames <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
