From 66ecdc52f509f66fc25687fa5a2fe1fdf10d9450 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Fri, 26 Feb 2016 11:37:07 +0100
Subject: [PATCH] Move MetadataTest to
SimpleSAML\Test\Utils\Config/MetadataTest.
---
.../SimpleSAML/Utils/Config/MetadataTest.php | 85 ++++++++++---------
1 file changed, 44 insertions(+), 41 deletions(-)
diff --git a/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php b/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
index 8a771354c..318983438 100644
--- a/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
+++ b/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
@@ -1,10 +1,13 @@
<?php
+namespace SimpleSAML\Test\Utils\Config;
+
+use SimpleSAML\Utils\Config\Metadata;
/**
* Tests related to SAML metadata.
*/
-class Utils_MetadataTest extends PHPUnit_Framework_TestCase
+class MetadataTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -14,8 +17,8 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
{
// test invalid argument
try {
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact('string');
- } catch (InvalidArgumentException $e) {
+ Metadata::getContact('string');
+ } catch (\InvalidArgumentException $e) {
$this->assertEquals('Invalid input parameters', $e->getMessage());
}
@@ -24,8 +27,8 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
'name' => 'John Doe'
);
try {
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
- } catch (InvalidArgumentException $e) {
+ Metadata::getContact($contact);
+ } catch (\InvalidArgumentException $e) {
$this->assertStringStartsWith('"contactType" is mandatory and must be one of ', $e->getMessage());
}
@@ -34,17 +37,17 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
'contactType' => 'invalid'
);
try {
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
- } catch (InvalidArgumentException $e) {
+ Metadata::getContact($contact);
+ } catch (\InvalidArgumentException $e) {
$this->assertStringStartsWith('"contactType" is mandatory and must be one of ', $e->getMessage());
}
// test all valid contact types
- foreach (\SimpleSAML\Utils\Config\Metadata::$VALID_CONTACT_TYPES as $type) {
+ foreach (Metadata::$VALID_CONTACT_TYPES as $type) {
$contact = array(
'contactType' => $type
);
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
+ $parsed = Metadata::getContact($contact);
$this->assertArrayHasKey('contactType', $parsed);
$this->assertArrayNotHasKey('givenName', $parsed);
$this->assertArrayNotHasKey('surName', $parsed);
@@ -55,7 +58,7 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
'contactType' => 'technical',
'name' => 'John Doe'
);
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
+ $parsed = Metadata::getContact($contact);
$this->assertArrayNotHasKey('name', $parsed);
$this->assertArrayHasKey('givenName', $parsed);
$this->assertArrayHasKey('surName', $parsed);
@@ -67,7 +70,7 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
'contactType' => 'technical',
'name' => 'Doe, John'
);
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
+ $parsed = Metadata::getContact($contact);
$this->assertArrayHasKey('givenName', $parsed);
$this->assertArrayHasKey('surName', $parsed);
$this->assertEquals('John', $parsed['givenName']);
@@ -78,7 +81,7 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
'contactType' => 'technical',
'name' => 'John Fitzgerald Doe Smith'
);
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
+ $parsed = Metadata::getContact($contact);
$this->assertArrayNotHasKey('name', $parsed);
$this->assertArrayHasKey('givenName', $parsed);
$this->assertArrayNotHasKey('surName', $parsed);
@@ -89,7 +92,7 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
'contactType' => 'technical',
'name' => 'Doe Smith, John Fitzgerald'
);
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
+ $parsed = Metadata::getContact($contact);
$this->assertArrayNotHasKey('name', $parsed);
$this->assertArrayHasKey('givenName', $parsed);
$this->assertArrayHasKey('surName', $parsed);
@@ -104,8 +107,8 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
foreach ($invalid_types as $type) {
$contact['givenName'] = $type;
try {
- \SimpleSAML\Utils\Config\Metadata::getContact($contact);
- } catch (InvalidArgumentException $e) {
+ Metadata::getContact($contact);
+ } catch (\InvalidArgumentException $e) {
$this->assertEquals('"givenName" must be a string and cannot be empty.', $e->getMessage());
}
}
@@ -118,8 +121,8 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
foreach ($invalid_types as $type) {
$contact['surName'] = $type;
try {
- \SimpleSAML\Utils\Config\Metadata::getContact($contact);
- } catch (InvalidArgumentException $e) {
+ Metadata::getContact($contact);
+ } catch (\InvalidArgumentException $e) {
$this->assertEquals('"surName" must be a string and cannot be empty.', $e->getMessage());
}
}
@@ -132,8 +135,8 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
foreach ($invalid_types as $type) {
$contact['company'] = $type;
try {
- \SimpleSAML\Utils\Config\Metadata::getContact($contact);
- } catch (InvalidArgumentException $e) {
+ Metadata::getContact($contact);
+ } catch (\InvalidArgumentException $e) {
$this->assertEquals('"company" must be a string and cannot be empty.', $e->getMessage());
}
}
@@ -146,8 +149,8 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
foreach ($invalid_types as $type) {
$contact['emailAddress'] = $type;
try {
- \SimpleSAML\Utils\Config\Metadata::getContact($contact);
- } catch (InvalidArgumentException $e) {
+ Metadata::getContact($contact);
+ } catch (\InvalidArgumentException $e) {
$this->assertEquals(
'"emailAddress" must be a string or an array and cannot be empty.',
$e->getMessage()
@@ -158,8 +161,8 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
foreach ($invalid_types as $type) {
$contact['emailAddress'] = $type;
try {
- \SimpleSAML\Utils\Config\Metadata::getContact($contact);
- } catch (InvalidArgumentException $e) {
+ Metadata::getContact($contact);
+ } catch (\InvalidArgumentException $e) {
$this->assertEquals(
'Email addresses must be a string and cannot be empty.',
$e->getMessage()
@@ -169,7 +172,7 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
$valid_types = array('email@example.com', array('email1@example.com', 'email2@example.com'));
foreach ($valid_types as $type) {
$contact['emailAddress'] = $type;
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
+ $parsed = Metadata::getContact($contact);
$this->assertEquals($type, $parsed['emailAddress']);
}
@@ -181,8 +184,8 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
foreach ($invalid_types as $type) {
$contact['telephoneNumber'] = $type;
try {
- \SimpleSAML\Utils\Config\Metadata::getContact($contact);
- } catch (InvalidArgumentException $e) {
+ Metadata::getContact($contact);
+ } catch (\InvalidArgumentException $e) {
$this->assertEquals(
'"telephoneNumber" must be a string or an array and cannot be empty.',
$e->getMessage()
@@ -193,26 +196,26 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
foreach ($invalid_types as $type) {
$contact['telephoneNumber'] = $type;
try {
- \SimpleSAML\Utils\Config\Metadata::getContact($contact);
- } catch (InvalidArgumentException $e) {
+ Metadata::getContact($contact);
+ } catch (\InvalidArgumentException $e) {
$this->assertEquals('Telephone numbers must be a string and cannot be empty.', $e->getMessage());
}
}
$valid_types = array('1234', array('1234', '5678'));
foreach ($valid_types as $type) {
$contact['telephoneNumber'] = $type;
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
+ $parsed = Metadata::getContact($contact);
$this->assertEquals($type, $parsed['telephoneNumber']);
}
// test completeness
$contact = array();
- foreach (\SimpleSAML\Utils\Config\Metadata::$VALID_CONTACT_OPTIONS as $option) {
+ foreach (Metadata::$VALID_CONTACT_OPTIONS as $option) {
$contact[$option] = 'string';
}
$contact['contactType'] = 'technical';
$contact['name'] = 'to_be_removed';
- $parsed = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
+ $parsed = Metadata::getContact($contact);
foreach (array_keys($parsed) as $key) {
$this->assertEquals($parsed[$key], $contact[$key]);
}
@@ -228,29 +231,29 @@ class Utils_MetadataTest extends PHPUnit_Framework_TestCase
// test for success
$metadata = array(
'EntityAttributes' => array(
- \SimpleSAML\Utils\Config\Metadata::$ENTITY_CATEGORY => array(
- \SimpleSAML\Utils\Config\Metadata::$HIDE_FROM_DISCOVERY,
+ Metadata::$ENTITY_CATEGORY => array(
+ Metadata::$HIDE_FROM_DISCOVERY,
),
),
);
- $this->assertTrue(\SimpleSAML\Utils\Config\Metadata::isHiddenFromDiscovery($metadata));
+ $this->assertTrue(Metadata::isHiddenFromDiscovery($metadata));
// test for failures
- $this->assertFalse(\SimpleSAML\Utils\Config\Metadata::isHiddenFromDiscovery(array('foo')));
- $this->assertFalse(\SimpleSAML\Utils\Config\Metadata::isHiddenFromDiscovery(array(
+ $this->assertFalse(Metadata::isHiddenFromDiscovery(array('foo')));
+ $this->assertFalse(Metadata::isHiddenFromDiscovery(array(
'EntityAttributes' => 'bar',
)));
- $this->assertFalse(\SimpleSAML\Utils\Config\Metadata::isHiddenFromDiscovery(array(
+ $this->assertFalse(Metadata::isHiddenFromDiscovery(array(
'EntityAttributes' => array(),
)));
- $this->assertFalse(\SimpleSAML\Utils\Config\Metadata::isHiddenFromDiscovery(array(
+ $this->assertFalse(Metadata::isHiddenFromDiscovery(array(
'EntityAttributes' => array(
- \SimpleSAML\Utils\Config\Metadata::$ENTITY_CATEGORY => '',
+ Metadata::$ENTITY_CATEGORY => '',
),
)));
- $this->assertFalse(\SimpleSAML\Utils\Config\Metadata::isHiddenFromDiscovery(array(
+ $this->assertFalse(Metadata::isHiddenFromDiscovery(array(
'EntityAttributes' => array(
- \SimpleSAML\Utils\Config\Metadata::$ENTITY_CATEGORY => array(),
+ Metadata::$ENTITY_CATEGORY => array(),
),
)));
}
--
GitLab