Revert "Remove meaningless @test annotation"

This reverts commit 6bcea51e.

tests/lib/AutoloadModulesTest.php

@@ -18,6 +18,7 @@ class AutoloadModulesTest extends TestCase
     }
 
     /**
+     * @test
      * @runInSeparateProcess
      * @return void
      */
@@ -27,6 +28,7 @@ class AutoloadModulesTest extends TestCase
     }
 
     /**
+     * @test
      * @return void
      */
     public function autoloaderSubstitutesNamespacedXmlSecClassesWhereNonNamespacedClassWasUsed()

tests/lib/SimpleSAML/Auth/SimpleTest.php

@@ -9,6 +9,7 @@ namespace SimpleSAML\Test\Auth;
 class SimpleTest extends \SimpleSAML\Test\Utils\ClearStateTestCase
 {
     /**
+     * @test
      * @return void
      */
     public function testGetProcessedURL()

tests/lib/SimpleSAML/DatabaseTest.php

@@ -80,6 +80,7 @@ class DatabaseTest extends TestCase
      * @covers SimpleSAML\Database::generateInstanceId
      * @covers SimpleSAML\Database::__construct
      * @covers SimpleSAML\Database::connect
+     * @test
      * @return void
      */
     public function connectionFailure()
@@ -104,6 +105,7 @@ class DatabaseTest extends TestCase
      * @covers SimpleSAML\Database::generateInstanceId
      * @covers SimpleSAML\Database::__construct
      * @covers SimpleSAML\Database::connect
+     * @test
      * @return void
      */
     public function instances()
@@ -173,6 +175,7 @@ class DatabaseTest extends TestCase
      * @covers SimpleSAML\Database::__construct
      * @covers SimpleSAML\Database::connect
      * @covers SimpleSAML\Database::getSlave
+     * @test
      * @return void
      */
     public function slaves()
@@ -215,6 +218,7 @@ class DatabaseTest extends TestCase
 
     /**
      * @covers SimpleSAML\Database::applyPrefix
+     * @test
      * @return void
      */
     public function prefix()
@@ -232,6 +236,7 @@ class DatabaseTest extends TestCase
      * @covers SimpleSAML\Database::read
      * @covers SimpleSAML\Database::exec
      * @covers SimpleSAML\Database::query
+     * @test
      * @return void
      */
     public function querying()
@@ -264,6 +269,7 @@ class DatabaseTest extends TestCase
     /**
      * @covers SimpleSAML\Database::read
      * @covers SimpleSAML\Database::query
+     * @test
      * @return void
      */
     public function readFailure()
@@ -279,6 +285,7 @@ class DatabaseTest extends TestCase
     /**
      * @covers SimpleSAML\Database::write
      * @covers SimpleSAML\Database::exec
+     * @test
      * @return void
      */
     public function noSuchTable()

tests/lib/SimpleSAML/Store/RedisTest.php

@@ -98,6 +98,7 @@ class RedisTest extends TestCase
     /**
      * @covers \SimpleSAML\Store::getInstance
      * @covers \SimpleSAML\Store\Redis::__construct
+     * @test
      * @return void
      */
     public function testRedisInstance()
@@ -119,6 +120,7 @@ class RedisTest extends TestCase
     /**
      * @covers \SimpleSAML\Store::getInstance
      * @covers \SimpleSAML\Store\Redis::__construct
+     * @test
      * @return void
      */
     public function testRedisInstanceWithPassword()
@@ -141,6 +143,7 @@ class RedisTest extends TestCase
     /**
      * @covers \SimpleSAML\Store\Redis::get
      * @covers \SimpleSAML\Store\Redis::set
+     * @test
      * @return void
      */
     public function testInsertData()
@@ -158,6 +161,7 @@ class RedisTest extends TestCase
     /**
      * @covers \SimpleSAML\Store\Redis::get
      * @covers \SimpleSAML\Store\Redis::set
+     * @test
      * @return void
      */
     public function testInsertExpiringData()
@@ -174,6 +178,7 @@ class RedisTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store\Redis::get
+     * @test
      * @return void
      */
     public function testGetEmptyData()
@@ -187,6 +192,7 @@ class RedisTest extends TestCase
     /**
      * @covers \SimpleSAML\Store\Redis::get
      * @covers \SimpleSAML\Store\Redis::set
+     * @test
      * @return void
      */
     public function testOverwriteData()
@@ -207,6 +213,7 @@ class RedisTest extends TestCase
      * @covers \SimpleSAML\Store\Redis::get
      * @covers \SimpleSAML\Store\Redis::set
      * @covers \SimpleSAML\Store\Redis::delete
+     * @test
      * @return void
      */
     public function testDeleteData()

tests/lib/SimpleSAML/Store/SQLTest.php

@@ -33,6 +33,7 @@ class SQLTest extends TestCase
     /**
      * @covers \SimpleSAML\Store::getInstance
      * @covers \SimpleSAML\Store\SQL::__construct
+     * @test
      * @return void
      */
     public function SQLInstance()
@@ -46,6 +47,7 @@ class SQLTest extends TestCase
     /**
      * @covers \SimpleSAML\Store\SQL::initTableVersionTable
      * @covers \SimpleSAML\Store\SQL::initKVTable
+     * @test
      * @return void
      */
     public function kvstoreTableVersion()
@@ -61,6 +63,7 @@ class SQLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store\SQL::getTableVersion
+     * @test
      * @return void
      */
     public function newTableVersion()
@@ -77,6 +80,7 @@ class SQLTest extends TestCase
     /**
      * @covers \SimpleSAML\Store\SQL::setTableVersion
      * @covers \SimpleSAML\Store\SQL::insertOrUpdate
+     * @test
      * @return void
      */
     public function testSetTableVersion()
@@ -93,6 +97,7 @@ class SQLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store\SQL::get
+     * @test
      * @return void
      */
     public function testGetEmptyData()
@@ -110,6 +115,7 @@ class SQLTest extends TestCase
      * @covers \SimpleSAML\Store\SQL::get
      * @covers \SimpleSAML\Store\SQL::set
      * @covers \SimpleSAML\Store\SQL::insertOrUpdate
+     * @test
      * @return void
      */
     public function testInsertData()
@@ -128,6 +134,7 @@ class SQLTest extends TestCase
      * @covers \SimpleSAML\Store\SQL::get
      * @covers \SimpleSAML\Store\SQL::set
      * @covers \SimpleSAML\Store\SQL::insertOrUpdate
+     * @test
      * @return void
      */
     public function testOverwriteData()
@@ -148,6 +155,7 @@ class SQLTest extends TestCase
      * @covers \SimpleSAML\Store\SQL::set
      * @covers \SimpleSAML\Store\SQL::insertOrUpdate
      * @covers \SimpleSAML\Store\SQL::delete
+     * @test
      * @return void
      */
     public function testDeleteData()
@@ -168,6 +176,7 @@ class SQLTest extends TestCase
      * @covers \SimpleSAML\Store\SQL::set
      * @covers \SimpleSAML\Store\SQL::insertOrUpdate
      * @covers \SimpleSAML\Store\SQL::delete
+     * @test
      * @return void
      */
     public function testVeryLongKey()

tests/lib/SimpleSAML/StoreTest.php

@@ -21,6 +21,7 @@ class StoreTest extends TestCase
 {
     /**
      * @covers \SimpleSAML\Store::getInstance
+     * @test
      * @return void
      */
     public function defaultStore()
@@ -36,6 +37,7 @@ class StoreTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store::getInstance
+     * @test
      * @return void
      */
     public function phpSessionStore()
@@ -51,6 +53,7 @@ class StoreTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store::getInstance
+     * @test
      * @return void
      */
     public function memcacheStore()
@@ -67,6 +70,7 @@ class StoreTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store::getInstance
+     * @test
      * @return void
      */
     public function sqlStore()
@@ -85,6 +89,7 @@ class StoreTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store::getInstance
+     * @test
      * @return void
      */
     public function pathStore()
@@ -103,6 +108,7 @@ class StoreTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store::getInstance
+     * @test
      * @return void
      */
     public function notFoundStoreException()

tests/lib/SimpleSAML/Utils/SystemTest.php

@@ -36,6 +36,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::getOS
+     * @test
      * @return void
      */
     public function testGetOSBasic()
@@ -48,6 +49,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
+     * @test
      * @return void
      */
     public function testResolvePathRemoveTrailingSlashes()
@@ -64,6 +66,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
+     * @test
      * @return void
      */
     public function testResolvePathPreferAbsolutePathToBase()
@@ -80,6 +83,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
+     * @test
      * @return void
      */
     public function testResolvePathCurDirPath()
@@ -96,6 +100,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
+     * @test
      * @return void
      */
     public function testResolvePathParentPath()
@@ -112,6 +117,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
+     * @test
      * @return void
      */
     public function testResolvePathAllowsStreamWrappers()
@@ -128,6 +134,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
+     * @test
      * @return void
      */
     public function testResolvePathAllowsAwsS3StreamWrappers()
@@ -144,6 +151,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::writeFile
+     * @test
      * @deprecated Test becomes obsolete as soon as the codebase is fully type hinted
      * @return void
      */
@@ -157,6 +165,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::writeFile
+     * @test
      * @return void
      */
     public function testWriteFileBasic()
@@ -176,6 +185,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::writeFile
+     * @test
      * @return void
      */
     public function testWriteFileContents()
@@ -199,6 +209,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::writeFile
+     * @test
      * @return void
      */
     public function testWriteFileMode()
@@ -222,6 +233,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::getTempDir
+     * @test
      * @return void
      */
     public function testGetTempDirBasic()
@@ -241,6 +253,7 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::getTempDir
+     * @test
      * @return void
      */
     public function testGetTempDirNonExistant()
@@ -261,6 +274,7 @@ class SystemTest extends TestCase
     /**
      * @requires OS Linux
      * @covers \SimpleSAML\Utils\System::getTempDir
+     * @test
      * @return void
      */
     public function testGetTempDirBadOwner()

tests/lib/SimpleSAML/Utils/XMLTest.php

@@ -14,6 +14,7 @@ class XMLTest extends TestCase
 {
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
+     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeBasic()
@@ -30,6 +31,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
+     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeMissingNamespace()
@@ -45,6 +47,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
+     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeEmpty()
@@ -61,6 +64,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
+     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeShortcut()
@@ -78,6 +82,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
+     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeIncorrectName()
@@ -95,6 +100,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
+     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeIncorrectNamespace()
@@ -112,6 +118,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMText
+     * @test
      * @return void
      */
     public function testGetDomTextBasic()
@@ -130,6 +137,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMText
+     * @test
      * @return void
      */
     public function testGetDomTextMulti()
@@ -150,6 +158,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMText
+     * @test
      * @return void
      */
     public function testGetDomTextIncorrectType()
@@ -165,6 +174,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMChildren
+     * @test
      * @return void
      */
     public function testGetDomChildrenBasic()
@@ -184,6 +194,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMChildren
+     * @test
      * @return void
      */
     public function testGetDomChildrenIncorrectType()
@@ -202,6 +213,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMChildren
+     * @test
      * @return void
      */
     public function testGetDomChildrenIncorrectName()
@@ -221,6 +233,7 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatDOMElement
+     * @test
      * @return void
      */
     public function testFormatDomElementBasic()
@@ -244,6 +257,7 @@ NOWDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatDOMElement
+     * @test
      * @return void
      */
     public function testFormatDomElementNested()
@@ -271,6 +285,7 @@ NOWDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatDOMElement
+     * @test
      * @return void
      */
     public function testFormatDomElementIndentBase()
@@ -299,6 +314,7 @@ HEREDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatDOMElement
+     * @test
      * @return void
      */
     public function testFormatDomElementTextAndChild()
@@ -323,6 +339,7 @@ HEREDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatXMLString
+     * @test
      * @return void
      */
     public function testFormatXmlStringBasic()
@@ -342,6 +359,7 @@ NOWDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatXMLString
+     * @test
      * @return void
      */
     public function testFormatXmlStringMalformedXml()
@@ -355,6 +373,7 @@ NOWDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::isValid
+     * @test
      * @return void
      */
     public function testIsValidMalformedXml()
@@ -370,6 +389,7 @@ NOWDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::isValid
+     * @test
      * @return void
      */
     public function testIsValidMetadata()

tests/lib/SimpleSAML/XML/ErrorsTest.php

@@ -20,6 +20,7 @@ class ErrorsTest extends TestCase
      * @covers \SimpleSAML\XML\Errors::begin
      * @covers \SimpleSAML\XML\Errors::addErrors
      * @covers \SimpleSAML\XML\Errors::end
+     * @test
      * @return void
      */
     public function loggingErrors()
@@ -40,6 +41,7 @@ class ErrorsTest extends TestCase
     /**
      * @covers \SimpleSAML\XML\Errors::formatError
      * @covers \SimpleSAML\XML\Errors::formatErrors
+     * @test
      * @return void
      */
     public function formatErrors()

tests/lib/SimpleSAML/XML/ParserTest.php

@@ -38,6 +38,7 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValue
      * @covers \SimpleSAML\XML\Parser::__construct
+     * @test
      * @return void
      */
     public function getValue()
@@ -53,6 +54,7 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValue
      * @covers \SimpleSAML\XML\Parser::__construct
+     * @test
      * @return void
      */
     public function getEmptyValue()
@@ -68,6 +70,7 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValue
      * @covers \SimpleSAML\XML\Parser::__construct
+     * @test
      * @return void
      */
     public function getValueException()
@@ -80,6 +83,7 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValueDefault
      * @covers \SimpleSAML\XML\Parser::__construct
+     * @test
      * @return void
      */
     public function getDefaultValue()
@@ -95,6 +99,7 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValueAlternatives
      * @covers \SimpleSAML\XML\Parser::__construct
+     * @test
      * @return void
      */
     public function getValueAlternatives()
@@ -117,6 +122,7 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValueAlternatives
      * @covers \SimpleSAML\XML\Parser::__construct
+     * @test
      * @return void
      */
     public function getEmptyValueAlternatives()
@@ -139,6 +145,7 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValueAlternatives
      * @covers \SimpleSAML\XML\Parser::__construct
+     * @test
      * @return void
      */
     public function getValueAlternativesException()

tests/lib/SimpleSAML/XML/Shib13/AuthnResponseTest.php

@@ -67,6 +67,7 @@ XML;
 
     /**
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
+     * @test
      * @return void
      */
     public function setXML()
@@ -80,6 +81,7 @@ XML;
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::doXPathQuery
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::getIssuer
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
+     * @test
      * @return void
      */
     public function getIssuer()
@@ -96,6 +98,7 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::getIssuer
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
+     * @test
      * @return void
      */
     public function getIssuerException()
@@ -111,6 +114,7 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::getNameID
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
+     * @test
      * @return void
      */
     public function getNameID()

tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php

@@ -187,6 +187,7 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test generating an AuthnRequest
+     * @test
      * @return void
      */
     public function testAuthnRequest()
@@ -212,6 +213,7 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test setting a Subject
+     * @test
      * @return void
      */
     public function testNameID()
@@ -244,6 +246,7 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test setting an AuthnConextClassRef
+     * @test
      * @return void
      */
     public function testAuthnContextClassRef()
@@ -273,6 +276,7 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test setting ForcedAuthn
+     * @test
      * @return void
      */
     public function testForcedAuthn()