From 58e15da1a856809715b695d320a2b838625ed2a1 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Thu, 28 Nov 2019 21:18:25 +0100
Subject: [PATCH] updated test cases

---
 lam/tests/lib/3rdParty/pla/functionsTest.php  |  5 ++--
 lam/tests/lib/LAMConfigTest.php               |  4 +--
 lam/tests/lib/accountTest.php                 |  3 ++-
 lam/tests/lib/baseModuleTest.php              |  3 ++-
 lam/tests/lib/importTest.php                  | 25 ++++++++++---------
 lam/tests/lib/modules/bindDLZTest.php         |  5 ++--
 lam/tests/lib/modules/customFieldsTest.php    |  5 ++--
 lam/tests/lib/modules/ppolicyUserTest.php     |  5 ++--
 lam/tests/lib/modules/sambaSamAccountTest.php |  6 ++---
 lam/tests/lib/modules/shadowAccountTest.php   |  7 +++---
 lam/tests/lib/modules/sudoRoleTest.php        |  6 ++---
 lam/tests/lib/modules/windowsUserTest.php     |  6 ++---
 lam/tests/lib/pdfstructTest.php               |  3 ++-
 lam/tests/lib/securityTest.php                |  4 +--
 lam/tests/lib/selfServiceTest.php             |  3 ++-
 lam/tests/lib/typesTest.php                   |  6 ++---
 16 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/lam/tests/lib/3rdParty/pla/functionsTest.php b/lam/tests/lib/3rdParty/pla/functionsTest.php
index dbc95c61..28405370 100644
--- a/lam/tests/lib/3rdParty/pla/functionsTest.php
+++ b/lam/tests/lib/3rdParty/pla/functionsTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
 
 This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-Copyright (C) 2018  Roland Gruber
+Copyright (C) 2018 - 2019  Roland Gruber
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -28,7 +29,7 @@ include 'lam/templates/3rdParty/pla/lib/functions.php';
  *
  * @author Roland Gruber
  */
-class PlaFunctionsTest extends PHPUnit_Framework_TestCase {
+class PlaFunctionsTest extends TestCase {
 
 	public function test_masort() {
 		$data = array(
diff --git a/lam/tests/lib/LAMConfigTest.php b/lam/tests/lib/LAMConfigTest.php
index e946d72d..f41da59f 100644
--- a/lam/tests/lib/LAMConfigTest.php
+++ b/lam/tests/lib/LAMConfigTest.php
@@ -1,6 +1,6 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
- $Id$
 
  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
  Copyright (C) 2016 - 2019  Roland Gruber
@@ -28,7 +28,7 @@ include_once 'lam/tests/utils/configuration.inc';
  *
  * @author Roland Gruber
  */
-class LAMConfigTest extends PHPUnit_Framework_TestCase {
+class LAMConfigTest extends TestCase {
 
 	/**
 	 *
diff --git a/lam/tests/lib/accountTest.php b/lam/tests/lib/accountTest.php
index 769e9a7d..13d6936f 100644
--- a/lam/tests/lib/accountTest.php
+++ b/lam/tests/lib/accountTest.php
@@ -1,4 +1,5 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
  Copyright (C) 2018 - 2019  Roland Gruber
@@ -27,7 +28,7 @@ include_once __DIR__ . '/../../lib/security.inc';
  *
  * @author Roland Gruber
  */
-class AccountTest extends PHPUnit_Framework_TestCase {
+class AccountTest extends TestCase {
 
 	/**
 	 * Tests unformatShortFormatToSeconds() without characters.
diff --git a/lam/tests/lib/baseModuleTest.php b/lam/tests/lib/baseModuleTest.php
index 076d0a97..d07390ea 100644
--- a/lam/tests/lib/baseModuleTest.php
+++ b/lam/tests/lib/baseModuleTest.php
@@ -1,4 +1,5 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
  Copyright (C) 2019  Roland Gruber
@@ -26,7 +27,7 @@ include_once __DIR__ . '/../../lib/baseModule.inc';
  *
  * @author Roland Gruber
  */
-class BaseModuleTest extends PHPUnit_Framework_TestCase {
+class BaseModuleTest extends TestCase {
 
 	function setup() {
 		$_SESSION['language'] = 'en_GB.utf8:UTF-8:English (Great Britain)';
diff --git a/lam/tests/lib/importTest.php b/lam/tests/lib/importTest.php
index b60528fa..d61f5b9c 100644
--- a/lam/tests/lib/importTest.php
+++ b/lam/tests/lib/importTest.php
@@ -7,6 +7,7 @@ use LAM\TOOLS\IMPORT_EXPORT\RenameEntryTask;
 use LAM\TOOLS\IMPORT_EXPORT\DeleteEntryTask;
 use LAM\TOOLS\IMPORT_EXPORT\DeleteAttributesTask;
 use LAM\TOOLS\IMPORT_EXPORT\ReplaceAttributesTask;
+use PHPUnit\Framework\TestCase;
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
@@ -35,7 +36,7 @@ require_once 'lam/lib/import.inc';
  *
  * @author Roland Gruber
  */
-class ImporterTest extends PHPUnit_Framework_TestCase {
+class ImporterTest extends TestCase {
 
 	/**
 	 * No LDIF at all.
@@ -45,7 +46,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"this is no LDIF"
 		);
 
-		$this->setExpectedException(LAMException::class, 'this is no LDIF');
+		$this->expectException(LAMException::class, 'this is no LDIF');
 
 		$importer = new Importer();
 		$importer->getTasks($lines);
@@ -59,7 +60,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"version: 3"
 		);
 
-		$this->setExpectedException(LAMException::class, 'version: 3');
+		$this->expectException(LAMException::class, 'version: 3');
 
 		$importer = new Importer();
 		$importer->getTasks($lines);
@@ -75,7 +76,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"version: 1"
 		);
 
-		$this->setExpectedException(LAMException::class);
+		$this->expectException(LAMException::class);
 
 		$importer = new Importer();
 		$importer->getTasks($lines);
@@ -90,7 +91,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"some: data"
 		);
 
-		$this->setExpectedException(LAMException::class);
+		$this->expectException(LAMException::class);
 
 		$importer = new Importer();
 		$importer->getTasks($lines);
@@ -106,7 +107,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"dn: uid=test,dc=example,dc=com"
 		);
 
-		$this->setExpectedException(LAMException::class, 'dn: uid=test,dc=example,dc=com');
+		$this->expectException(LAMException::class, 'dn: uid=test,dc=example,dc=com');
 
 		$importer = new Importer();
 		$importer->getTasks($lines);
@@ -141,7 +142,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"uid: test",
 		);
 
-		$this->setExpectedException(LAMException::class, 'uid=test,dc=example,dc=com - changeType: invalid');
+		$this->expectException(LAMException::class, 'uid=test,dc=example,dc=com - changeType: invalid');
 
 		$importer = new Importer();
 		$tasks = $importer->getTasks($lines);
@@ -178,7 +179,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"uid: test",
 		);
 
-		$this->setExpectedException(LAMException::class, 'uid=test,dc=example,dc=com');
+		$this->expectException(LAMException::class, 'uid=test,dc=example,dc=com');
 
 		$importer = new Importer();
 		$tasks = $importer->getTasks($lines);
@@ -197,7 +198,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"deleteoldrdn: x",
 		);
 
-		$this->setExpectedException(LAMException::class, 'uid=test,dc=example,dc=com');
+		$this->expectException(LAMException::class, 'uid=test,dc=example,dc=com');
 
 		$importer = new Importer();
 		$tasks = $importer->getTasks($lines);
@@ -235,7 +236,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"uid: test",
 		);
 
-		$this->setExpectedException(LAMException::class, 'uid=test,dc=example,dc=com');
+		$this->expectException(LAMException::class, 'uid=test,dc=example,dc=com');
 
 		$importer = new Importer();
 		$tasks = $importer->getTasks($lines);
@@ -271,7 +272,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"invalid: test",
 		);
 
-		$this->setExpectedException(LAMException::class, 'uid=test,dc=example,dc=com');
+		$this->expectException(LAMException::class, 'uid=test,dc=example,dc=com');
 
 		$importer = new Importer();
 		$tasks = $importer->getTasks($lines);
@@ -291,7 +292,7 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 			"invalid: uid2"
 		);
 
-		$this->setExpectedException(LAMException::class, 'uid=test,dc=example,dc=com');
+		$this->expectException(LAMException::class, 'uid=test,dc=example,dc=com');
 
 		$importer = new Importer();
 		$tasks = $importer->getTasks($lines);
diff --git a/lam/tests/lib/modules/bindDLZTest.php b/lam/tests/lib/modules/bindDLZTest.php
index c9dfb8a6..81e5f7be 100644
--- a/lam/tests/lib/modules/bindDLZTest.php
+++ b/lam/tests/lib/modules/bindDLZTest.php
@@ -1,7 +1,8 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2018  Roland Gruber
+ Copyright (C) 2018 - 2019  Roland Gruber
  */
 
 if (is_readable('lam/lib/modules/bindDLZ.inc')) {
@@ -15,7 +16,7 @@ if (is_readable('lam/lib/modules/bindDLZ.inc')) {
 	 *
 	 * @author Roland Gruber
 	 */
-	class bindDLZTest extends PHPUnit_Framework_TestCase {
+	class bindDLZTest extends TestCase {
 
 		public function testIncreaseSerial() {
 			$this->assertEquals('1', bindDLZ::increaseSerial(''));
diff --git a/lam/tests/lib/modules/customFieldsTest.php b/lam/tests/lib/modules/customFieldsTest.php
index 108b217b..0932cd91 100644
--- a/lam/tests/lib/modules/customFieldsTest.php
+++ b/lam/tests/lib/modules/customFieldsTest.php
@@ -1,7 +1,8 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2017  Roland Gruber
+ Copyright (C) 2017 - 2019  Roland Gruber
  */
 
 if (is_readable('lam/lib/modules/customFields.inc')) {
@@ -16,7 +17,7 @@ if (is_readable('lam/lib/modules/customFields.inc')) {
 	 * @author Roland Gruber
 	 *
 	 */
-	class customFieldsConstantEntryTest extends PHPUnit_Framework_TestCase {
+	class customFieldsConstantEntryTest extends TestCase {
 
 		public function testReplaceWildcardsSpaces() {
 			$originalMiddle = '123((uid))456';
diff --git a/lam/tests/lib/modules/ppolicyUserTest.php b/lam/tests/lib/modules/ppolicyUserTest.php
index ee89f855..52b92865 100644
--- a/lam/tests/lib/modules/ppolicyUserTest.php
+++ b/lam/tests/lib/modules/ppolicyUserTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
 
  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2016 - 2018  Roland Gruber
+ Copyright (C) 2016 - 2019  Roland Gruber
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -33,7 +34,7 @@ if (is_readable('lam/lib/modules/ppolicyUser.inc')) {
 	 * @author Roland Gruber
 	 *
 	 */
-	class PPolicyUserPasswordNotifyJobTest extends PHPUnit_Framework_TestCase {
+	class PPolicyUserPasswordNotifyJobTest extends TestCase {
 
 		private $job;
 
diff --git a/lam/tests/lib/modules/sambaSamAccountTest.php b/lam/tests/lib/modules/sambaSamAccountTest.php
index a9da3b76..cafa6725 100644
--- a/lam/tests/lib/modules/sambaSamAccountTest.php
+++ b/lam/tests/lib/modules/sambaSamAccountTest.php
@@ -1,9 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
- $Id$
 
  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2016  Roland Gruber
+ Copyright (C) 2016 - 2019  Roland Gruber
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ include_once 'lam/lib/modules/sambaSamAccount.inc';
  * @author Roland Gruber
  *
  */
-class SambaSamAccountTest extends PHPUnit_Framework_TestCase {
+class SambaSamAccountTest extends TestCase {
 
 	public function testValidateHistoryEntry() {
 		$this->assertFalse(sambaSamAccount::validateHistoryEntry("password", ""));
diff --git a/lam/tests/lib/modules/shadowAccountTest.php b/lam/tests/lib/modules/shadowAccountTest.php
index bcf49312..2fb8b13c 100644
--- a/lam/tests/lib/modules/shadowAccountTest.php
+++ b/lam/tests/lib/modules/shadowAccountTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
 
  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2016 - 2018  Roland Gruber
+ Copyright (C) 2016 - 2019  Roland Gruber
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -32,7 +33,7 @@
 	 *
 	 * @author Roland Gruber
 	 */
-	class ShadowAccountTest extends PHPUnit_Framework_TestCase {
+	class ShadowAccountTest extends TestCase {
 
 		public function test_isAccountExpired_noAttr() {
 			$attrs = array('objectClass' => array('shadowAccount'));
@@ -122,7 +123,7 @@ if (is_readable('lam/lib/passwordExpirationJob.inc')) {
 	 * @author Roland Gruber
 	 *
 	 */
-	class ShadowAccountPasswordNotifyJobTest extends PHPUnit_Framework_TestCase {
+	class ShadowAccountPasswordNotifyJobTest extends TestCase {
 
 		private $job;
 
diff --git a/lam/tests/lib/modules/sudoRoleTest.php b/lam/tests/lib/modules/sudoRoleTest.php
index 56630701..e81ffb96 100644
--- a/lam/tests/lib/modules/sudoRoleTest.php
+++ b/lam/tests/lib/modules/sudoRoleTest.php
@@ -1,9 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
-$Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2014 - 2016  Roland Gruber
+  Copyright (C) 2014 - 2019  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ if (is_readable('lam/lib/modules/sudoRole.inc')) {
 	 * @author Roland Gruber
 	 *
 	 */
-	class SudoRoleTest extends PHPUnit_Framework_TestCase {
+	class SudoRoleTest extends TestCase {
 
 		public function testIsValidDate() {
 			$valid = array('22.10.2014', '05.01.2013', '1.3.2014', '10.5.2014', '4.12.2015',
diff --git a/lam/tests/lib/modules/windowsUserTest.php b/lam/tests/lib/modules/windowsUserTest.php
index 9c443adb..59095325 100644
--- a/lam/tests/lib/modules/windowsUserTest.php
+++ b/lam/tests/lib/modules/windowsUserTest.php
@@ -1,9 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
- $Id$
 
  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2017  Roland Gruber
+ Copyright (C) 2017 - 2019  Roland Gruber
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 	 *
 	 * @author Roland Gruber
 	 */
-	class WindowsUserTest extends PHPUnit_Framework_TestCase {
+	class WindowsUserTest extends TestCase {
 
 		public function test_isAccountExpired_noAttr() {
 			$attrs = array('objectClass' => array('user'));
diff --git a/lam/tests/lib/pdfstructTest.php b/lam/tests/lib/pdfstructTest.php
index 7e206065..bf0ba93d 100644
--- a/lam/tests/lib/pdfstructTest.php
+++ b/lam/tests/lib/pdfstructTest.php
@@ -4,6 +4,7 @@ use LAM\PDF\PDFEntrySection;
 use LAM\PDF\PDFStructureReader;
 use LAM\PDF\PDFStructure;
 use LAM\PDF\PDFStructureWriter;
+use PHPUnit\Framework\TestCase;
 
 /*
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
@@ -33,7 +34,7 @@ include_once 'lam/lib/pdfstruct.inc';
  * @author Roland Gruber
  *
  */
-class ReadStructureTest extends PHPUnit_Framework_TestCase {
+class ReadStructureTest extends TestCase {
 
 	/**
 	 * Reads the sample structure.
diff --git a/lam/tests/lib/securityTest.php b/lam/tests/lib/securityTest.php
index 9fcf4e38..2a5cf4a1 100644
--- a/lam/tests/lib/securityTest.php
+++ b/lam/tests/lib/securityTest.php
@@ -1,6 +1,6 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
-$Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2014 - 2016  Roland Gruber
@@ -32,7 +32,7 @@ include_once 'lam/lib/security.inc';
  * @author Roland Gruber
  *
  */
-class SecurityTest extends PHPUnit_Framework_TestCase {
+class SecurityTest extends TestCase {
 
 	private $cfg = null;
 
diff --git a/lam/tests/lib/selfServiceTest.php b/lam/tests/lib/selfServiceTest.php
index 13abe000..67e3ce23 100644
--- a/lam/tests/lib/selfServiceTest.php
+++ b/lam/tests/lib/selfServiceTest.php
@@ -1,4 +1,5 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
@@ -28,7 +29,7 @@ require_once 'lam/lib/selfService.inc';
  * @author Roland Gruber
  *
  */
-class selfServiceProfileTest extends PHPUnit_Framework_TestCase {
+class selfServiceProfileTest extends TestCase {
 
 	public function testBaseUrl() {
 		$profile = new selfServiceProfile();
diff --git a/lam/tests/lib/typesTest.php b/lam/tests/lib/typesTest.php
index cffa41a4..b23f9103 100644
--- a/lam/tests/lib/typesTest.php
+++ b/lam/tests/lib/typesTest.php
@@ -1,9 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /*
-$Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2016 - 2017  Roland Gruber
+  Copyright (C) 2016 - 2019  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ require_once 'lam/lib/types.inc';
  * @author Roland Gruber
  *
  */
-class ListAttributeTest extends PHPUnit_Framework_TestCase {
+class ListAttributeTest extends TestCase {
 
 	private $type;