From 9cdaf04f857759a73896309f8b58d2454d5bc0c4 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Fri, 4 Sep 2015 12:27:43 +0200 Subject: [PATCH] MT#14585 Move REST API tests to t/api-rest/ folder Change-Id: I6c31f613e885a491b44f3c5445f5bf44d094247c --- inc/Local/Module/Build.pm | 2 +- t/{ => api-rest}/api-all-links.t | 0 t/{ => api-rest}/api-auth.t | 0 t/{ => api-rest}/api-balanceintervals.t | 4 ++-- t/{ => api-rest}/api-billingfees.t | 0 t/{ => api-rest}/api-billingnetworks.t | 2 +- t/{ => api-rest}/api-billingprofiles.t | 0 t/{ => api-rest}/api-billingzones.t | 0 t/{ => api-rest}/api-callforwards.t | 0 t/{ => api-rest}/api-contracts.t | 0 t/{ => api-rest}/api-customercontacts.t | 0 t/{ => api-rest}/api-customers.t | 2 +- t/{ => api-rest}/api-journals.t | 2 +- t/{ => api-rest}/api-pbxdevicemodels.t | 0 t/{ => api-rest}/api-pbxdevices.t | 0 t/{ => api-rest}/api-profilepackages.t | 2 +- t/{ => api-rest}/api-resellers.t | 0 t/{ => api-rest}/api-rewriterulesets.t | 0 t/{ => api-rest}/api-root.t | 0 t/{ => api-rest}/api-systemcontacts.t | 0 t/{ => api-rest}/api-threads.t | 4 ++-- t/{ => api-rest}/api-trustedsources.t | 0 t/{ => api-rest}/api-valid-patch.t | 0 t/{ => api-rest}/api-vouchers.t | 0 .../resources/api_devicemodels_front_image.jpg | Bin t/{ => api-rest}/resources/empty.txt | 0 26 files changed, 9 insertions(+), 9 deletions(-) rename t/{ => api-rest}/api-all-links.t (100%) rename t/{ => api-rest}/api-auth.t (100%) rename t/{ => api-rest}/api-balanceintervals.t (99%) rename t/{ => api-rest}/api-billingfees.t (100%) rename t/{ => api-rest}/api-billingnetworks.t (99%) rename t/{ => api-rest}/api-billingprofiles.t (100%) rename t/{ => api-rest}/api-billingzones.t (100%) rename t/{ => api-rest}/api-callforwards.t (100%) rename t/{ => api-rest}/api-contracts.t (100%) rename t/{ => api-rest}/api-customercontacts.t (100%) rename t/{ => api-rest}/api-customers.t (99%) rename t/{ => api-rest}/api-journals.t (99%) rename t/{ => api-rest}/api-pbxdevicemodels.t (100%) rename t/{ => api-rest}/api-pbxdevices.t (100%) rename t/{ => api-rest}/api-profilepackages.t (99%) rename t/{ => api-rest}/api-resellers.t (100%) rename t/{ => api-rest}/api-rewriterulesets.t (100%) rename t/{ => api-rest}/api-root.t (100%) rename t/{ => api-rest}/api-systemcontacts.t (100%) rename t/{ => api-rest}/api-threads.t (90%) rename t/{ => api-rest}/api-trustedsources.t (100%) rename t/{ => api-rest}/api-valid-patch.t (100%) rename t/{ => api-rest}/api-vouchers.t (100%) rename t/{ => api-rest}/resources/api_devicemodels_front_image.jpg (100%) rename t/{ => api-rest}/resources/empty.txt (100%) diff --git a/inc/Local/Module/Build.pm b/inc/Local/Module/Build.pm index 2d350e1b39..75df8dc95e 100644 --- a/inc/Local/Module/Build.pm +++ b/inc/Local/Module/Build.pm @@ -193,7 +193,7 @@ method ACTION_test_api { $self->depends_on('code'); $self->_test_preconditions; $self->_download_certs; - $self->test_files('t/api-*.t'); + $self->test_files('t/api-rest/*.t'); $self->generic_test(type => 'default'); unlink ($ENV{API_SSL_CLIENT_CERT}, $ENV{API_SSL_CA_CERT}); # created by _download_certs() } diff --git a/t/api-all-links.t b/t/api-rest/api-all-links.t similarity index 100% rename from t/api-all-links.t rename to t/api-rest/api-all-links.t diff --git a/t/api-auth.t b/t/api-rest/api-auth.t similarity index 100% rename from t/api-auth.t rename to t/api-rest/api-auth.t diff --git a/t/api-balanceintervals.t b/t/api-rest/api-balanceintervals.t similarity index 99% rename from t/api-balanceintervals.t rename to t/api-rest/api-balanceintervals.t index 76edbfe181..e538bfaced 100644 --- a/t/api-balanceintervals.t +++ b/t/api-rest/api-balanceintervals.t @@ -23,7 +23,7 @@ use JSON::PP; use LWP::Debug; BEGIN { - unshift(@INC,'../lib'); + unshift(@INC,'../../lib'); } use NGCP::Panel::Utils::DateTime qw(); use NGCP::Panel::Utils::ProfilePackages qw(); @@ -1618,4 +1618,4 @@ sub _create_gantt { #} return 0; -} \ No newline at end of file +} diff --git a/t/api-billingfees.t b/t/api-rest/api-billingfees.t similarity index 100% rename from t/api-billingfees.t rename to t/api-rest/api-billingfees.t diff --git a/t/api-billingnetworks.t b/t/api-rest/api-billingnetworks.t similarity index 99% rename from t/api-billingnetworks.t rename to t/api-rest/api-billingnetworks.t index e88162f928..80b9735be0 100644 --- a/t/api-billingnetworks.t +++ b/t/api-rest/api-billingnetworks.t @@ -10,7 +10,7 @@ use JSON::PP; use LWP::Debug; BEGIN { - unshift(@INC,'../lib'); + unshift(@INC,'../../lib'); } use NGCP::Panel::Utils::BillingNetworks qw(); diff --git a/t/api-billingprofiles.t b/t/api-rest/api-billingprofiles.t similarity index 100% rename from t/api-billingprofiles.t rename to t/api-rest/api-billingprofiles.t diff --git a/t/api-billingzones.t b/t/api-rest/api-billingzones.t similarity index 100% rename from t/api-billingzones.t rename to t/api-rest/api-billingzones.t diff --git a/t/api-callforwards.t b/t/api-rest/api-callforwards.t similarity index 100% rename from t/api-callforwards.t rename to t/api-rest/api-callforwards.t diff --git a/t/api-contracts.t b/t/api-rest/api-contracts.t similarity index 100% rename from t/api-contracts.t rename to t/api-rest/api-contracts.t diff --git a/t/api-customercontacts.t b/t/api-rest/api-customercontacts.t similarity index 100% rename from t/api-customercontacts.t rename to t/api-rest/api-customercontacts.t diff --git a/t/api-customers.t b/t/api-rest/api-customers.t similarity index 99% rename from t/api-customers.t rename to t/api-rest/api-customers.t index 2da2c82a2f..5663552648 100644 --- a/t/api-customers.t +++ b/t/api-rest/api-customers.t @@ -11,7 +11,7 @@ use DateTime::Format::Strptime qw(); use DateTime::Format::ISO8601 qw(); BEGIN { - unshift(@INC,'../lib'); + unshift(@INC,'../../lib'); } use NGCP::Panel::Utils::ProfilePackages qw(); diff --git a/t/api-journals.t b/t/api-rest/api-journals.t similarity index 99% rename from t/api-journals.t rename to t/api-rest/api-journals.t index 29b4324bc4..2a8d2029ef 100644 --- a/t/api-journals.t +++ b/t/api-rest/api-journals.t @@ -9,7 +9,7 @@ use JSON::PP; use LWP::Debug; BEGIN { - unshift(@INC,'../lib'); + unshift(@INC,'../../lib'); } use NGCP::Panel::Utils::Journal qw(); diff --git a/t/api-pbxdevicemodels.t b/t/api-rest/api-pbxdevicemodels.t similarity index 100% rename from t/api-pbxdevicemodels.t rename to t/api-rest/api-pbxdevicemodels.t diff --git a/t/api-pbxdevices.t b/t/api-rest/api-pbxdevices.t similarity index 100% rename from t/api-pbxdevices.t rename to t/api-rest/api-pbxdevices.t diff --git a/t/api-profilepackages.t b/t/api-rest/api-profilepackages.t similarity index 99% rename from t/api-profilepackages.t rename to t/api-rest/api-profilepackages.t index 874a62d6f5..8755f809e9 100644 --- a/t/api-profilepackages.t +++ b/t/api-rest/api-profilepackages.t @@ -10,7 +10,7 @@ use JSON::PP; use LWP::Debug; BEGIN { - unshift(@INC,'../lib'); + unshift(@INC,'../../lib'); } use NGCP::Panel::Utils::ProfilePackages qw(); diff --git a/t/api-resellers.t b/t/api-rest/api-resellers.t similarity index 100% rename from t/api-resellers.t rename to t/api-rest/api-resellers.t diff --git a/t/api-rewriterulesets.t b/t/api-rest/api-rewriterulesets.t similarity index 100% rename from t/api-rewriterulesets.t rename to t/api-rest/api-rewriterulesets.t diff --git a/t/api-root.t b/t/api-rest/api-root.t similarity index 100% rename from t/api-root.t rename to t/api-rest/api-root.t diff --git a/t/api-systemcontacts.t b/t/api-rest/api-systemcontacts.t similarity index 100% rename from t/api-systemcontacts.t rename to t/api-rest/api-systemcontacts.t diff --git a/t/api-threads.t b/t/api-rest/api-threads.t similarity index 90% rename from t/api-threads.t rename to t/api-rest/api-threads.t index 1d7c18484c..8855a1f3c8 100644 --- a/t/api-threads.t +++ b/t/api-rest/api-threads.t @@ -5,7 +5,7 @@ use Test::More; BEGIN { - unshift(@INC,'../lib'); + unshift(@INC,'../../lib'); } use NGCP::Panel::Utils::DateTime qw(); @@ -26,4 +26,4 @@ $t_b->join(); ok(1,'threads joined'); #ok($t_a + $t_b == 2,'test threads joined'); -done_testing; \ No newline at end of file +done_testing; diff --git a/t/api-trustedsources.t b/t/api-rest/api-trustedsources.t similarity index 100% rename from t/api-trustedsources.t rename to t/api-rest/api-trustedsources.t diff --git a/t/api-valid-patch.t b/t/api-rest/api-valid-patch.t similarity index 100% rename from t/api-valid-patch.t rename to t/api-rest/api-valid-patch.t diff --git a/t/api-vouchers.t b/t/api-rest/api-vouchers.t similarity index 100% rename from t/api-vouchers.t rename to t/api-rest/api-vouchers.t diff --git a/t/resources/api_devicemodels_front_image.jpg b/t/api-rest/resources/api_devicemodels_front_image.jpg similarity index 100% rename from t/resources/api_devicemodels_front_image.jpg rename to t/api-rest/resources/api_devicemodels_front_image.jpg diff --git a/t/resources/empty.txt b/t/api-rest/resources/empty.txt similarity index 100% rename from t/resources/empty.txt rename to t/api-rest/resources/empty.txt