From 55530b055c388056433d4381eb5b24f342b80079 Mon Sep 17 00:00:00 2001
From: Dominique FOURNIER <dominique.fournier@grenoble.cnrs.fr>
Date: Fri, 7 May 2021 16:55:38 +0200
Subject: [PATCH] Update Tests to supports namespaces

---
 Tests/{authTest.php => AuthTest.php}          | 14 ++++---
 ...hhtpasswdTest.php => AuthhtpasswdTest.php} |  2 +-
 Tests/{authjwtTest.php => AuthjwtTest.php}    |  2 +-
 .../{authsympaTest.php => AuthsympaTest.php}  |  2 +-
 ...uthzgroupsTest.php => AuthzgroupsTest.php} |  2 +-
 ...groupsooTest.php => AuthzgroupsooTest.php} |  2 +-
 .../{cachefileTest.php => CachefileTest.php}  |  2 +-
 ...est.php => CertificationauthorityTest.php} |  2 +-
 Tests/{configTest.php => ConfigTest.php}      |  2 +-
 Tests/{convertTest.php => ConvertTest.php}    |  2 +-
 Tests/{csrfTest.php => CsrfTest.php}          |  2 +-
 Tests/{dbjsonTest.php => DbjsonTest.php}      |  2 +-
 ...{dblayerComplet.php => DblayerComplet.php} |  0
 ...upsTest.php => DblayerauthzgroupsTest.php} |  2 +-
 ...ayerooComplet.php => DblayerooComplet.php} |  0
 Tests/{encryptTest.php => EncryptTest.php}    |  2 +-
 Tests/{fileTest.php => FileTest.php}          |  2 +-
 Tests/{ftsTest.php => FtsTest.php}            |  2 +-
 Tests/{getoptsTest.php => GetoptsTest.php}    |  2 +-
 Tests/{httpTest.php => HttpTest.php}          |  2 +-
 Tests/{inifileTest.php => InifileTest.php}    |  2 +-
 ...paddressesTest.php => IpaddressesTest.php} |  2 +-
 Tests/{jwtTest.php => JwtTest.php}            |  2 +-
 ...addressesTest.php => MacaddressesTest.php} |  2 +-
 Tests/{mailTest.php => MailTest.php}          |  2 +-
 Tests/{markdownTest.php => MarkdownTest.php}  |  2 +-
 Tests/{outputdlTest.php => OutputdlTest.php}  |  2 +-
 ...{outputhtmlTest.php => OutputhtmlTest.php} |  2 +-
 ...{outputjsonTest.php => OutputjsonTest.php} |  2 +-
 Tests/{passwordTest.php => PasswordTest.php}  |  2 +-
 Tests/{queueTest.php => QueueTest.php}        |  2 +-
 .../{queuefileTest.php => QueuefileTest.php}  |  2 +-
 .../{ratelimitTest.php => RatelimitTest.php}  |  2 +-
 ...imitfileTest.php => RatelimitfileTest.php} |  2 +-
 Tests/{restTest.php => RestTest.php}          |  2 +-
 .../{robotstxtTest.php => RobotstxtTest.php}  |  2 +-
 Tests/{routeTest.php => RouteTest.php}        |  2 +-
 Tests/{rssTest.php => RssTest.php}            |  2 +-
 Tests/{sitemapTest.php => SitemapTest.php}    |  2 +-
 Tests/{spfcheckTest.php => SpfcheckTest.php}  |  2 +-
 Tests/{sseTest.php => SseTest.php}            |  2 +-
 .../{tcpclientTest.php => TcpclientTest.php}  |  2 +-
 Tests/{userssqlTest.php => UserssqlTest.php}  |  2 +-
 Tests/{uuidTest.php => UuidTest.php}          |  2 +-
 Tests/{verifyTest.php => VerifyTest.php}      |  2 +-
 Tests/{xdiffTest.php => XdiffTest.php}        |  2 +-
 ...{xmppclientTest.php => XmppclientTest.php} |  2 +-
 Tests/autoload.php.dist                       | 42 +++++++++++++------
 src/Version.php                               |  2 +-
 49 files changed, 82 insertions(+), 64 deletions(-)
 rename Tests/{authTest.php => AuthTest.php} (84%)
 rename Tests/{authhtpasswdTest.php => AuthhtpasswdTest.php} (96%)
 rename Tests/{authjwtTest.php => AuthjwtTest.php} (99%)
 rename Tests/{authsympaTest.php => AuthsympaTest.php} (97%)
 rename Tests/{authzgroupsTest.php => AuthzgroupsTest.php} (99%)
 rename Tests/{authzgroupsooTest.php => AuthzgroupsooTest.php} (99%)
 rename Tests/{cachefileTest.php => CachefileTest.php} (97%)
 rename Tests/{certificationauthorityTest.php => CertificationauthorityTest.php} (98%)
 rename Tests/{configTest.php => ConfigTest.php} (99%)
 rename Tests/{convertTest.php => ConvertTest.php} (98%)
 rename Tests/{csrfTest.php => CsrfTest.php} (97%)
 rename Tests/{dbjsonTest.php => DbjsonTest.php} (99%)
 rename Tests/{dblayerComplet.php => DblayerComplet.php} (100%)
 rename Tests/{dblayerauthzgroupsTest.php => DblayerauthzgroupsTest.php} (99%)
 rename Tests/{dblayerooComplet.php => DblayerooComplet.php} (100%)
 rename Tests/{encryptTest.php => EncryptTest.php} (98%)
 rename Tests/{fileTest.php => FileTest.php} (99%)
 rename Tests/{ftsTest.php => FtsTest.php} (99%)
 rename Tests/{getoptsTest.php => GetoptsTest.php} (99%)
 rename Tests/{httpTest.php => HttpTest.php} (96%)
 rename Tests/{inifileTest.php => InifileTest.php} (99%)
 rename Tests/{ipaddressesTest.php => IpaddressesTest.php} (99%)
 rename Tests/{jwtTest.php => JwtTest.php} (99%)
 rename Tests/{macaddressesTest.php => MacaddressesTest.php} (97%)
 rename Tests/{mailTest.php => MailTest.php} (99%)
 rename Tests/{markdownTest.php => MarkdownTest.php} (99%)
 rename Tests/{outputdlTest.php => OutputdlTest.php} (99%)
 rename Tests/{outputhtmlTest.php => OutputhtmlTest.php} (96%)
 rename Tests/{outputjsonTest.php => OutputjsonTest.php} (92%)
 rename Tests/{passwordTest.php => PasswordTest.php} (99%)
 rename Tests/{queueTest.php => QueueTest.php} (83%)
 rename Tests/{queuefileTest.php => QueuefileTest.php} (98%)
 rename Tests/{ratelimitTest.php => RatelimitTest.php} (83%)
 rename Tests/{ratelimitfileTest.php => RatelimitfileTest.php} (97%)
 rename Tests/{restTest.php => RestTest.php} (96%)
 rename Tests/{robotstxtTest.php => RobotstxtTest.php} (99%)
 rename Tests/{routeTest.php => RouteTest.php} (99%)
 rename Tests/{rssTest.php => RssTest.php} (98%)
 rename Tests/{sitemapTest.php => SitemapTest.php} (98%)
 rename Tests/{spfcheckTest.php => SpfcheckTest.php} (99%)
 rename Tests/{sseTest.php => SseTest.php} (98%)
 rename Tests/{tcpclientTest.php => TcpclientTest.php} (97%)
 rename Tests/{userssqlTest.php => UserssqlTest.php} (98%)
 rename Tests/{uuidTest.php => UuidTest.php} (90%)
 rename Tests/{verifyTest.php => VerifyTest.php} (98%)
 rename Tests/{xdiffTest.php => XdiffTest.php} (99%)
 rename Tests/{xmppclientTest.php => XmppclientTest.php} (97%)

diff --git a/Tests/authTest.php b/Tests/AuthTest.php
similarity index 84%
rename from Tests/authTest.php
rename to Tests/AuthTest.php
index 0621cce..85c324c 100644
--- a/Tests/authTest.php
+++ b/Tests/AuthTest.php
@@ -7,26 +7,28 @@
 
 namespace Domframework\Tests;
 
+use Domframework\Auth;
+
 /** Test the authentication  */
-class authTest extends PHPUnit_Framework_TestCase
+class AuthTest extends \PHPUnit_Framework_TestCase
 {
   public function test_page_1 ()
   {
-    $auth = new auth ();
+    $auth = new Auth ();
     $res = $auth->pageHTML ("http://localhost");
     $this->assertSame (!! strpos ($res, "<form "), true);
   }
 
   public function test_Message ()
   {
-    $auth = new auth ();
+    $auth = new Auth ();
     $res = $auth->pageHTML ("http://localhost", "MESSAGE");
     $this->assertSame (!! strpos ($res, "MESSAGE"), true);
   }
 
   public function test_URL_1 ()
   {
-    $auth = new auth ();
+    $auth = new Auth ();
     $res = $auth->pageHTML ("http://localhost", "MESSAGE", "URL/TEST");
     $this->assertSame (!! strpos ($res, "URL/TEST"), true);
   }
@@ -34,7 +36,7 @@ class authTest extends PHPUnit_Framework_TestCase
   public function test_alreadyAuth_1 ()
   {
     // Not Authenticated
-    $auth = new auth ();
+    $auth = new Auth ();
     $res = $auth->pageHTML ("http://localhost", "MESSAGE", "URL/TEST", false);
     $this->assertSame (!! strpos ($res, "Please sign in"), true);
   }
@@ -42,7 +44,7 @@ class authTest extends PHPUnit_Framework_TestCase
   public function test_alreadyAuth_2 ()
   {
     // Authenticated
-    $auth = new auth ();
+    $auth = new Auth ();
     $res = $auth->pageHTML ("http://localhost", "", "", "AUTHENTICATED USER");
     $this->assertSame (!! strpos ($res, "AUTHENTICATED USER"), true);
   }
diff --git a/Tests/authhtpasswdTest.php b/Tests/AuthhtpasswdTest.php
similarity index 96%
rename from Tests/authhtpasswdTest.php
rename to Tests/AuthhtpasswdTest.php
index 53dae2c..5523541 100644
--- a/Tests/authhtpasswdTest.php
+++ b/Tests/AuthhtpasswdTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the authhtpasswd.php file */
-class authhtpasswdTest extends PHPUnit_Framework_TestCase
+class authhtpasswdTest extends \PHPUnit_Framework_TestCase
 {
   public function test_clean ()
   {
diff --git a/Tests/authjwtTest.php b/Tests/AuthjwtTest.php
similarity index 99%
rename from Tests/authjwtTest.php
rename to Tests/AuthjwtTest.php
index e1b6e81..0484ec9 100644
--- a/Tests/authjwtTest.php
+++ b/Tests/AuthjwtTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the authjwt.php file */
-class authjwtTest extends PHPUnit_Framework_TestCase
+class authjwtTest extends \PHPUnit_Framework_TestCase
 {
   public function __construct ()
   {
diff --git a/Tests/authsympaTest.php b/Tests/AuthsympaTest.php
similarity index 97%
rename from Tests/authsympaTest.php
rename to Tests/AuthsympaTest.php
index 0aed09e..3ed035e 100644
--- a/Tests/authsympaTest.php
+++ b/Tests/AuthsympaTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the authentication on Sympa Service */
-class authsympaTest extends PHPUnit_Framework_TestCase
+class authsympaTest extends \PHPUnit_Framework_TestCase
 {
   public function test_connect_1 ()
   {
diff --git a/Tests/authzgroupsTest.php b/Tests/AuthzgroupsTest.php
similarity index 99%
rename from Tests/authzgroupsTest.php
rename to Tests/AuthzgroupsTest.php
index 357d254..dfa73d7 100644
--- a/Tests/authzgroupsTest.php
+++ b/Tests/AuthzgroupsTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the authzgroups.php file */
-class authzgroupsTest extends PHPUnit_Framework_TestCase
+class authzgroupsTest extends \PHPUnit_Framework_TestCase
 {
   private $dbconfig = array (
     "dsn" => "sqlite:/tmp/databaseAuthzGroups.db",
diff --git a/Tests/authzgroupsooTest.php b/Tests/AuthzgroupsooTest.php
similarity index 99%
rename from Tests/authzgroupsooTest.php
rename to Tests/AuthzgroupsooTest.php
index e7c8acf..f4af458 100644
--- a/Tests/authzgroupsooTest.php
+++ b/Tests/AuthzgroupsooTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the authzgroupsoo.php file */
-class authzgroupsooTest extends PHPUnit_Framework_TestCase
+class authzgroupsooTest extends \PHPUnit_Framework_TestCase
 {
   private $dbconfig = array (
     "dsn" => "sqlite:/tmp/databaseAuthzGroupsoo.db",
diff --git a/Tests/cachefileTest.php b/Tests/CachefileTest.php
similarity index 97%
rename from Tests/cachefileTest.php
rename to Tests/CachefileTest.php
index d3647ea..8976fb9 100644
--- a/Tests/cachefileTest.php
+++ b/Tests/CachefileTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the cache.php file */
-class cachefileTest extends PHPUnit_Framework_TestCase
+class cachefileTest extends \PHPUnit_Framework_TestCase
 {
   public function testInit ()
   {
diff --git a/Tests/certificationauthorityTest.php b/Tests/CertificationauthorityTest.php
similarity index 98%
rename from Tests/certificationauthorityTest.php
rename to Tests/CertificationauthorityTest.php
index b30d781..83f083f 100644
--- a/Tests/certificationauthorityTest.php
+++ b/Tests/CertificationauthorityTest.php
@@ -9,7 +9,7 @@ namespace Domframework\Tests;
 
 /** Test the certification Authority
   */
-class certificationauthorityTest extends PHPUnit_Framework_TestCase
+class certificationauthorityTest extends \PHPUnit_Framework_TestCase
 {
   public function test_createCA_1 ()
   {
diff --git a/Tests/configTest.php b/Tests/ConfigTest.php
similarity index 99%
rename from Tests/configTest.php
rename to Tests/ConfigTest.php
index caa4f87..d626ae1 100644
--- a/Tests/configTest.php
+++ b/Tests/ConfigTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the config.php file */
-class configTest extends PHPUnit_Framework_TestCase
+class configTest extends \PHPUnit_Framework_TestCase
 {
 
   public function test_ExternFile ()
diff --git a/Tests/convertTest.php b/Tests/ConvertTest.php
similarity index 98%
rename from Tests/convertTest.php
rename to Tests/ConvertTest.php
index d129189..646a370 100644
--- a/Tests/convertTest.php
+++ b/Tests/ConvertTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the Conversion of format */
-class convertTest extends PHPUnit_Framework_TestCase
+class convertTest extends \PHPUnit_Framework_TestCase
 {
   public function test_convertDate1 ()
   {
diff --git a/Tests/csrfTest.php b/Tests/CsrfTest.php
similarity index 97%
rename from Tests/csrfTest.php
rename to Tests/CsrfTest.php
index 44b36de..29b95ae 100644
--- a/Tests/csrfTest.php
+++ b/Tests/CsrfTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the csrf.php file */
-class csrfTest extends PHPUnit_Framework_TestCase
+class csrfTest extends \PHPUnit_Framework_TestCase
 {
   public function test_csrf1 ()
   {
diff --git a/Tests/dbjsonTest.php b/Tests/DbjsonTest.php
similarity index 99%
rename from Tests/dbjsonTest.php
rename to Tests/DbjsonTest.php
index 10b54e5..b73d5f6 100644
--- a/Tests/dbjsonTest.php
+++ b/Tests/DbjsonTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the dbjson database */
-class dbjsonTest extends PHPUnit_Framework_TestCase
+class dbjsonTest extends \PHPUnit_Framework_TestCase
 {
   public function test_insertOne1 ()
   {
diff --git a/Tests/dblayerComplet.php b/Tests/DblayerComplet.php
similarity index 100%
rename from Tests/dblayerComplet.php
rename to Tests/DblayerComplet.php
diff --git a/Tests/dblayerauthzgroupsTest.php b/Tests/DblayerauthzgroupsTest.php
similarity index 99%
rename from Tests/dblayerauthzgroupsTest.php
rename to Tests/DblayerauthzgroupsTest.php
index 5e94aaf..6f806c7 100644
--- a/Tests/dblayerauthzgroupsTest.php
+++ b/Tests/DblayerauthzgroupsTest.php
@@ -7,7 +7,7 @@
 
 namespace Domframework\Tests;
 
-class dblayerauthzgroupsTest extends PHPUnit_Framework_TestCase
+class dblayerauthzgroupsTest extends \PHPUnit_Framework_TestCase
 {
   public $confs = array (
     "sqlite" => array (
diff --git a/Tests/dblayerooComplet.php b/Tests/DblayerooComplet.php
similarity index 100%
rename from Tests/dblayerooComplet.php
rename to Tests/DblayerooComplet.php
diff --git a/Tests/encryptTest.php b/Tests/EncryptTest.php
similarity index 98%
rename from Tests/encryptTest.php
rename to Tests/EncryptTest.php
index 25cd1fe..bed7c33 100644
--- a/Tests/encryptTest.php
+++ b/Tests/EncryptTest.php
@@ -5,7 +5,7 @@
   */
 
 /** Test the encrypt.php file */
-class encryptTest extends PHPUnit_Framework_TestCase
+class encryptTest extends \PHPUnit_Framework_TestCase
 {
   /** Check the length of the otken with cipher
     */
diff --git a/Tests/fileTest.php b/Tests/FileTest.php
similarity index 99%
rename from Tests/fileTest.php
rename to Tests/FileTest.php
index e8ddb23..5d7d5ae 100644
--- a/Tests/fileTest.php
+++ b/Tests/FileTest.php
@@ -4,7 +4,7 @@
     @author Dominique Fournier <dominique@fournier38.fr> */
 
 /** Test the domframework file part */
-class fileTest extends PHPUnit_Framework_TestCase
+class fileTest extends \PHPUnit_Framework_TestCase
 {
   public function testinit ()
   {
diff --git a/Tests/ftsTest.php b/Tests/FtsTest.php
similarity index 99%
rename from Tests/ftsTest.php
rename to Tests/FtsTest.php
index 2d382f2..beb9fb1 100644
--- a/Tests/ftsTest.php
+++ b/Tests/FtsTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /** Test the FTS */
-class ftsTest extends PHPUnit_Framework_TestCase
+class ftsTest extends \PHPUnit_Framework_TestCase
 {
   public function test_tokenizerSearch0 ()
   {
diff --git a/Tests/getoptsTest.php b/Tests/GetoptsTest.php
similarity index 99%
rename from Tests/getoptsTest.php
rename to Tests/GetoptsTest.php
index 7c2aca3..005965b 100644
--- a/Tests/getoptsTest.php
+++ b/Tests/GetoptsTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the GetOpts */
-class getoptsTest extends PHPUnit_Framework_TestCase
+class getoptsTest extends \PHPUnit_Framework_TestCase
 {
   public function test_empty1 ()
   {
diff --git a/Tests/httpTest.php b/Tests/HttpTest.php
similarity index 96%
rename from Tests/httpTest.php
rename to Tests/HttpTest.php
index a4f8878..0c10307 100644
--- a/Tests/httpTest.php
+++ b/Tests/HttpTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the http.php file */
-class httpTest extends PHPUnit_Framework_TestCase
+class httpTest extends \PHPUnit_Framework_TestCase
 {
   /** bestChoice : exact existing entry
     */
diff --git a/Tests/inifileTest.php b/Tests/InifileTest.php
similarity index 99%
rename from Tests/inifileTest.php
rename to Tests/InifileTest.php
index 58ef327..b52918b 100644
--- a/Tests/inifileTest.php
+++ b/Tests/InifileTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the outputjson.php file */
-class inifileTest extends PHPUnit_Framework_TestCase
+class inifileTest extends \PHPUnit_Framework_TestCase
 {
   public function testsetString001 ()
   {
diff --git a/Tests/ipaddressesTest.php b/Tests/IpaddressesTest.php
similarity index 99%
rename from Tests/ipaddressesTest.php
rename to Tests/IpaddressesTest.php
index 605d790..761f24f 100644
--- a/Tests/ipaddressesTest.php
+++ b/Tests/IpaddressesTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the ipaddresses.php file */
-class ipaddressesTest extends PHPUnit_Framework_TestCase
+class ipaddressesTest extends \PHPUnit_Framework_TestCase
 {
   public function test_validIPAddress1 ()
   {
diff --git a/Tests/jwtTest.php b/Tests/JwtTest.php
similarity index 99%
rename from Tests/jwtTest.php
rename to Tests/JwtTest.php
index 88d994b..a49f90d 100644
--- a/Tests/jwtTest.php
+++ b/Tests/JwtTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the jwt.php file */
-class jwtTest extends PHPUnit_Framework_TestCase
+class jwtTest extends \PHPUnit_Framework_TestCase
 {
   public function test_createKey_1 ()
   {
diff --git a/Tests/macaddressesTest.php b/Tests/MacaddressesTest.php
similarity index 97%
rename from Tests/macaddressesTest.php
rename to Tests/MacaddressesTest.php
index 766d1a0..6f3b0c4 100644
--- a/Tests/macaddressesTest.php
+++ b/Tests/MacaddressesTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the macaddresses.php file */
-class macaddressesTest extends PHPUnit_Framework_TestCase
+class macaddressesTest extends \PHPUnit_Framework_TestCase
 {
   public function test_isMACAddress_1 ()
   {
diff --git a/Tests/mailTest.php b/Tests/MailTest.php
similarity index 99%
rename from Tests/mailTest.php
rename to Tests/MailTest.php
index 0ceb380..c430866 100644
--- a/Tests/mailTest.php
+++ b/Tests/MailTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the mail.php file */
-class mailTest extends PHPUnit_Framework_TestCase
+class mailTest extends \PHPUnit_Framework_TestCase
 {
   public function test_setBodyText1 ()
   {
diff --git a/Tests/markdownTest.php b/Tests/MarkdownTest.php
similarity index 99%
rename from Tests/markdownTest.php
rename to Tests/MarkdownTest.php
index f4eec16..96e70a3 100644
--- a/Tests/markdownTest.php
+++ b/Tests/MarkdownTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the outputjson.php file */
-class markdownTest extends PHPUnit_Framework_TestCase
+class markdownTest extends \PHPUnit_Framework_TestCase
 {
   //   TitleSeText
   public function testTitleSeText1 ()
diff --git a/Tests/outputdlTest.php b/Tests/OutputdlTest.php
similarity index 99%
rename from Tests/outputdlTest.php
rename to Tests/OutputdlTest.php
index 6318dc9..b8291aa 100644
--- a/Tests/outputdlTest.php
+++ b/Tests/OutputdlTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the outputdl.php file */
-class outputdlTest extends PHPUnit_Framework_TestCase
+class outputdlTest extends \PHPUnit_Framework_TestCase
 {
   public function test_outputdl_init ()
   {
diff --git a/Tests/outputhtmlTest.php b/Tests/OutputhtmlTest.php
similarity index 96%
rename from Tests/outputhtmlTest.php
rename to Tests/OutputhtmlTest.php
index 6cd9f50..cd746b6 100644
--- a/Tests/outputhtmlTest.php
+++ b/Tests/OutputhtmlTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the outputhtml.php file */
-class outputhtmlTest extends PHPUnit_Framework_TestCase
+class outputhtmlTest extends \PHPUnit_Framework_TestCase
 {
   /** Entry null */
   public function testlayout1 ()
diff --git a/Tests/outputjsonTest.php b/Tests/OutputjsonTest.php
similarity index 92%
rename from Tests/outputjsonTest.php
rename to Tests/OutputjsonTest.php
index 7358f97..952baf8 100644
--- a/Tests/outputjsonTest.php
+++ b/Tests/OutputjsonTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the outputjson.php file */
-class outputjsonTest extends PHPUnit_Framework_TestCase
+class outputjsonTest extends \PHPUnit_Framework_TestCase
 {
   /** Entry null */
   public function testoutputjson1 ()
diff --git a/Tests/passwordTest.php b/Tests/PasswordTest.php
similarity index 99%
rename from Tests/passwordTest.php
rename to Tests/PasswordTest.php
index a4cf42d..2d1d408 100644
--- a/Tests/passwordTest.php
+++ b/Tests/PasswordTest.php
@@ -9,7 +9,7 @@ namespace Domframework\Tests;
 
 /** Test the password class
   */
-class passwordTest extends PHPUnit_Framework_TestCase
+class passwordTest extends \PHPUnit_Framework_TestCase
 {
   public function test_cryptPasswd_1 ()
   {
diff --git a/Tests/queueTest.php b/Tests/QueueTest.php
similarity index 83%
rename from Tests/queueTest.php
rename to Tests/QueueTest.php
index 8ce1e6f..c315163 100644
--- a/Tests/queueTest.php
+++ b/Tests/QueueTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the queue.php file */
-class queueTest extends PHPUnit_Framework_TestCase
+class queueTest extends \PHPUnit_Framework_TestCase
 {
   public function test ()
   {
diff --git a/Tests/queuefileTest.php b/Tests/QueuefileTest.php
similarity index 98%
rename from Tests/queuefileTest.php
rename to Tests/QueuefileTest.php
index 30fc2c1..622c543 100644
--- a/Tests/queuefileTest.php
+++ b/Tests/QueuefileTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the queuefile.php file */
-class queuefileTest extends PHPUnit_Framework_TestCase
+class queuefileTest extends \PHPUnit_Framework_TestCase
 {
   public function test_clean ()
   {
diff --git a/Tests/ratelimitTest.php b/Tests/RatelimitTest.php
similarity index 83%
rename from Tests/ratelimitTest.php
rename to Tests/RatelimitTest.php
index 99cf1cb..fd48b8a 100644
--- a/Tests/ratelimitTest.php
+++ b/Tests/RatelimitTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the ratelimit.php file */
-class ratelimitTest extends PHPUnit_Framework_TestCase
+class ratelimitTest extends \PHPUnit_Framework_TestCase
 {
   public function test_ratelimit0 ()
   {
diff --git a/Tests/ratelimitfileTest.php b/Tests/RatelimitfileTest.php
similarity index 97%
rename from Tests/ratelimitfileTest.php
rename to Tests/RatelimitfileTest.php
index 01c79f6..6af6066 100644
--- a/Tests/ratelimitfileTest.php
+++ b/Tests/RatelimitfileTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the ratelimitfile.php file */
-class ratelimitfileTest extends PHPUnit_Framework_TestCase
+class ratelimitfileTest extends \PHPUnit_Framework_TestCase
 {
   public function test_ratelimitfile0 ()
   {
diff --git a/Tests/restTest.php b/Tests/RestTest.php
similarity index 96%
rename from Tests/restTest.php
rename to Tests/RestTest.php
index 5654d2a..ccdb87c 100644
--- a/Tests/restTest.php
+++ b/Tests/RestTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the domframework REST part */
-class restTest extends PHPUnit_Framework_TestCase
+class restTest extends \PHPUnit_Framework_TestCase
 {
   /** No param, JSON by default
     */
diff --git a/Tests/robotstxtTest.php b/Tests/RobotstxtTest.php
similarity index 99%
rename from Tests/robotstxtTest.php
rename to Tests/RobotstxtTest.php
index f03984c..4edff43 100644
--- a/Tests/robotstxtTest.php
+++ b/Tests/RobotstxtTest.php
@@ -9,7 +9,7 @@ namespace Domframework\Tests;
 
 /** Test the robotstxt file
   */
-class robotstxtTest extends PHPUnit_Framework_TestCase
+class robotstxtTest extends \PHPUnit_Framework_TestCase
 {
   // Empty Robots
   public function test_Construct_1 ()
diff --git a/Tests/routeTest.php b/Tests/RouteTest.php
similarity index 99%
rename from Tests/routeTest.php
rename to Tests/RouteTest.php
index 465063e..dc875e2 100644
--- a/Tests/routeTest.php
+++ b/Tests/RouteTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the route.php file */
-class routeTest extends PHPUnit_Framework_TestCase
+class routeTest extends \PHPUnit_Framework_TestCase
 {
   /// RELATIVE ///
   /** Entry null */
diff --git a/Tests/rssTest.php b/Tests/RssTest.php
similarity index 98%
rename from Tests/rssTest.php
rename to Tests/RssTest.php
index 0487db2..2788089 100644
--- a/Tests/rssTest.php
+++ b/Tests/RssTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the RSS */
-class rssTest extends PHPUnit_Framework_TestCase
+class rssTest extends \PHPUnit_Framework_TestCase
 {
   public function test_empty0 ()
   {
diff --git a/Tests/sitemapTest.php b/Tests/SitemapTest.php
similarity index 98%
rename from Tests/sitemapTest.php
rename to Tests/SitemapTest.php
index 0cf1838..6e53da9 100644
--- a/Tests/sitemapTest.php
+++ b/Tests/SitemapTest.php
@@ -9,7 +9,7 @@ namespace Domframework\Tests;
 
 /** Test the sitemap.php file
   */
-class sitemapTest extends PHPUnit_Framework_TestCase
+class sitemapTest extends \PHPUnit_Framework_TestCase
 {
   // Empty Sitemap
   public function test_EmptySitemap_1 ()
diff --git a/Tests/spfcheckTest.php b/Tests/SpfcheckTest.php
similarity index 99%
rename from Tests/spfcheckTest.php
rename to Tests/SpfcheckTest.php
index 0204220..326bc7d 100644
--- a/Tests/spfcheckTest.php
+++ b/Tests/SpfcheckTest.php
@@ -9,7 +9,7 @@ namespace Domframework\Tests;
 
 /** Test the spfcheck tools
   */
-class spfcheckTest extends PHPUnit_Framework_TestCase
+class spfcheckTest extends \PHPUnit_Framework_TestCase
 {
   public function test_getRecords_NoSPF ()
   {
diff --git a/Tests/sseTest.php b/Tests/SseTest.php
similarity index 98%
rename from Tests/sseTest.php
rename to Tests/SseTest.php
index 8232eee..1800515 100644
--- a/Tests/sseTest.php
+++ b/Tests/SseTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the domframework Server-Sent Events part */
-class sseTest extends PHPUnit_Framework_TestCase
+class sseTest extends \PHPUnit_Framework_TestCase
 {
   public function test_loop_NOTDEFINED  ()
   {
diff --git a/Tests/tcpclientTest.php b/Tests/TcpclientTest.php
similarity index 97%
rename from Tests/tcpclientTest.php
rename to Tests/TcpclientTest.php
index e1a7338..9307b6f 100644
--- a/Tests/tcpclientTest.php
+++ b/Tests/TcpclientTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the TCP client */
-class tcpclientTest extends  PHPUnit_Framework_TestCase
+class tcpclientTest extends  \PHPUnit_Framework_TestCase
 {
   public function test_GoogleIPv4 ()
   {
diff --git a/Tests/userssqlTest.php b/Tests/UserssqlTest.php
similarity index 98%
rename from Tests/userssqlTest.php
rename to Tests/UserssqlTest.php
index 4bda05a..36b635d 100644
--- a/Tests/userssqlTest.php
+++ b/Tests/UserssqlTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the userssql.php file */
-class userssqlTest extends PHPUnit_Framework_TestCase
+class userssqlTest extends \PHPUnit_Framework_TestCase
 {
   public function test_clean ()
   {
diff --git a/Tests/uuidTest.php b/Tests/UuidTest.php
similarity index 90%
rename from Tests/uuidTest.php
rename to Tests/UuidTest.php
index dc22b7f..406915e 100644
--- a/Tests/uuidTest.php
+++ b/Tests/UuidTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the uuid.php file */
-class uuidTest extends PHPUnit_Framework_TestCase
+class uuidTest extends \PHPUnit_Framework_TestCase
 {
   public function test_uuid1 ()
   {
diff --git a/Tests/verifyTest.php b/Tests/VerifyTest.php
similarity index 98%
rename from Tests/verifyTest.php
rename to Tests/VerifyTest.php
index 1405265..d615e93 100644
--- a/Tests/verifyTest.php
+++ b/Tests/VerifyTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the Verify */
-class verifyTest extends PHPUnit_Framework_TestCase
+class verifyTest extends \PHPUnit_Framework_TestCase
 {
   ///////////////
   //   DATES   //
diff --git a/Tests/xdiffTest.php b/Tests/XdiffTest.php
similarity index 99%
rename from Tests/xdiffTest.php
rename to Tests/XdiffTest.php
index 73601d7..9916e83 100644
--- a/Tests/xdiffTest.php
+++ b/Tests/XdiffTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the domframework xdiff part */
-class xdiffTest extends PHPUnit_Framework_TestCase
+class xdiffTest extends \PHPUnit_Framework_TestCase
 {
   // Declaration of $string1 and $string2
   // {{{
diff --git a/Tests/xmppclientTest.php b/Tests/XmppclientTest.php
similarity index 97%
rename from Tests/xmppclientTest.php
rename to Tests/XmppclientTest.php
index daf35e7..016f1a2 100644
--- a/Tests/xmppclientTest.php
+++ b/Tests/XmppclientTest.php
@@ -8,7 +8,7 @@
 namespace Domframework\Tests;
 
 /** Test the domframework xmppclient part */
-class xmppclientTest extends PHPUnit_Framework_TestCase
+class xmppclientTest extends \PHPUnit_Framework_TestCase
 {
   public function test_connection_BADNAME  ()
   {
diff --git a/Tests/autoload.php.dist b/Tests/autoload.php.dist
index c56d6b8..0783da4 100644
--- a/Tests/autoload.php.dist
+++ b/Tests/autoload.php.dist
@@ -1,29 +1,45 @@
 <?php
 /** Autoload */
 spl_autoload_register(function ($class) {
-  @include $class . '.php';
+  $classes = array ();
+  foreach (scandir ("src") as $file)
+  {
+    $fileShort = basename ($file);
+    if ($fileShort == "." || $fileShort == "..")
+      continue;
+    $classFile = substr ($fileShort, 0, -4);
+    $classes["Domframework\\".$classFile] = "src/$file";
+  }
+  if (key_exists ($class, $classes))
+  {
+    @include ($classes[$class]);
+  }
+  else
+  {
+    echo "ERROR : $class : doesnt exists in src\n";
+  }
 });
 
 define ("PHPUNIT", "ON-GOING");
 
 
-file_put_contents ("Tests/dblayerooSqliteTest.php",
+file_put_contents ("Tests/DblayerooSqliteTest.php",
                    str_replace ("{ENGINE}", "sqlite",
-                               file_get_contents ("Tests/dblayerooComplet.php")));
-file_put_contents ("Tests/dblayerooMySQLTest.php",
+                               file_get_contents ("Tests/DblayerooComplet.php")));
+file_put_contents ("Tests/DblayerooMySQLTest.php",
                    str_replace ("{ENGINE}", "mysql",
-                               file_get_contents ("Tests/dblayerooComplet.php")));
-file_put_contents ("Tests/dblayerooPostgreSQLTest.php",
+                               file_get_contents ("Tests/DblayerooComplet.php")));
+file_put_contents ("Tests/DblayerooPostgreSQLTest.php",
                    str_replace ("{ENGINE}", "pgsql",
-                               file_get_contents ("Tests/dblayerooComplet.php")));
-file_put_contents ("Tests/dblayerSqliteTest.php",
+                               file_get_contents ("Tests/DblayerooComplet.php")));
+file_put_contents ("Tests/DblayerSqliteTest.php",
                    str_replace ("{ENGINE}", "sqlite",
-                               file_get_contents ("Tests/dblayerComplet.php")));
-file_put_contents ("Tests/dblayerMySQLTest.php",
+                               file_get_contents ("Tests/DblayerComplet.php")));
+file_put_contents ("Tests/DblayerMySQLTest.php",
                    str_replace ("{ENGINE}", "mysql",
-                               file_get_contents ("Tests/dblayerComplet.php")));
-file_put_contents ("Tests/dblayerPostgreSQLTest.php",
+                               file_get_contents ("Tests/DblayerComplet.php")));
+file_put_contents ("Tests/DblayerPostgreSQLTest.php",
                    str_replace ("{ENGINE}", "pgsql",
-                               file_get_contents ("Tests/dblayerComplet.php")));
+                               file_get_contents ("Tests/DblayerComplet.php")));
 
 // vim: syntax=on filetype=php
diff --git a/src/Version.php b/src/Version.php
index 3654dae..15cce5b 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,7 +18,7 @@ namespace Domframework;
 
 class Version
 {
-  const DOMFRAMEWORK_VERSION = "0.61";
+  const DOMFRAMEWORK_VERSION = "2.0";
 
   static function version ()
   {