[pLog-svn] r6831 - plog/branches/lifetype-1.2/class/test/tests/dao

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2009-02-21 17:28:32 -0500 (Sat, 21 Feb 2009)
New Revision: 6831

Modified:
   plog/branches/lifetype-1.2/class/test/tests/dao/commentscommon_test.class.php
Log:
way simpler to use the testtools to create stuff. (though the bad test found a bug for me)

Modified: plog/branches/lifetype-1.2/class/test/tests/dao/commentscommon_test.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/tests/dao/commentscommon_test.class.php	2009-02-21 22:27:31 UTC (rev 6830)
+++ plog/branches/lifetype-1.2/class/test/tests/dao/commentscommon_test.class.php	2009-02-21 22:28:32 UTC (rev 6831)
@@ -26,37 +26,12 @@
         function testGetNumPostComments()
 		{
 
-            // create a user
-            $users = new Users();
-            $randomName = md5(time());
-            $user = new UserInfo($randomName, "blah", "test at not-a-real-address.net", "", "Full Name");
-            $this->assertTrue($users->addUser($user), "Couldn't add test user");
-            
-            // create a blog
-			$blogs = new Blogs();
-			$randomName = md5(time());
-			$blog = new BlogInfo( $randomName, $user->getId(), "About blog random blog", new BlogSettings());
-			$this->assertTrue($blogs->addBlog( $blog ), "Couldn't add test blog");
+			// create the scenario
+			$user = TestTools::createUser();
+			$blog = TestTools::createBlog( $user->getId());
+			$cat  = TestTools::createArticleCategory( $blog->getId());
+			$article = TestTools::createArticle( $blog->getId(), $user->getId(), Array( $cat->getId()));
 
-            // create a category
-            $categories = new ArticleCategories();
-            $randomName = md5(time());
-            $category = new ArticleCategory($randomName, "blah", $blog->getId(), 1);
-            $this->assertTrue($categories->addArticleCategory($category), "Couldn't add test category");
-            
-            // add an article
-            $articles = new Articles();
-			$article = new Article(
-				"dummy topic",
-				"dummy text",
-                $category->getId(), // our category we created above
-				$user->getId(), // our user we created above
-				$blog->getId(),  // our blog we created above
-				POST_STATUS_PUBLISHED,  // published status
-				0   // not read yet
-                );
-            $this->assertTrue($articles->addArticle($article), "Couldn't add test article");
-
             // Add comments
             $timestamp = new Timestamp();
             $comment1 = new UserComment($article->getId(),
@@ -166,9 +141,10 @@
 
             
 			// delete the temporary data
-            $articles->deleteBlogPosts($blog->getId());
-			$blogs->deleteBlog($blog->getId());
-            $users->deleteUser($user->getId());
+			TestTools::deleteDaoTestData( Array( $comment1, $comment2, $comment3,
+                                                 $trackback1, $trackback2, $trackback3, $trackback4,
+                                                 $article, $cat, $user));
+			TestTools::deleteBlog( $blog );
 		}
 		
 		/**