From 7822e6fc0f92398694f203acfd491b06d089d928 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Fri, 8 Dec 2017 15:18:54 +0100
Subject: [PATCH] simplification: rename SAMLMetadata as Metadata
---
bin/account-manager.pl.in | 4 ++--
.../{SAMLMetadata.pm => Metadata.pm} | 2 +-
lib/AccountManager/WebRequest.pm | 6 +++---
lib/Makefile.am | 2 +-
t/{samlmetadata.t => metadata.t} | 16 ++++++++--------
5 files changed, 15 insertions(+), 15 deletions(-)
rename lib/AccountManager/{SAMLMetadata.pm => Metadata.pm} (99%)
rename t/{samlmetadata.t => metadata.t} (86%)
diff --git a/bin/account-manager.pl.in b/bin/account-manager.pl.in
index ecf15bb..7ff29ca 100755
--- a/bin/account-manager.pl.in
+++ b/bin/account-manager.pl.in
@@ -21,7 +21,7 @@ use AccountManager::Service;
use AccountManager::Service::Manager;
use AccountManager::Account;
use AccountManager::Account::Manager;
-use AccountManager::SAMLMetadata;
+use AccountManager::Metadata;
use AccountManager::Tools;
my %options;
@@ -166,7 +166,7 @@ sub parse_metadata {
my $federation_metadata;
eval {
- $federation_metadata = AccountManager::SAMLMetadata->new(
+ $federation_metadata = AccountManager::Metadata->new(
file => $configuration->{_}->{federation_metadata_file}
);
};
diff --git a/lib/AccountManager/SAMLMetadata.pm b/lib/AccountManager/Metadata.pm
similarity index 99%
rename from lib/AccountManager/SAMLMetadata.pm
rename to lib/AccountManager/Metadata.pm
index 4978c7b..2b73fc4 100644
--- a/lib/AccountManager/SAMLMetadata.pm
+++ b/lib/AccountManager/Metadata.pm
@@ -1,4 +1,4 @@
-package AccountManager::SAMLMetadata;
+package AccountManager::Metadata;
use strict;
use warnings;
diff --git a/lib/AccountManager/WebRequest.pm b/lib/AccountManager/WebRequest.pm
index 0081266..78b98ee 100644
--- a/lib/AccountManager/WebRequest.pm
+++ b/lib/AccountManager/WebRequest.pm
@@ -14,7 +14,7 @@ use AccountManager::Account;
use AccountManager::Account::Manager;
use AccountManager::Token;
use AccountManager::Service;
-use AccountManager::SAMLMetadata;
+use AccountManager::Metadata;
use AccountManager::Tools;
## Defining parameters format
@@ -186,7 +186,7 @@ sub req_account_wizard {
my $metadata;
eval {
- $metadata = AccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::Metadata->new(
file => $self->{configuration}->{_}->{federation_metadata_file}
);
};
@@ -227,7 +227,7 @@ sub req_select_sp {
my $metadata;
eval {
- $metadata = AccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::Metadata->new(
file => $self->{configuration}->{_}->{federation_metadata_file}
);
};
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e8a5143..3ef9a03 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,7 +5,7 @@ nobase_modules_DATA = \
AccountManager/Token/Manager.pm \
AccountManager/DB.pm \
AccountManager/DB/Object.pm \
- AccountManager/SAMLMetadata.pm \
+ AccountManager/Metadata.pm \
AccountManager/Service.pm \
AccountManager/Service/Manager.pm \
AccountManager/Account.pm \
diff --git a/t/samlmetadata.t b/t/metadata.t
similarity index 86%
rename from t/samlmetadata.t
rename to t/metadata.t
index 5516174..cecd79a 100755
--- a/t/samlmetadata.t
+++ b/t/metadata.t
@@ -8,19 +8,19 @@ use File::Temp;
use Test::More;
use Test::Exception;
-use AccountManager::SAMLMetadata;
+use AccountManager::Metadata;
plan tests => 21;
my $metadata;
throws_ok {
- $metadata = AccountManager::SAMLMetadata->new();
+ $metadata = AccountManager::Metadata->new();
} qr/^missing argument 'file'/,
'instanciation: no file argument';
throws_ok {
- $metadata = AccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::Metadata->new(
file => '/no/such/file',
);
} qr/^non-existing file/,
@@ -31,7 +31,7 @@ my $file1 = File::Temp->new(UNLINK => $ENV{TEST_DEBUG} ? 0 : 1);
chmod 0000, $file1;
throws_ok {
- $metadata = AccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::Metadata->new(
file => $file1->filename()
);
} qr/^non-readable file/,
@@ -40,7 +40,7 @@ throws_ok {
chmod 0644, $file1;
throws_ok {
- $metadata = AccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::Metadata->new(
file => $file1->filename()
);
} qr/^Failed to parse file: \S+ parser error : Document is empty/,
@@ -54,7 +54,7 @@ EOF
close($file2);
throws_ok {
- $metadata = AccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::Metadata->new(
file => $file2->filename()
);
} qr/^Failed to parse file: \S+ parser error : Start tag expected/,
@@ -69,14 +69,14 @@ EOF
close($file3);
throws_ok {
- $metadata = AccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::Metadata->new(
file => $file3->filename()
);
} qr/^incorrect root element type 'root'/,
'instanciation: incorrect xml file';
lives_ok {
- $metadata = AccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::Metadata->new(
file => 't/edugain.xml'
);
} 'instanciation: edugain metadata';
--
GitLab