Hinzufügen der globalen Testscripte, welche die einzelnene Test koordienieren und...

diff --git a/t/lx-office.t b/t/lx-office.t
index 0b583e1c30a9d8bc77be0843566989bf9fc1713c..ee52ab5c0f856d2fb8c19fc0719b8eb4f74ec37d 100644 (file)
--- a/t/lx-office.t
+++ b/t/lx-office.t
@@ -34,7 +34,7 @@
   use diagnostics;
   use Carp;
   use Test::Harness;
   use diagnostics;
   use Carp;
   use Test::Harness;

-
+  

   my %tests = ("all" => 't/selenium/TestAllTests.t',
                "system" => 't/selenium/TestSystem.t',
                "selling" => 't/selenium/TestSelling.t',
   my %tests = ("all" => 't/selenium/TestAllTests.t',
                "system" => 't/selenium/TestSystem.t',
                "selling" => 't/selenium/TestSelling.t',


@@ -176,4 +176,6 @@
     printf "\n\t\%s\n\t%s\n","Be ensure, that usage is promitted by login and db status!","\xAF" x 58;
   }
 unlink("/tmp/lxtest-temp.conf");
     printf "\n\t\%s\n\t%s\n","Be ensure, that usage is promitted by login and db status!","\xAF" x 58;
   }
 unlink("/tmp/lxtest-temp.conf");

+
+

 exit 1;
\ No newline at end of file
 exit 1;
\ No newline at end of file

diff --git a/t/selenium/AllTests.t b/t/selenium/AllTests.t
index 8a1a13e39b81357791fcd86b22b9f3368fc4d3e8..c5ebf1d19e600b793e48c8d13ce05a2ff30c4527 100644 (file)
--- a/t/selenium/AllTests.t
+++ b/t/selenium/AllTests.t
@@ -61,7 +61,7 @@
 #     plan tests => 200; # Need to be cutomized
 #   }
   sub init_server {
 #     plan tests => 200; # Need to be cutomized
 #   }
   sub init_server {

-    our $singlefileonly = 0;
+    my $singlefileonly = 0;

     if ($_[0] eq "singlefileonly") {  
       $singlefileonly = 1;
       shift;
     if ($_[0] eq "singlefileonly") {  
       $singlefileonly = 1;
       shift;


@@ -117,13 +117,21 @@
       foreach my $scriptdir (@_) {
         opendir(SCRIPTS, 't/selenium/testscripts/' . $scriptdir) or die "Can't open directory!" . $!;
         foreach (sort readdir(SCRIPTS)) {
       foreach my $scriptdir (@_) {
         opendir(SCRIPTS, 't/selenium/testscripts/' . $scriptdir) or die "Can't open directory!" . $!;
         foreach (sort readdir(SCRIPTS)) {

-          require_ok("t/selenium/testscripts/". $scriptdir . "/" . $_) if ( $_ =~ /^\w\d\d\d.*\.t$/);
+          if ( $_ =~ /^\w\d\d\d.*\.t$|^\d\d\d.*\.t$/  && !$sel->{ran_tests}{"t/selenium/testscripts/". $scriptdir . "/" . $_}) {
+            require_ok("t/selenium/testscripts/". $scriptdir . "/" . $_);
+            $sel->{ran_tests}{"t/selenium/testscripts/". $scriptdir . "/" . $_} = 1;
+          }

         }
         closedir(SCRIPTS);
       }
     }
     else {
         }
         closedir(SCRIPTS);
       }
     }
     else {

-      foreach (@_) { require_ok($_); }
+      foreach (@_) { 
+        if ( $_ =~ /^.*\/\w\d\d\d.*\.t$|^.*\/\d\d\d.*\.t$/  && !$sel->{ran_tests}{$_}) {
+          require_ok($_); 
+          $sel->{ran_tests}{$_} = 1;
+        }
+      }

     }
     if($!) {
       @! = ("Test fehlgeschlagen!");
     }
     if($!) {
       @! = ("Test fehlgeschlagen!");

diff --git a/t/selenium/TestAccounting.t b/t/selenium/TestAccounting.t
new file mode 100644 (file)
index 0000000..ea1ebd3
--- /dev/null
+++ b/t/selenium/TestAccounting.t
@@ -0,0 +1,5 @@
+require "t/selenium/AllTests.t";
+
+init_server("accounting/begin", "accounting/end");
+
+1;
\ No newline at end of file

diff --git a/t/selenium/TestAdmin.t b/t/selenium/TestAdmin.t
new file mode 100644 (file)
index 0000000..130f6cc
--- /dev/null
+++ b/t/selenium/TestAdmin.t
@@ -0,0 +1,5 @@
+require "t/selenium/AllTests.t";
+
+init_server("administration/begin", "administration/end");
+
+1;
\ No newline at end of file

diff --git a/t/selenium/TestAllTests.t b/t/selenium/TestAllTests.t
new file mode 100644 (file)
index 0000000..4425638
--- /dev/null
+++ b/t/selenium/TestAllTests.t
@@ -0,0 +1,8 @@
+require "t/selenium/AllTests.t";
+
+init_server("administration/begin", "system/begin", "masterdata/begin", "selling/begin", "purchase/begin", 
+            "accounting/begin", "payments/begin", "reports/begin", "programm/begin", 
+            "programm/end", "reports/end", "payments/end", "accounting/end", "purchase/end", "selling/end",
+            "masterdata/end", "system/end", "administration/end");
+
+1;
\ No newline at end of file

diff --git a/t/selenium/TestCreateTestbed.t b/t/selenium/TestCreateTestbed.t
new file mode 100644 (file)
index 0000000..012ce9b
--- /dev/null
+++ b/t/selenium/TestCreateTestbed.t
@@ -0,0 +1,8 @@
+require "t/selenium/AllTests.t";
+
+init_server("administration/begin", "system/begin", "masterdata/begin");
+  
+diag("\n\nUsername: " .  $lxtest->{testuserlogin} . "\n" . "Password: " .  $lxtest->{testuserpasswd} . "\n\n");
+
+1;
+

diff --git a/t/selenium/TestMasterData.t b/t/selenium/TestMasterData.t
new file mode 100644 (file)
index 0000000..86c43a8
--- /dev/null
+++ b/t/selenium/TestMasterData.t
@@ -0,0 +1,5 @@
+require "t/selenium/AllTests.t";
+
+init_server("masterdata/begin", "masterdata/end");
+  
+1;
\ No newline at end of file

diff --git a/t/selenium/TestPayments.t b/t/selenium/TestPayments.t
new file mode 100644 (file)
index 0000000..2e2a8d5
--- /dev/null
+++ b/t/selenium/TestPayments.t
@@ -0,0 +1,5 @@
+require "t/selenium/AllTests.t";
+
+init_server("payments/begin", "payments/end");
+
+1;
\ No newline at end of file

diff --git a/t/selenium/TestPrinting.t b/t/selenium/TestPrinting.t
new file mode 100644 (file)
index 0000000..75b9851
--- /dev/null
+++ b/t/selenium/TestPrinting.t
@@ -0,0 +1,5 @@
+require "t/selenium/AllTests.t";
+
+init_server("printing/begin", "printing/end");
+
+1;
\ No newline at end of file

diff --git a/t/selenium/TestProgramm.t b/t/selenium/TestProgramm.t
new file mode 100644 (file)
index 0000000..dffb6a3
--- /dev/null
+++ b/t/selenium/TestProgramm.t
@@ -0,0 +1,5 @@
+require "t/selenium/AllTests.t";
+
+init_server("programm/begin", "programm/end");
+
+1;
\ No newline at end of file

diff --git a/t/selenium/TestPurchase.t b/t/selenium/TestPurchase.t
new file mode 100644 (file)
index 0000000..19cdf56
--- /dev/null
+++ b/t/selenium/TestPurchase.t
@@ -0,0 +1,5 @@
+require "t/selenium/AllTests.t";
+
+init_server("purchase/begin", "purchase/end");
+
+1;
\ No newline at end of file

diff --git a/t/selenium/TestSelling.t b/t/selenium/TestSelling.t
new file mode 100644 (file)
index 0000000..ca31ecc
--- /dev/null
+++ b/t/selenium/TestSelling.t
@@ -0,0 +1,5 @@
+require "t/selenium/AllTests.t";
+
+init_server("selling/begin", "selling/end");
+
+1;
\ No newline at end of file

diff --git a/t/selenium/TestSystem.t b/t/selenium/TestSystem.t
new file mode 100644 (file)
index 0000000..6dee18c
--- /dev/null
+++ b/t/selenium/TestSystem.t
@@ -0,0 +1,5 @@
+require "t/selenium/AllTests.t";
+
+init_server("system/begin", "system/end");
+
+1;
\ No newline at end of file

diff --git a/t/selenium/testscripts/base/000Login.t b/t/selenium/testscripts/base/000Login.t
index 5dc1137e9aaa65a532cfceae2d455cbe4432d73e..864ebd120007ca0b6ee86f0b0adf16b4b65a0ba7 100644 (file)
--- a/t/selenium/testscripts/base/000Login.t
+++ b/t/selenium/testscripts/base/000Login.t
@@ -32,5 +32,5 @@ if($sel->get_title() eq "Datenbankaktualisierung - Lx-Office Version 2.4.3 - -")
 }
   
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 }
   
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});

-
+$sel->{ran_tests}{"t/selenium/testscripts/base/999Logout.t"} = 0;

 1;
\ No newline at end of file
 1;
\ No newline at end of file

diff --git a/t/selenium/testscripts/base/999Logout.t b/t/selenium/testscripts/base/999Logout.t
index 03c90d72d7a34b3458a6d0efcf38a806c76d823d..247d61e1822fee5f70d3e95c5cf537273c17a4c1 100644 (file)
--- a/t/selenium/testscripts/base/999Logout.t
+++ b/t/selenium/testscripts/base/999Logout.t
@@ -11,4 +11,5 @@ $sel->select_frame_ok("relative=top");
 $sel->click_ok("link=abmelden");
 $sel->wait_for_page_to_load_ok($lxtest->{timeout});
 $sel->title_is("Lx-Office Version ".$lxtest->{version});
 $sel->click_ok("link=abmelden");
 $sel->wait_for_page_to_load_ok($lxtest->{timeout});
 $sel->title_is("Lx-Office Version ".$lxtest->{version});

+$sel->{ran_tests}{"t/selenium/testscripts/base/000Login.t"} = 0;

 1;
\ No newline at end of file
 1;
\ No newline at end of file