From a800992879e8cd33a4f147cc46ae37bec69a71f0 Mon Sep 17 00:00:00 2001 From: Simon Leary Date: Thu, 13 Nov 2025 14:00:07 -0500 Subject: [PATCH 1/4] new convention --- .pre-commit-config.yaml | 5 +++++ CONTRIBUTING.md | 2 ++ test/assert-no-assertTrue.bash | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 test/assert-no-assertTrue.bash diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a5929f4f..748d1f3a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -110,3 +110,8 @@ repos: language: system files: ^resources/.*\.php$ exclude: ^resources/lib/UnityHTTPD\.php$ + - id: assert-no-assertTrue + name: Assert `assertTrue` is not used + entry: bash ./test/assert-no-assertTrue.bash + language: system + files: ^test/.*\.php$ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d4c3e197..0fb3cc19 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,6 +22,8 @@ This will enable strict mode and throw an exception rather than returning `false`. - `UnityHTTPD`'s user-facing error functionality (ex: `badRequest`) should only be called from `webroot/**/*.php`. `resources/**/*.php` should throw exceptions instead. +- No code should call `PHPUnit\Framework\TestCase::assertTrue`, instead `assert`. + `assert` is better because it doesn't just say "something is false", it actually shows what is false. This repository will automatically check PRs for linting compliance. diff --git a/test/assert-no-assertTrue.bash b/test/assert-no-assertTrue.bash new file mode 100644 index 00000000..47793e2f --- /dev/null +++ b/test/assert-no-assertTrue.bash @@ -0,0 +1,22 @@ +set -euo pipefail +trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR +if [[ $# -lt 1 ]]; then + echo "at least one argument required" + exit 1 +fi + +funcs=(assertTrue) +rc=0 +for func in "${funcs[@]}"; do + # --color=never because magit git output log doesn't support it + grep_rc=0; grep -H --color=never --line-number -P '\b'"$func"'\s*[\(;]' "$@" || grep_rc=$? + case "$grep_rc" in + 0) + echo "$func() is not allowed! use an exception instead."; rc=1 ;; + 1) + : ;; # code is good, do nothing + *) + echo "grep failed!"; rc=1 ;; + esac +done +exit "$rc" From 7bb1900906d2cab3f86b9850685f63b4cc9196e3 Mon Sep 17 00:00:00 2001 From: Simon Leary Date: Thu, 13 Nov 2025 14:10:18 -0500 Subject: [PATCH 2/4] no loop --- test/assert-no-assertTrue.bash | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/test/assert-no-assertTrue.bash b/test/assert-no-assertTrue.bash index 47793e2f..75b307f2 100644 --- a/test/assert-no-assertTrue.bash +++ b/test/assert-no-assertTrue.bash @@ -5,18 +5,15 @@ if [[ $# -lt 1 ]]; then exit 1 fi -funcs=(assertTrue) rc=0 -for func in "${funcs[@]}"; do - # --color=never because magit git output log doesn't support it - grep_rc=0; grep -H --color=never --line-number -P '\b'"$func"'\s*[\(;]' "$@" || grep_rc=$? - case "$grep_rc" in - 0) - echo "$func() is not allowed! use an exception instead."; rc=1 ;; - 1) - : ;; # code is good, do nothing - *) - echo "grep failed!"; rc=1 ;; - esac -done +# --color=never because magit git output log doesn't support it +grep_rc=0; grep -H --color=never --line-number -P '\bassertTrue\s*[\(;]' "$@" || grep_rc=$? +case "$grep_rc" in + 0) + echo "assertTrue() is not allowed! use assert() instead."; rc=1 ;; + 1) + : ;; # code is good, do nothing + *) + echo "grep failed!"; rc=1 ;; +esac exit "$rc" From 378fc9b234be91e0c749115e04abd64501da89a5 Mon Sep 17 00:00:00 2001 From: Simon Leary Date: Thu, 13 Nov 2025 14:12:11 -0500 Subject: [PATCH 3/4] exclude tests from utils check --- .pre-commit-config.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 748d1f3a..fed4c283 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -103,7 +103,11 @@ repos: entry: bash ./test/assert-utils-used.bash language: system files: \.php$ - exclude: ^resources/lib/utils\.php$ + exclude: | + (?x)^( + test/.*| + resources/lib/utils\.php| + )$ - id: assert-exceptions-used name: Assert exceptions are used entry: bash ./test/assert-exceptions-used.bash From d8b810f6bd190e593a45f38c34e3bb7ece60b719 Mon Sep 17 00:00:00 2001 From: Simon Leary Date: Thu, 13 Nov 2025 14:12:18 -0500 Subject: [PATCH 4/4] no assertTrue --- .../functional/AccountDeletionRequestTest.php | 4 +- test/functional/InvalidEPPNTest.php | 2 +- test/functional/NewUserTest.php | 78 +++++++++---------- test/functional/PIMemberRequestTest.php | 10 +-- test/functional/PageLoadTest.php | 2 +- test/functional/PiBecomeRequestTest.php | 4 +- test/functional/PiMemberApproveTest.php | 10 +-- test/functional/PiMemberDenyTest.php | 6 +- test/functional/PiRemoveUserTest.php | 10 +-- test/functional/ViewAsUserTest.php | 6 +- 10 files changed, 66 insertions(+), 66 deletions(-) diff --git a/test/functional/AccountDeletionRequestTest.php b/test/functional/AccountDeletionRequestTest.php index 756865ad..1c8d5f94 100644 --- a/test/functional/AccountDeletionRequestTest.php +++ b/test/functional/AccountDeletionRequestTest.php @@ -11,8 +11,8 @@ private function assertNumberAccountDeletionRequests(int $x) $this->assertFalse($USER->hasRequestedAccountDeletion()); $this->assertFalse($SQL->accDeletionRequestExists($USER->uid)); } elseif ($x > 0) { - $this->assertTrue($USER->hasRequestedAccountDeletion()); - $this->assertTrue($SQL->accDeletionRequestExists($USER->uid)); + assert($USER->hasRequestedAccountDeletion()); + assert($SQL->accDeletionRequestExists($USER->uid)); } else { throw new RuntimeException("x must not be negative"); } diff --git a/test/functional/InvalidEPPNTest.php b/test/functional/InvalidEPPNTest.php index 40cc454d..209ef772 100644 --- a/test/functional/InvalidEPPNTest.php +++ b/test/functional/InvalidEPPNTest.php @@ -15,6 +15,7 @@ public static function provider() public function testInitGetSSO(string $eppn, bool $is_valid): void { global $SSO; + self::expectNotToPerformAssertions(); $original_server = $_SERVER; $original_sso = $SSO; if (session_status() == PHP_SESSION_ACTIVE) { @@ -37,6 +38,5 @@ public function testInitGetSSO(string $eppn, bool $is_valid): void $_SERVER = $original_server; $SSO = $original_sso; } - $this->assertTrue(true); // if $is_valid, there are no other assertions } } diff --git a/test/functional/NewUserTest.php b/test/functional/NewUserTest.php index 93a37d4c..b7c47a1c 100644 --- a/test/functional/NewUserTest.php +++ b/test/functional/NewUserTest.php @@ -164,11 +164,11 @@ public function testCreateUserByJoinGoupByPI($user_to_create_args, $expected_uid $pi_group = $USER->getPIGroup(); $gid = $pi_group->gid; switchUser(...$user_to_create_args); - $this->assertTrue(!$USER->exists()); + assert(!$USER->exists()); $newOrg = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK); - $this->assertTrue(!$newOrg->exists()); - $this->assertTrue($pi_group->exists()); - $this->assertTrue(!$pi_group->memberExists($USER)); + assert(!$newOrg->exists()); + assert($pi_group->exists()); + assert(!$pi_group->memberExists($USER)); $this->assertRequestedMembership(false, $gid); try { $this->requestGroupMembership($pi_group->gid); @@ -180,14 +180,14 @@ public function testCreateUserByJoinGoupByPI($user_to_create_args, $expected_uid // } catch(Exception) { // $second_request_failed = true; // } - // $this->assertTrue($second_request_failed); + // assert($second_request_failed); $this->assertRequestedMembership(true, $gid); $this->cancelAllRequests(); $this->assertRequestedMembership(false, $gid); $this->requestGroupMembership($pi_group->gid); - $this->assertTrue($pi_group->requestExists($USER)); + assert($pi_group->requestExists($USER)); $this->assertRequestedMembership(true, $gid); $REDIS->flushAll(); // regression test: flush used to break requests @@ -197,11 +197,11 @@ public function testCreateUserByJoinGoupByPI($user_to_create_args, $expected_uid $this->approveUserByPI($approve_uid); switchUser(...$user_to_create_args); - $this->assertTrue(!$pi_group->requestExists($USER)); + assert(!$pi_group->requestExists($USER)); $this->assertRequestedMembership(false, $gid); - $this->assertTrue($pi_group->memberExists($USER)); - $this->assertTrue($USER->exists()); - $this->assertTrue($newOrg->exists()); + assert($pi_group->memberExists($USER)); + assert($USER->exists()); + assert($newOrg->exists()); $user_entry = $LDAP->getUserEntry($approve_uid); $qualified_user_group_entry = $LDAP->getGroupEntry($approve_uid); @@ -217,9 +217,9 @@ public function testCreateUserByJoinGoupByPI($user_to_create_args, $expected_uid // } catch(Exception) { // $third_request_failed = true; // } - // $this->assertTrue($third_request_failed); + // assert($third_request_failed); $this->assertRequestedMembership(false, $gid); - $this->assertTrue(!$pi_group->requestExists($USER)); + assert(!$pi_group->requestExists($USER)); } finally { switchUser(...$user_to_create_args); $this->ensureOrgGroupDoesNotExist(); @@ -235,25 +235,25 @@ public function testCreateMultipleUsersByJoinGoupByPI() switchUser(...$pi_user_args); $pi_group = $USER->getPIGroup(); $gid = $pi_group->gid; - $this->assertTrue($pi_group->exists()); + assert($pi_group->exists()); $users_to_create_args = getNonexistentUsersWithExistentOrg(); try { foreach ($users_to_create_args as $user_to_create_args) { switchUser(...$user_to_create_args); - $this->assertTrue(!$USER->exists()); - $this->assertTrue(!$pi_group->memberExists($USER)); + assert(!$USER->exists()); + assert(!$pi_group->memberExists($USER)); $this->assertRequestedMembership(false, $gid); $this->requestGroupMembership($pi_group->gid); $this->assertRequestedMembership(true, $gid); $approve_uid = $USER->uid; switchUser(...$pi_user_args); - // $this->assertTrue(!$pi_group->memberExists($USER)); + // assert(!$pi_group->memberExists($USER)); $this->approveUserByPI($approve_uid); switchUser(...$user_to_create_args); - $this->assertTrue(!$pi_group->requestExists($USER)); + assert(!$pi_group->requestExists($USER)); $this->assertRequestedMembership(false, $gid); - $this->assertTrue($pi_group->memberExists($USER)); - $this->assertTrue($USER->exists()); + assert($pi_group->memberExists($USER)); + assert($USER->exists()); } } finally { foreach ($users_to_create_args as $user_to_create_args) { @@ -272,11 +272,11 @@ public function testCreateUserByJoinGoupByAdmin($user_to_create_args, $expected_ $pi_group = $USER->getPIGroup(); $gid = $pi_group->gid; switchUser(...$user_to_create_args); - $this->assertTrue(!$USER->exists()); + assert(!$USER->exists()); $newOrg = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK); - $this->assertTrue(!$newOrg->exists()); - $this->assertTrue($pi_group->exists()); - $this->assertTrue(!$pi_group->memberExists($USER)); + assert(!$newOrg->exists()); + assert($pi_group->exists()); + assert(!$pi_group->memberExists($USER)); $this->assertRequestedMembership(false, $gid); try { $this->requestGroupMembership($pi_group->gid); @@ -288,14 +288,14 @@ public function testCreateUserByJoinGoupByAdmin($user_to_create_args, $expected_ // } catch(Exception) { // $second_request_failed = true; // } - // $this->assertTrue($second_request_failed); + // assert($second_request_failed); $this->assertRequestedMembership(true, $gid); $this->cancelAllRequests(); $this->assertRequestedMembership(false, $gid); $this->requestGroupMembership($pi_group->getOwner()->getMail()); - $this->assertTrue($pi_group->requestExists($USER)); + assert($pi_group->requestExists($USER)); $this->assertRequestedMembership(true, $gid); $REDIS->flushAll(); // regression test: flush used to break requests @@ -305,11 +305,11 @@ public function testCreateUserByJoinGoupByAdmin($user_to_create_args, $expected_ $this->approveUserByAdmin($gid, $approve_uid); switchUser(...$user_to_create_args); - $this->assertTrue(!$pi_group->requestExists($USER)); + assert(!$pi_group->requestExists($USER)); $this->assertRequestedMembership(false, $gid); - $this->assertTrue($pi_group->memberExists($USER)); - $this->assertTrue($USER->exists()); - $this->assertTrue($newOrg->exists()); + assert($pi_group->memberExists($USER)); + assert($USER->exists()); + assert($newOrg->exists()); $user_entry = $LDAP->getUserEntry($approve_uid); $qualified_user_group_entry = $LDAP->getGroupEntry($approve_uid); @@ -325,9 +325,9 @@ public function testCreateUserByJoinGoupByAdmin($user_to_create_args, $expected_ // } catch(Exception) { // $third_request_failed = true; // } - // $this->assertTrue($third_request_failed); + // assert($third_request_failed); $this->assertRequestedMembership(false, $gid); - $this->assertTrue(!$pi_group->requestExists($USER)); + assert(!$pi_group->requestExists($USER)); } finally { switchUser(...$user_to_create_args); $this->ensureOrgGroupDoesNotExist(); @@ -342,10 +342,10 @@ public function testCreateUserByCreateGroup($user_to_create_args, $expected_uid_ global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK; switchuser(...$user_to_create_args); $pi_group = $USER->getPIGroup(); - $this->assertTrue(!$USER->exists()); - $this->assertTrue(!$pi_group->exists()); + assert(!$USER->exists()); + assert(!$pi_group->exists()); $newOrg = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK); - $this->assertTrue(!$newOrg->exists()); + assert(!$newOrg->exists()); try { $this->requestGroupCreation(); $this->assertRequestedPIGroup(true); @@ -356,7 +356,7 @@ public function testCreateUserByCreateGroup($user_to_create_args, $expected_uid_ // } catch(Exception) { // $second_request_failed = true; // } - // $this->assertTrue($second_request_failed); + // assert($second_request_failed); $this->assertRequestedPIGroup(true); $this->cancelAllRequests(); @@ -373,9 +373,9 @@ public function testCreateUserByCreateGroup($user_to_create_args, $expected_uid_ switchUser(...$user_to_create_args); $this->assertRequestedPIGroup(false); - $this->assertTrue($pi_group->exists()); - $this->assertTrue($USER->exists()); - $this->assertTrue($newOrg->exists()); + assert($pi_group->exists()); + assert($USER->exists()); + assert($newOrg->exists()); $user_entry = $LDAP->getUserEntry($approve_uid); $qualified_user_group_entry = $LDAP->getGroupEntry($approve_uid); @@ -391,7 +391,7 @@ public function testCreateUserByCreateGroup($user_to_create_args, $expected_uid_ // } catch(Exception) { // $third_request_failed = true; // } - // $this->assertTrue($third_request_failed); + // assert($third_request_failed); $this->assertRequestedPIGroup(false); } finally { switchUser(...$user_to_create_args); diff --git a/test/functional/PIMemberRequestTest.php b/test/functional/PIMemberRequestTest.php index 4d8a41fa..9510af65 100644 --- a/test/functional/PIMemberRequestTest.php +++ b/test/functional/PIMemberRequestTest.php @@ -29,9 +29,9 @@ public function testRequestMembership() $pi = $USER; $pi_group = $USER->getPIGroup(); $gid = $pi_group->gid; - $this->assertTrue($USER->isPI()); - $this->assertTrue($pi_group->exists()); - $this->assertTrue(arraysAreEqualUnOrdered([$pi], $pi_group->getGroupMembers())); + assert($USER->isPI()); + assert($pi_group->exists()); + assert(arraysAreEqualUnOrdered([$pi], $pi_group->getGroupMembers())); $this->assertEquals([], $SQL->getRequests($gid)); switchUser(...getUserNotPiNotRequestedBecomePi()); $uid = $USER->uid; @@ -40,13 +40,13 @@ public function testRequestMembership() $this->assertFalse($pi_group->memberExists($USER)); try { $this->requestMembership($gid); - $this->assertTrue($SQL->requestExists($uid, $gid)); + assert($SQL->requestExists($uid, $gid)); $this->cancelRequest($gid); $this->assertFalse($SQL->requestExists($uid, $gid)); $this->requestMembership("asdlkjasldkj"); $this->assertContains("This PI doesn't exist", $_SESSION["MODAL_ERRORS"]); $this->requestMembership($pi_group->getOwner()->getMail()); - $this->assertTrue($SQL->requestExists($uid, $gid)); + assert($SQL->requestExists($uid, $gid)); } finally { if ($SQL->requestExists($uid, $gid)) { $SQL->removeRequest($uid, $gid); diff --git a/test/functional/PageLoadTest.php b/test/functional/PageLoadTest.php index 71d531dd..cdd74d94 100644 --- a/test/functional/PageLoadTest.php +++ b/test/functional/PageLoadTest.php @@ -28,8 +28,8 @@ public static function provider() public function testLoadPage($user, $path) { global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK; + self::expectNotToPerformAssertions(); switchuser(...$user); http_get($path); - $this->assertTrue(true); // assert there were no errors } } diff --git a/test/functional/PiBecomeRequestTest.php b/test/functional/PiBecomeRequestTest.php index d1306c46..b637988f 100644 --- a/test/functional/PiBecomeRequestTest.php +++ b/test/functional/PiBecomeRequestTest.php @@ -11,7 +11,7 @@ private function assertNumberPiBecomeRequests(int $x) if ($x == 0) { $this->assertFalse($SQL->requestExists($USER->uid)); } elseif ($x > 0) { - $this->assertTrue($SQL->requestExists($USER->uid)); + assert($SQL->requestExists($USER->uid)); } else { throw new RuntimeException("x must not be negative"); } @@ -68,7 +68,7 @@ public function testRequestBecomePiUserRequestedAccountDeletion() switchUser(...getUserNotPiNotRequestedBecomePiRequestedAccountDeletion()); $this->assertFalse($USER->isPI()); $this->assertNumberPiBecomeRequests(0); - $this->assertTrue($SQL->accDeletionRequestExists($USER->uid)); + assert($SQL->accDeletionRequestExists($USER->uid)); try { http_post(__DIR__ . "/../../webroot/panel/account.php", [ "form_type" => "pi_request", diff --git a/test/functional/PiMemberApproveTest.php b/test/functional/PiMemberApproveTest.php index b59643b7..1cd537f5 100644 --- a/test/functional/PiMemberApproveTest.php +++ b/test/functional/PiMemberApproveTest.php @@ -40,7 +40,7 @@ private function requestJoinPI(string $gid) private function assertGroupMembers(UnityGroup $group, array $members) { - $this->assertTrue(arraysAreEqualUnOrdered($members, $group->getGroupMemberUIDs())); + assert(arraysAreEqualUnOrdered($members, $group->getGroupMemberUIDs())); } public function testApproveRequest() @@ -55,7 +55,7 @@ public function testApproveRequest() $piUID = $USER->uid; $piGroup = $USER->getPIGroup(); - $this->assertTrue($piGroup->exists()); + assert($piGroup->exists()); $this->assertGroupMembers($piGroup, [$piUID]); $this->assertEmpty($piGroup->getRequests()); try { @@ -65,10 +65,10 @@ public function testApproveRequest() switchUser(...$piSwitchArgs); $this->approveUser($uid); - $this->assertTrue(!$piGroup->requestExists($user)); + assert(!$piGroup->requestExists($user)); $this->assertEmpty($piGroup->getRequests()); $this->assertGroupMembers($piGroup, [$piUID, $uid]); - $this->assertTrue($piGroup->memberExists($user)); + assert($piGroup->memberExists($user)); } finally { if ($piGroup->memberExists($user)) { $piGroup->removeUser($user); @@ -89,7 +89,7 @@ public function testApproveNonexistentRequest() $piUID = $USER->uid; $piGroup = $USER->getPIGroup(); - $this->assertTrue($piGroup->exists()); + assert($piGroup->exists()); $this->assertGroupMembers($piGroup, [$piUID]); $this->assertEmpty($piGroup->getRequests()); $this->assertFalse($piGroup->memberExists($user)); diff --git a/test/functional/PiMemberDenyTest.php b/test/functional/PiMemberDenyTest.php index a39f5765..9906b9e8 100644 --- a/test/functional/PiMemberDenyTest.php +++ b/test/functional/PiMemberDenyTest.php @@ -30,8 +30,8 @@ public function testDenyRequest() switchUser(...getUserIsPIHasNoMembersNoMemberRequests()); $pi = $USER; $piGroup = $USER->getPIGroup(); - $this->assertTrue($piGroup->exists()); - $this->assertTrue(arraysAreEqualUnOrdered([$pi->uid], $piGroup->getGroupMemberUIDs())); + assert($piGroup->exists()); + assert(arraysAreEqualUnOrdered([$pi->uid], $piGroup->getGroupMemberUIDs())); $this->assertEmpty($piGroup->getRequests()); $requestedUser = new UnityUser(self::$requestUid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK); try { @@ -46,7 +46,7 @@ public function testDenyRequest() $piGroup->denyUser($requestedUser); $this->assertEmpty($piGroup->getRequests()); - $this->assertTrue(arraysAreEqualUnOrdered([$pi->uid], $piGroup->getGroupMemberUIDs())); + assert(arraysAreEqualUnOrdered([$pi->uid], $piGroup->getGroupMemberUIDs())); $this->assertFalse($piGroup->memberExists($requestedUser)); } finally { $SQL->removeRequest(self::$requestUid, $piGroup->gid); diff --git a/test/functional/PiRemoveUserTest.php b/test/functional/PiRemoveUserTest.php index 6118ad6c..7e26e23e 100644 --- a/test/functional/PiRemoveUserTest.php +++ b/test/functional/PiRemoveUserTest.php @@ -21,7 +21,7 @@ public function testRemoveUser() $pi = $USER; $piUid = $USER->uid; $piGroup = $USER->getPIGroup(); - $this->assertTrue($piGroup->exists()); + assert($piGroup->exists()); $memberUIDs = $piGroup->getGroupMemberUIDs(); // the 0th member of the PI group is the PI $this->assertGreaterThan(1, count($memberUIDs)); @@ -38,7 +38,7 @@ public function testRemoveUser() } } $this->assertNotEquals($pi->uid, $memberToDelete->uid); - $this->assertTrue($piGroup->memberExists($memberToDelete)); + assert($piGroup->memberExists($memberToDelete)); try { $this->removeUser($memberToDelete->uid); $this->assertFalse($piGroup->memberExists($memberToDelete)); @@ -62,12 +62,12 @@ public function testRemovePIFromTheirOwnGroup() switchUser(...getUserIsPIHasAtLeastOneMember()); $pi = $USER; $piGroup = $USER->getPIGroup(); - $this->assertTrue($piGroup->exists()); - $this->assertTrue($piGroup->memberExists($pi)); + assert($piGroup->exists()); + assert($piGroup->memberExists($pi)); $this->expectException(Exception::class); try { $this->removeUser($pi->uid); - $this->assertTrue($piGroup->memberExists($pi)); + assert($piGroup->memberExists($pi)); } finally { if (!$piGroup->memberExists($pi)) { $piGroup->newUserRequest( diff --git a/test/functional/ViewAsUserTest.php b/test/functional/ViewAsUserTest.php index a4195e0d..10fcbb6f 100644 --- a/test/functional/ViewAsUserTest.php +++ b/test/functional/ViewAsUserTest.php @@ -11,7 +11,7 @@ public function _testViewAsUser(array $beforeUser, array $afterUser) switchUser(...$afterUser); $afterUid = $USER->uid; switchUser(...$beforeUser); - // $this->assertTrue($USER->isAdmin()); + // assert($USER->isAdmin()); $beforeUid = $USER->uid; // $this->assertNotEquals($afterUid, $beforeUid); http_post(__DIR__ . "/../../webroot/admin/user-mgmt.php", [ @@ -25,7 +25,7 @@ public function _testViewAsUser(array $beforeUser, array $afterUser) http_get(__DIR__ . "/../../resources/init.php"); // now we should be new user $this->assertEquals($afterUid, $USER->uid); - // $this->assertTrue($_SESSION["user_exists"]); + // assert($_SESSION["user_exists"]); http_post(__DIR__ . "/../../resources/templates/header.php", [ "form_type" => "clearView", ]); @@ -58,7 +58,7 @@ public function testNonAdminViewAsAdmin() global $USER; switchUser(...getAdminUser()); $adminUid = $USER->uid; - $this->assertTrue($USER->isAdmin()); + assert($USER->isAdmin()); switchUser(...getNormalUser()); http_post(__DIR__ . "/../../webroot/admin/user-mgmt.php", [ "form_type" => "viewAsUser",