From 751adbcf3037fd89abe7f51fb51389339c7fba21 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Fri, 4 Aug 2006 17:53:32 +0000 Subject: [PATCH] more delta time fixes --- t/Group.t | 2 +- t/User.t | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/t/Group.t b/t/Group.t index 446256ca3..26ce61cf6 100644 --- a/t/Group.t +++ b/t/Group.t @@ -231,7 +231,7 @@ my $expireOffset = $gX->expireOffset; $user->addToGroups([$gX->getId]); ##User expire time is calculated correctly my $expireTime = abs($gX->userGroupExpireDate($user->userId) - $expireOffset - time()); -ok( $expireTime < 1, 'userGroupExpireDate: Default expire time'); +cmp_ok( $expireTime, '<=', 1, 'userGroupExpireDate: Default expire time'); ok($user->isInGroup($gX->getId), "addToGroups: Added dude to gX"); $gX->userIsAdmin($user->userId, 1); diff --git a/t/User.t b/t/User.t index a0fcfce89..6d3f8beba 100644 --- a/t/User.t +++ b/t/User.t @@ -78,9 +78,9 @@ $user->authMethod("LDAP"); is($user->authMethod, "LDAP", 'authMethod() -- set to LDAP'); $user->authMethod("WebGUI"); is($user->authMethod, "WebGUI", 'authMethod() -- set back to WebGUI'); -ok(abs($user->lastUpdated-$lastUpdate) < 1, 'lastUpdated() -- authmethod change'); +cmp_ok(abs($user->lastUpdated-$lastUpdate), '<=', 1, 'lastUpdated() -- authmethod change'); -#See if datecreated is correct +#See if date created is correct is($user->dateCreated, $userCreationTime, 'dateCreated()'); #get/set karma @@ -101,7 +101,7 @@ is($user->karma, $oldKarma-69, 'karma() -- get/set subtract amount'); $lastUpdate = time(); $user->referringAffiliate(10); is($user->referringAffiliate, '10', 'referringAffiliate() -- get/set'); -ok(abs($user->lastUpdated-$lastUpdate) < 1, 'lastUpdated() -- referringAffiliate'); +cmp_ok(abs($user->lastUpdated-$lastUpdate), '<=', 1, 'lastUpdated() -- referringAffiliate'); #Let's try adding this user to some groups. Note, users are auto-added to 2 and 7 on creation my @groups = qw|6 4|; @@ -173,7 +173,7 @@ is($user->karma, $oldKarma-69, 'karma() -- get/set subtract amount'); $lastUpdate = time(); $user->referringAffiliate(10); is($user->referringAffiliate, '10', 'referringAffiliate() -- get/set'); -ok(abs($user->lastUpdated-$lastUpdate) < 1, 'lastUpdated() -- referringAffiliate'); +cmp_ok(abs($user->lastUpdated-$lastUpdate), '<=', 1, 'lastUpdated() -- referringAffiliate'); #Let's try adding this user to some groups my @groups = qw|2 4|;