1 files changed, 3 insertions, 26 deletions
diff --git a/modules/user/tests/User_Groups_Test.php b/modules/user/tests/User_Groups_Test.php
index 163b7d79..d0026d89 100644
--- a/modules/user/tests/User_Groups_Test.php
+++ b/modules/user/tests/User_Groups_Test.php
@@ -18,33 +18,10 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class User_Groups_Test extends Unit_Test_Case {
-  public function teardown() {
-    try {
-      $group = ORM::factory("group")->where("name", "=", "user_groups_test")->find();
-      if ($group->loaded()) {
-        $group->delete();
-      }
-    } catch (Exception $e) { }
-
-    try {
-      $user = ORM::factory("user")->where("name", "=", "user_groups_test")->find();
-      if ($user->loaded()) {
-        $user->delete();
-      }
-    } catch (Exception $e) { }
-  }
-
+class User_Groups_Test extends Gallery_Unit_Test_Case {
   public function add_user_to_group_test() {
-    $user = ORM::factory("user");
-    $user->name = "user_groups_test";
-    $user->full_name = "user groups test";
-    $user->password = "test password";
-    $user->save();
-
-    $group = ORM::factory("group");
-    $group->name = "user_groups_test";
-    $group->save();
+    $user = test::random_user();
+    $group = test::random_group();
 
     $group->add($user);
     $group->save();