From 6bcea51e2d2a9ad59b500426c3d26fd3b3ffef38 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 15 Jul 2019 22:46:42 +0200
Subject: [PATCH] Remove meaningless @test annotation
---
tests/lib/AutoloadModulesTest.php | 2 --
tests/lib/SimpleSAML/Auth/SimpleTest.php | 1 -
tests/lib/SimpleSAML/DatabaseTest.php | 7 -------
tests/lib/SimpleSAML/Store/RedisTest.php | 7 -------
tests/lib/SimpleSAML/Store/SQLTest.php | 9 ---------
tests/lib/SimpleSAML/StoreTest.php | 6 ------
tests/lib/SimpleSAML/Utils/SystemTest.php | 14 -------------
tests/lib/SimpleSAML/Utils/XMLTest.php | 20 -------------------
tests/lib/SimpleSAML/XML/ErrorsTest.php | 2 --
tests/lib/SimpleSAML/XML/ParserTest.php | 7 -------
.../XML/Shib13/AuthnResponseTest.php | 4 ----
.../lib/Auth/Source/Auth_Source_SP_Test.php | 4 ----
12 files changed, 83 deletions(-)
diff --git a/tests/lib/AutoloadModulesTest.php b/tests/lib/AutoloadModulesTest.php
index c136ea5ea..add217d60 100644
--- a/tests/lib/AutoloadModulesTest.php
+++ b/tests/lib/AutoloadModulesTest.php
@@ -18,7 +18,6 @@ class AutoloadModulesTest extends TestCase
}
/**
- * @test
* @runInSeparateProcess
* @return void
*/
@@ -28,7 +27,6 @@ class AutoloadModulesTest extends TestCase
}
/**
- * @test
* @return void
*/
public function autoloaderSubstitutesNamespacedXmlSecClassesWhereNonNamespacedClassWasUsed()
diff --git a/tests/lib/SimpleSAML/Auth/SimpleTest.php b/tests/lib/SimpleSAML/Auth/SimpleTest.php
index 7e5799634..048e43aa7 100644
--- a/tests/lib/SimpleSAML/Auth/SimpleTest.php
+++ b/tests/lib/SimpleSAML/Auth/SimpleTest.php
@@ -9,7 +9,6 @@ namespace SimpleSAML\Test\Auth;
class SimpleTest extends \SimpleSAML\Test\Utils\ClearStateTestCase
{
/**
- * @test
* @return void
*/
public function testGetProcessedURL()
diff --git a/tests/lib/SimpleSAML/DatabaseTest.php b/tests/lib/SimpleSAML/DatabaseTest.php
index 6ba5c9bf6..5957e08d2 100644
--- a/tests/lib/SimpleSAML/DatabaseTest.php
+++ b/tests/lib/SimpleSAML/DatabaseTest.php
@@ -80,7 +80,6 @@ class DatabaseTest extends TestCase
* @covers SimpleSAML\Database::generateInstanceId
* @covers SimpleSAML\Database::__construct
* @covers SimpleSAML\Database::connect
- * @test
* @return void
*/
public function connectionFailure()
@@ -105,7 +104,6 @@ class DatabaseTest extends TestCase
* @covers SimpleSAML\Database::generateInstanceId
* @covers SimpleSAML\Database::__construct
* @covers SimpleSAML\Database::connect
- * @test
* @return void
*/
public function instances()
@@ -175,7 +173,6 @@ class DatabaseTest extends TestCase
* @covers SimpleSAML\Database::__construct
* @covers SimpleSAML\Database::connect
* @covers SimpleSAML\Database::getSlave
- * @test
* @return void
*/
public function slaves()
@@ -218,7 +215,6 @@ class DatabaseTest extends TestCase
/**
* @covers SimpleSAML\Database::applyPrefix
- * @test
* @return void
*/
public function prefix()
@@ -236,7 +232,6 @@ class DatabaseTest extends TestCase
* @covers SimpleSAML\Database::read
* @covers SimpleSAML\Database::exec
* @covers SimpleSAML\Database::query
- * @test
* @return void
*/
public function querying()
@@ -269,7 +264,6 @@ class DatabaseTest extends TestCase
/**
* @covers SimpleSAML\Database::read
* @covers SimpleSAML\Database::query
- * @test
* @return void
*/
public function readFailure()
@@ -285,7 +279,6 @@ class DatabaseTest extends TestCase
/**
* @covers SimpleSAML\Database::write
* @covers SimpleSAML\Database::exec
- * @test
* @return void
*/
public function noSuchTable()
diff --git a/tests/lib/SimpleSAML/Store/RedisTest.php b/tests/lib/SimpleSAML/Store/RedisTest.php
index db6f31cdd..375aba6b8 100644
--- a/tests/lib/SimpleSAML/Store/RedisTest.php
+++ b/tests/lib/SimpleSAML/Store/RedisTest.php
@@ -98,7 +98,6 @@ class RedisTest extends TestCase
/**
* @covers \SimpleSAML\Store::getInstance
* @covers \SimpleSAML\Store\Redis::__construct
- * @test
* @return void
*/
public function testRedisInstance()
@@ -120,7 +119,6 @@ class RedisTest extends TestCase
/**
* @covers \SimpleSAML\Store::getInstance
* @covers \SimpleSAML\Store\Redis::__construct
- * @test
* @return void
*/
public function testRedisInstanceWithPassword()
@@ -143,7 +141,6 @@ class RedisTest extends TestCase
/**
* @covers \SimpleSAML\Store\Redis::get
* @covers \SimpleSAML\Store\Redis::set
- * @test
* @return void
*/
public function testInsertData()
@@ -161,7 +158,6 @@ class RedisTest extends TestCase
/**
* @covers \SimpleSAML\Store\Redis::get
* @covers \SimpleSAML\Store\Redis::set
- * @test
* @return void
*/
public function testInsertExpiringData()
@@ -178,7 +174,6 @@ class RedisTest extends TestCase
/**
* @covers \SimpleSAML\Store\Redis::get
- * @test
* @return void
*/
public function testGetEmptyData()
@@ -192,7 +187,6 @@ class RedisTest extends TestCase
/**
* @covers \SimpleSAML\Store\Redis::get
* @covers \SimpleSAML\Store\Redis::set
- * @test
* @return void
*/
public function testOverwriteData()
@@ -213,7 +207,6 @@ 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()
diff --git a/tests/lib/SimpleSAML/Store/SQLTest.php b/tests/lib/SimpleSAML/Store/SQLTest.php
index bff22681a..bc864dc78 100644
--- a/tests/lib/SimpleSAML/Store/SQLTest.php
+++ b/tests/lib/SimpleSAML/Store/SQLTest.php
@@ -33,7 +33,6 @@ class SQLTest extends TestCase
/**
* @covers \SimpleSAML\Store::getInstance
* @covers \SimpleSAML\Store\SQL::__construct
- * @test
* @return void
*/
public function SQLInstance()
@@ -47,7 +46,6 @@ class SQLTest extends TestCase
/**
* @covers \SimpleSAML\Store\SQL::initTableVersionTable
* @covers \SimpleSAML\Store\SQL::initKVTable
- * @test
* @return void
*/
public function kvstoreTableVersion()
@@ -63,7 +61,6 @@ class SQLTest extends TestCase
/**
* @covers \SimpleSAML\Store\SQL::getTableVersion
- * @test
* @return void
*/
public function newTableVersion()
@@ -80,7 +77,6 @@ class SQLTest extends TestCase
/**
* @covers \SimpleSAML\Store\SQL::setTableVersion
* @covers \SimpleSAML\Store\SQL::insertOrUpdate
- * @test
* @return void
*/
public function testSetTableVersion()
@@ -97,7 +93,6 @@ class SQLTest extends TestCase
/**
* @covers \SimpleSAML\Store\SQL::get
- * @test
* @return void
*/
public function testGetEmptyData()
@@ -115,7 +110,6 @@ 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()
@@ -134,7 +128,6 @@ 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()
@@ -155,7 +148,6 @@ 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()
@@ -176,7 +168,6 @@ 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()
diff --git a/tests/lib/SimpleSAML/StoreTest.php b/tests/lib/SimpleSAML/StoreTest.php
index 756a53382..7704fa210 100644
--- a/tests/lib/SimpleSAML/StoreTest.php
+++ b/tests/lib/SimpleSAML/StoreTest.php
@@ -21,7 +21,6 @@ class StoreTest extends TestCase
{
/**
* @covers \SimpleSAML\Store::getInstance
- * @test
* @return void
*/
public function defaultStore()
@@ -37,7 +36,6 @@ class StoreTest extends TestCase
/**
* @covers \SimpleSAML\Store::getInstance
- * @test
* @return void
*/
public function phpSessionStore()
@@ -53,7 +51,6 @@ class StoreTest extends TestCase
/**
* @covers \SimpleSAML\Store::getInstance
- * @test
* @return void
*/
public function memcacheStore()
@@ -70,7 +67,6 @@ class StoreTest extends TestCase
/**
* @covers \SimpleSAML\Store::getInstance
- * @test
* @return void
*/
public function sqlStore()
@@ -89,7 +85,6 @@ class StoreTest extends TestCase
/**
* @covers \SimpleSAML\Store::getInstance
- * @test
* @return void
*/
public function pathStore()
@@ -108,7 +103,6 @@ class StoreTest extends TestCase
/**
* @covers \SimpleSAML\Store::getInstance
- * @test
* @return void
*/
public function notFoundStoreException()
diff --git a/tests/lib/SimpleSAML/Utils/SystemTest.php b/tests/lib/SimpleSAML/Utils/SystemTest.php
index 9f73b88fd..2b9920d26 100644
--- a/tests/lib/SimpleSAML/Utils/SystemTest.php
+++ b/tests/lib/SimpleSAML/Utils/SystemTest.php
@@ -36,7 +36,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::getOS
- * @test
* @return void
*/
public function testGetOSBasic()
@@ -49,7 +48,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::resolvePath
- * @test
* @return void
*/
public function testResolvePathRemoveTrailingSlashes()
@@ -66,7 +64,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::resolvePath
- * @test
* @return void
*/
public function testResolvePathPreferAbsolutePathToBase()
@@ -83,7 +80,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::resolvePath
- * @test
* @return void
*/
public function testResolvePathCurDirPath()
@@ -100,7 +96,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::resolvePath
- * @test
* @return void
*/
public function testResolvePathParentPath()
@@ -117,7 +112,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::resolvePath
- * @test
* @return void
*/
public function testResolvePathAllowsStreamWrappers()
@@ -134,7 +128,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::resolvePath
- * @test
* @return void
*/
public function testResolvePathAllowsAwsS3StreamWrappers()
@@ -151,7 +144,6 @@ 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
*/
@@ -165,7 +157,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::writeFile
- * @test
* @return void
*/
public function testWriteFileBasic()
@@ -185,7 +176,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::writeFile
- * @test
* @return void
*/
public function testWriteFileContents()
@@ -209,7 +199,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::writeFile
- * @test
* @return void
*/
public function testWriteFileMode()
@@ -233,7 +222,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::getTempDir
- * @test
* @return void
*/
public function testGetTempDirBasic()
@@ -253,7 +241,6 @@ class SystemTest extends TestCase
/**
* @covers \SimpleSAML\Utils\System::getTempDir
- * @test
* @return void
*/
public function testGetTempDirNonExistant()
@@ -274,7 +261,6 @@ class SystemTest extends TestCase
/**
* @requires OS Linux
* @covers \SimpleSAML\Utils\System::getTempDir
- * @test
* @return void
*/
public function testGetTempDirBadOwner()
diff --git a/tests/lib/SimpleSAML/Utils/XMLTest.php b/tests/lib/SimpleSAML/Utils/XMLTest.php
index 938f4ef38..db2953984 100644
--- a/tests/lib/SimpleSAML/Utils/XMLTest.php
+++ b/tests/lib/SimpleSAML/Utils/XMLTest.php
@@ -14,7 +14,6 @@ class XMLTest extends TestCase
{
/**
* @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
- * @test
* @return void
*/
public function testIsDomNodeOfTypeBasic()
@@ -31,7 +30,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
- * @test
* @return void
*/
public function testIsDomNodeOfTypeMissingNamespace()
@@ -47,7 +45,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
- * @test
* @return void
*/
public function testIsDomNodeOfTypeEmpty()
@@ -64,7 +61,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
- * @test
* @return void
*/
public function testIsDomNodeOfTypeShortcut()
@@ -82,7 +78,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
- * @test
* @return void
*/
public function testIsDomNodeOfTypeIncorrectName()
@@ -100,7 +95,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
- * @test
* @return void
*/
public function testIsDomNodeOfTypeIncorrectNamespace()
@@ -118,7 +112,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::getDOMText
- * @test
* @return void
*/
public function testGetDomTextBasic()
@@ -137,7 +130,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::getDOMText
- * @test
* @return void
*/
public function testGetDomTextMulti()
@@ -158,7 +150,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::getDOMText
- * @test
* @return void
*/
public function testGetDomTextIncorrectType()
@@ -174,7 +165,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::getDOMChildren
- * @test
* @return void
*/
public function testGetDomChildrenBasic()
@@ -194,7 +184,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::getDOMChildren
- * @test
* @return void
*/
public function testGetDomChildrenIncorrectType()
@@ -213,7 +202,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::getDOMChildren
- * @test
* @return void
*/
public function testGetDomChildrenIncorrectName()
@@ -233,7 +221,6 @@ class XMLTest extends TestCase
/**
* @covers \SimpleSAML\Utils\XML::formatDOMElement
- * @test
* @return void
*/
public function testFormatDomElementBasic()
@@ -257,7 +244,6 @@ NOWDOC;
/**
* @covers \SimpleSAML\Utils\XML::formatDOMElement
- * @test
* @return void
*/
public function testFormatDomElementNested()
@@ -285,7 +271,6 @@ NOWDOC;
/**
* @covers \SimpleSAML\Utils\XML::formatDOMElement
- * @test
* @return void
*/
public function testFormatDomElementIndentBase()
@@ -314,7 +299,6 @@ HEREDOC;
/**
* @covers \SimpleSAML\Utils\XML::formatDOMElement
- * @test
* @return void
*/
public function testFormatDomElementTextAndChild()
@@ -339,7 +323,6 @@ HEREDOC;
/**
* @covers \SimpleSAML\Utils\XML::formatXMLString
- * @test
* @return void
*/
public function testFormatXmlStringBasic()
@@ -359,7 +342,6 @@ NOWDOC;
/**
* @covers \SimpleSAML\Utils\XML::formatXMLString
- * @test
* @return void
*/
public function testFormatXmlStringMalformedXml()
@@ -373,7 +355,6 @@ NOWDOC;
/**
* @covers \SimpleSAML\Utils\XML::isValid
- * @test
* @return void
*/
public function testIsValidMalformedXml()
@@ -389,7 +370,6 @@ NOWDOC;
/**
* @covers \SimpleSAML\Utils\XML::isValid
- * @test
* @return void
*/
public function testIsValidMetadata()
diff --git a/tests/lib/SimpleSAML/XML/ErrorsTest.php b/tests/lib/SimpleSAML/XML/ErrorsTest.php
index c671a23e1..824f14a5a 100644
--- a/tests/lib/SimpleSAML/XML/ErrorsTest.php
+++ b/tests/lib/SimpleSAML/XML/ErrorsTest.php
@@ -20,7 +20,6 @@ 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()
@@ -41,7 +40,6 @@ class ErrorsTest extends TestCase
/**
* @covers \SimpleSAML\XML\Errors::formatError
* @covers \SimpleSAML\XML\Errors::formatErrors
- * @test
* @return void
*/
public function formatErrors()
diff --git a/tests/lib/SimpleSAML/XML/ParserTest.php b/tests/lib/SimpleSAML/XML/ParserTest.php
index 35bc70c41..ede4800f6 100644
--- a/tests/lib/SimpleSAML/XML/ParserTest.php
+++ b/tests/lib/SimpleSAML/XML/ParserTest.php
@@ -38,7 +38,6 @@ XML;
/**
* @covers \SimpleSAML\XML\Parser::getValue
* @covers \SimpleSAML\XML\Parser::__construct
- * @test
* @return void
*/
public function getValue()
@@ -54,7 +53,6 @@ XML;
/**
* @covers \SimpleSAML\XML\Parser::getValue
* @covers \SimpleSAML\XML\Parser::__construct
- * @test
* @return void
*/
public function getEmptyValue()
@@ -70,7 +68,6 @@ XML;
/**
* @covers \SimpleSAML\XML\Parser::getValue
* @covers \SimpleSAML\XML\Parser::__construct
- * @test
* @return void
*/
public function getValueException()
@@ -83,7 +80,6 @@ XML;
/**
* @covers \SimpleSAML\XML\Parser::getValueDefault
* @covers \SimpleSAML\XML\Parser::__construct
- * @test
* @return void
*/
public function getDefaultValue()
@@ -99,7 +95,6 @@ XML;
/**
* @covers \SimpleSAML\XML\Parser::getValueAlternatives
* @covers \SimpleSAML\XML\Parser::__construct
- * @test
* @return void
*/
public function getValueAlternatives()
@@ -122,7 +117,6 @@ XML;
/**
* @covers \SimpleSAML\XML\Parser::getValueAlternatives
* @covers \SimpleSAML\XML\Parser::__construct
- * @test
* @return void
*/
public function getEmptyValueAlternatives()
@@ -145,7 +139,6 @@ XML;
/**
* @covers \SimpleSAML\XML\Parser::getValueAlternatives
* @covers \SimpleSAML\XML\Parser::__construct
- * @test
* @return void
*/
public function getValueAlternativesException()
diff --git a/tests/lib/SimpleSAML/XML/Shib13/AuthnResponseTest.php b/tests/lib/SimpleSAML/XML/Shib13/AuthnResponseTest.php
index 1bc2c4af9..6a5ba0f53 100644
--- a/tests/lib/SimpleSAML/XML/Shib13/AuthnResponseTest.php
+++ b/tests/lib/SimpleSAML/XML/Shib13/AuthnResponseTest.php
@@ -67,7 +67,6 @@ XML;
/**
* @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
- * @test
* @return void
*/
public function setXML()
@@ -81,7 +80,6 @@ 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()
@@ -98,7 +96,6 @@ XML;
/**
* @covers \SimpleSAML\XML\Shib13\AuthnResponse::getIssuer
* @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
- * @test
* @return void
*/
public function getIssuerException()
@@ -114,7 +111,6 @@ XML;
/**
* @covers \SimpleSAML\XML\Shib13\AuthnResponse::getNameID
* @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
- * @test
* @return void
*/
public function getNameID()
diff --git a/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php b/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
index 29549d283..fc89f7c78 100644
--- a/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
+++ b/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
@@ -187,7 +187,6 @@ class SPTest extends ClearStateTestCase
/**
* Test generating an AuthnRequest
- * @test
* @return void
*/
public function testAuthnRequest()
@@ -213,7 +212,6 @@ class SPTest extends ClearStateTestCase
/**
* Test setting a Subject
- * @test
* @return void
*/
public function testNameID()
@@ -246,7 +244,6 @@ class SPTest extends ClearStateTestCase
/**
* Test setting an AuthnConextClassRef
- * @test
* @return void
*/
public function testAuthnContextClassRef()
@@ -276,7 +273,6 @@ class SPTest extends ClearStateTestCase
/**
* Test setting ForcedAuthn
- * @test
* @return void
*/
public function testForcedAuthn()
--
GitLab