From 7571e3606d765be3e6285f85d9a72c115999b7e5 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 15 Mar 2014 07:37:02 +0100
Subject: [PATCH] Some cleanups of the unittests.

---
 src/commands/default/tests.py    |  1 +
 src/{objects => server}/tests.py | 29 ++++++-----------------------
 src/settings_default.py          |  1 -
 src/utils/create.py              |  2 +-
 src/utils/models.py              |  4 ----
 5 files changed, 8 insertions(+), 29 deletions(-)
 rename src/{objects => server}/tests.py (60%)
 delete mode 100644 src/utils/models.py

diff --git a/src/commands/default/tests.py b/src/commands/default/tests.py
index f970bb39b4..643921b51a 100644
--- a/src/commands/default/tests.py
+++ b/src/commands/default/tests.py
@@ -78,6 +78,7 @@ class CommandTest(TestCase):
     CID = 0 # we must set a different CID in every test to avoid unique-name collisions creating the objects
     def setUp(self):
         "sets up testing environment"
+        print "creating player %i: %s" % (self.CID, self.__class__.__name__)
         self.player = create.create_player("TestPlayer%i" % self.CID, "test@test.com", "testpassword", typeclass=TestPlayerClass)
         self.player2 = create.create_player("TestPlayer%ib" % self.CID, "test@test.com", "testpassword", typeclass=TestPlayerClass)
         self.room1 = create.create_object("src.objects.objects.Room", key="Room%i"%self.CID, nohome=True)
diff --git a/src/objects/tests.py b/src/server/tests.py
similarity index 60%
rename from src/objects/tests.py
rename to src/server/tests.py
index 9d1bff6327..a9feba557b 100644
--- a/src/objects/tests.py
+++ b/src/server/tests.py
@@ -26,37 +26,20 @@ try:
 except ImportError:
     import unittest
 
-from src.commands.default import tests as commandtests
 from src.locks import tests as locktests
-
-
-class TestObjAttrs(TestCase):
-    """
-    Test aspects of ObjAttributes
-    """
-    pass
-#    def setUp(self):
-#        "set up the test"
-#        self.attr = models.ObjAttribute()
-#        self.obj1 = create.create_object(objects.Object, key="testobj1", location=None)
-#        self.obj2 = create.create_object(objects.Object, key="testobj2", location=self.obj1)
-#    def test_store_str(self):
-#        hstring = u"sdfv00=97sfjs842 ivfjlQKFos9GF^8dddsöäå-?%"
-#        self.obj1.db.testattr = hstring
-#        self.assertEqual(hstring, self.obj1.db.testattr)
-#    def test_store_obj(self):
-#        self.obj1.db.testattr = self.obj2
-#        self.assertEqual(self.obj2 ,self.obj1.db.testattr)
-#        self.assertEqual(self.obj2.location, self.obj1.db.testattr.location)
-
+from src.utils import tests as utiltests
+from src.commands.default import tests as commandtests
 
 def suite():
     """
     This function is called automatically by the django test runner.
-    This also runs the command tests defined in src/commands/default/tests.py.
+    This also collates tests from packages that are not formally django applications.
     """
     tsuite = unittest.TestSuite()
     tsuite.addTest(unittest.defaultTestLoader.loadTestsFromModule(sys.modules[__name__]))
+
+    # test modules from non-django apps
     tsuite.addTest(unittest.defaultTestLoader.loadTestsFromModule(commandtests))
     tsuite.addTest(unittest.defaultTestLoader.loadTestsFromModule(locktests))
+    tsuite.addTest(unittest.defaultTestLoader.loadTestsFromModule(utiltests))
     return tsuite
diff --git a/src/settings_default.py b/src/settings_default.py
index 8856dfe440..b7a40ea0f8 100644
--- a/src/settings_default.py
+++ b/src/settings_default.py
@@ -515,7 +515,6 @@ INSTALLED_APPS = (
     'src.comms',
     'src.help',
     'src.scripts',
-    'src.utils',
     'src.web.news',
     'src.web.website',)
 # The user profile extends the User object with more functionality;
diff --git a/src/utils/create.py b/src/utils/create.py
index 3d81b637a3..413b32006e 100644
--- a/src/utils/create.py
+++ b/src/utils/create.py
@@ -491,7 +491,7 @@ def create_player(key, email, password,
     if not email:
         email = "dummy@dummy.com"
     if _PlayerDB.objects.filter(username__iexact=key):
-        raise ValueError("A Player with this name already exists.")
+        raise ValueError("A Player with the name '%s' already exists." % key)
 
     # this handles a given dbref-relocate to a player.
     report_to = handle_dbref(report_to, _PlayerDB)
diff --git a/src/utils/models.py b/src/utils/models.py
deleted file mode 100644
index 4e15a94133..0000000000
--- a/src/utils/models.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""
-Dummy models.py file to allow us to add utils to the apps list so Django's
-test runner will recognize it.
-"""
\ No newline at end of file