roller/tests/org/roller/business RefererManagerTest.java,1.11,1.12 RollerTestBase.java,1.8,1.9 TestAll.java,1.12,1.13 WeblogManagerTest.java,1.19,1.20

Update of /cvsroot/roller/roller/tests/org/roller/business
In directory sc8-pr-cvs1:/tmp/cvs-serv5345/tests/org/roller/business

Modified Files:
        RefererManagerTest.java RollerTestBase.java TestAll.java 
        WeblogManagerTest.java 
Log Message:
Cleanups as recommended by Eclipse and PMD.

Index: RefererManagerTest.java
===================================================================
RCS file: 
/cvsroot/roller/roller/tests/org/roller/business/RefererManagerTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RefererManagerTest.java     16 Aug 2003 14:42:13 -0000      1.11
--- RefererManagerTest.java     3 Sep 2003 21:20:38 -0000       1.12
***************
*** 93,97 ****
      public void testRefererProcessing()
      {
-         boolean success = false;
          try 
          {     
--- 93,96 ----

Index: RollerTestBase.java
===================================================================
RCS file: /cvsroot/roller/roller/tests/org/roller/business/RollerTestBase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RollerTestBase.java 14 Aug 2003 21:09:50 -0000      1.8
--- RollerTestBase.java 3 Sep 2003 21:20:38 -0000       1.9
***************
*** 2,9 ****
  package org.roller.business; 
  
- import junit.framework.TestCase;
- 
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
  import org.exolab.castor.jdo.JDO;
  import org.roller.RollerException;
--- 2,5 ----
***************
*** 12,15 ****
--- 8,13 ----
  import org.roller.model.RollerFactory;
  
+ import junit.framework.TestCase;
+ 
  /**
   * Base class for Roller backend unit test classes, responsible for creating 
***************
*** 21,27 ****
  public abstract class RollerTestBase extends TestCase 
  {
-     private static Log mLogger = 
-         LogFactory.getFactory().getInstance(RollerTestBase.class);
- 
      public Roller mRoller = null;
      
--- 19,22 ----

Index: TestAll.java
===================================================================
RCS file: /cvsroot/roller/roller/tests/org/roller/business/TestAll.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TestAll.java        14 Aug 2003 21:09:50 -0000      1.12
--- TestAll.java        3 Sep 2003 21:20:38 -0000       1.13
***************
*** 28,48 ****
          TestSuite suite = new TestSuite();
  
!               String persistence = System.getProperty("rollerImpl");
!         if (persistence != null && persistence.equals("castor"))
!         {
!             suite.addTest(NewsfeedManagerTest.suite());
!             suite.addTest(BookmarkManagerTest.suite());
!             suite.addTest(RefererManagerTest.suite());
!             suite.addTest(UserManagerTest.suite());
!             suite.addTest(WeblogManagerTest.suite());
!         }
!         else
!         {
!                       suite.addTest(BookmarkManagerTest.suite());
!             suite.addTest(NewsfeedManagerTest.suite());
!             suite.addTest(RefererManagerTest.suite());
!             suite.addTest(UserManagerTest.suite());
!             suite.addTest(WeblogManagerTest.suite());
!         }
  
          return suite;
--- 28,36 ----
          TestSuite suite = new TestSuite();
  
!               suite.addTest(BookmarkManagerTest.suite());
!         suite.addTest(NewsfeedManagerTest.suite());
!         suite.addTest(RefererManagerTest.suite());
!         suite.addTest(UserManagerTest.suite());
!         suite.addTest(WeblogManagerTest.suite());
  
          return suite;

Index: WeblogManagerTest.java
===================================================================
RCS file: 
/cvsroot/roller/roller/tests/org/roller/business/WeblogManagerTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** WeblogManagerTest.java      20 Aug 2003 03:28:54 -0000      1.19
--- WeblogManagerTest.java      3 Sep 2003 21:20:38 -0000       1.20
***************
*** 83,88 ****
                  "Test User #"+i, // fullName
                  "test"+i+"@test.com", // emailAddress
!                               new java.util.Date(), // dateCreated
!                               Boolean.TRUE );         // userEnabled
              umgr.storeUser(ud);
              mUsersCreated.addElement(ud);
--- 83,88 ----
                  "Test User #"+i, // fullName
                  "test"+i+"@test.com", // emailAddress
!                 new java.util.Date(), // dateCreated
!                 Boolean.TRUE );     // userEnabled
              umgr.storeUser(ud);
              mUsersCreated.addElement(ud);
***************
*** 111,115 ****
              for ( int j=0; j<mCatCount; j++ )
              {
!                               cats[j] = new WeblogCategoryData(
                      null,    // id
                      website, // websiteId
--- 111,115 ----
              for ( int j=0; j<mCatCount; j++ )
              {
!                 cats[j] = new WeblogCategoryData(
                      null,    // id
                      website, // websiteId
***************
*** 134,140 ****
                      WeblogEntryData wd = new WeblogEntryData(getRoller(),
                          null,     // id
!                                               cats[j],       // category
                          website,  // websiteId
!                                               cats[j].getName() + ":entry"+k, 
 // title
                          i+"text"+k,   // text
                          null,    // anchor
--- 134,140 ----
                      WeblogEntryData wd = new WeblogEntryData(getRoller(),
                          null,     // id
!                         cats[j],       // category
                          website,  // websiteId
!                         cats[j].getName() + ":entry"+k,  // title
                          i+"text"+k,   // text
                          null,    // anchor
***************
*** 144,148 ****
                      wmgr.storeWeblogEntry(wd);
                      mEntriesCreated.addElement(wd);    
!                                       mLogger.debug("      Created entry 
["+wd.getId()+"]"+ wd.getTitle() );                                    
  
                      Timestamp now = new Timestamp( new Date().getTime() );
--- 144,148 ----
                      wmgr.storeWeblogEntry(wd);
                      mEntriesCreated.addElement(wd);    
!                     mLogger.debug("      Created entry ["+wd.getId()+"]"+ 
wd.getTitle() );                                    
  
                      Timestamp now = new Timestamp( new Date().getTime() );
***************
*** 159,163 ****
                          wmgr.storeComment(comment); 
                          mCommentsCreated.addElement(comment);
!                                               mLogger.debug("         Created 
comment ["+comment.getId()+"]"+ comment.getName()); 
                      }
                      
--- 159,163 ----
                          wmgr.storeComment(comment); 
                          mCommentsCreated.addElement(comment);
!                         mLogger.debug("         Created comment 
["+comment.getId()+"]"+ comment.getName()); 
                      }
                      
***************
*** 167,171 ****
          }
          // commit all the objects
!               getRoller().release();     
      }
      
--- 167,171 ----
          }
          // commit all the objects
!         getRoller().release();     
      }
      
***************
*** 195,199 ****
      public void testGetWeblogEntryByAnchor() throws Exception
      {
-         UserManager umgr = getRoller().getUserManager();
          WeblogManager wmgr = getRoller().getWeblogManager();
          
--- 195,198 ----
***************
*** 212,226 ****
          /** Example results:
           * 
testGetWeblogEntryByAnchor(org.roller.business.WeblogManagerTest)junit.framework.AssertionFailedError:
 
!               expected same:<
!               {id=010003008065106087969449100090 
!               category={id=010003008065106087969449100089 name=testsite0:cat0 
description=0cat0 image=null} 
!               title=testsite0:cat0:entry0 text=0text0 
anchor=testsite0_cat0_entry0 
!               pubTime=2003-08-14 11:48:14.0 updateTime=2003-08-14 11:48:14.0 
publishEntry=true}> 
!               was not:<
!               {id=010003008065106087969449100090 
!               category={id=010003008065106087969449100089 name=testsite0:cat0 
description=0cat0 image=null} 
!               title=testsite0:cat0:entry0 text=0text0 
anchor=testsite0_cat0_entry0 
!               pubTime=2003-08-14 11:48:14.0 updateTime=2003-08-14 11:48:14.0 
publishEntry=true}>
!               */
      }
            
--- 211,225 ----
          /** Example results:
           * 
testGetWeblogEntryByAnchor(org.roller.business.WeblogManagerTest)junit.framework.AssertionFailedError:
 
!         expected same:<
!         {id=010003008065106087969449100090 
!         category={id=010003008065106087969449100089 name=testsite0:cat0 
description=0cat0 image=null} 
!         title=testsite0:cat0:entry0 text=0text0 anchor=testsite0_cat0_entry0 
!         pubTime=2003-08-14 11:48:14.0 updateTime=2003-08-14 11:48:14.0 
publishEntry=true}> 
!         was not:<
!         {id=010003008065106087969449100090 
!         category={id=010003008065106087969449100089 name=testsite0:cat0 
description=0cat0 image=null} 
!         title=testsite0:cat0:entry0 text=0text0 anchor=testsite0_cat0_entry0 
!         pubTime=2003-08-14 11:48:14.0 updateTime=2003-08-14 11:48:14.0 
publishEntry=true}>
!         */
      }
            
***************
*** 228,232 ****
      public void testGetWeblogLastUpdateTime() throws Exception
      {
-         UserManager umgr = getRoller().getUserManager();
          WeblogManager wmgr = getRoller().getWeblogManager();
          
--- 227,230 ----
***************
*** 247,251 ****
      public void testGetRecentWeblogEntriesArray() throws Exception
      {
-         UserManager umgr = getRoller().getUserManager();
          WeblogManager wmgr = getRoller().getWeblogManager();
          
--- 245,248 ----
***************
*** 254,258 ****
          int maxEntries = 6;
          int halfEntries = (int)mEntryCount/2;
-         int pubNum = (maxEntries > halfEntries ? maxEntries : halfEntries);
          WeblogCategoryData cat = 
(WeblogCategoryData)mCategoriesCreated.get(0);
          
--- 251,254 ----
***************
*** 263,270 ****
          assertEquals( maxEntries, countEntries(entryMap) );
  
!               // publishedOnly should be no more than halfEntries
          // specified category, publishedOnly is true
          entryMap = wmgr.getRecentWeblogEntries(
              "testuser0", today, cat.getName(), maxEntries, true );
          assertEquals( halfEntries, countEntries(entryMap) );
         
--- 259,267 ----
          assertEquals( maxEntries, countEntries(entryMap) );
  
!         // publishedOnly should be no more than halfEntries
          // specified category, publishedOnly is true
          entryMap = wmgr.getRecentWeblogEntries(
              "testuser0", today, cat.getName(), maxEntries, true );
+ 
          assertEquals( halfEntries, countEntries(entryMap) );
         
***************
*** 292,296 ****
              while (entries.hasNext())
              {
!                 WeblogEntryData wd = (WeblogEntryData) entries.next();
                  count++;
              }
--- 289,293 ----
              while (entries.hasNext())
              {
!                 entries.next();
                  count++;
              }
***************
*** 301,305 ****
      public void testIsWeblogCategoryInUse() throws Exception
      {
-         UserManager umgr = getRoller().getUserManager();
          WeblogManager wmgr = getRoller().getWeblogManager();
              
--- 298,301 ----
***************
*** 313,326 ****
      public void testStoreComment() throws Exception
      {
!               WeblogManager wmgr = getRoller().getWeblogManager();
!               WeblogEntryData entry1 = 
(WeblogEntryData)mEntriesCreated.elementAt(1);
!               CommentData comment = new CommentData(null, entry1, 
"TestCommentUser", 
!                       "test@xxxxxxxx", "", "This is a test", new 
Timestamp(new Date().getTime()));
!               wmgr.storeComment(comment);
!               
!               List comments = wmgr.getComments(entry1.getId());
  
!               assertTrue(comments.size() > mCommentCount);
!               wmgr.removeComment(comment.getId());
      }
      
--- 309,322 ----
      public void testStoreComment() throws Exception
      {
!         WeblogManager wmgr = getRoller().getWeblogManager();
!         WeblogEntryData entry1 = 
(WeblogEntryData)mEntriesCreated.elementAt(1);
!         CommentData comment = new CommentData(null, entry1, 
"TestCommentUser", 
!             "test@xxxxxxxx", "", "This is a test", new Timestamp(new 
Date().getTime()));
!         wmgr.storeComment(comment);
!         
!         List comments = wmgr.getComments(entry1.getId());
  
!         assertTrue(comments.size() > mCommentCount);
!         wmgr.removeComment(comment.getId());
      }
      




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf