Author: agilliland
Date: Mon Apr 10 15:46:09 2006
New Revision: 393108
URL: http://svn.apache.org/viewcvs?rev=393108&view=rev
Log:
a little cleanup of the file manager test.
Modified:
incubator/roller/branches/roller-newbackend/build.xml
incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java
Modified: incubator/roller/branches/roller-newbackend/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/build.xml?rev=393108&r1=393107&r2=393108&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/build.xml (original)
+++ incubator/roller/branches/roller-newbackend/build.xml Mon Apr 10 15:46:09
2006
@@ -823,6 +823,7 @@
<include name="org/roller/business/PingsTest.class"/>
<include name="org/roller/business/PropertiesTest.class"/>
<include name="org/roller/business/WeblogEntryTest.class"/>
+ <include name="org/roller/business/FileManagerTest.class"/>
</fileset>
</batchtest>
</junit>
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java?rev=393108&r1=393107&r2=393108&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java
(original)
+++
incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java
Mon Apr 10 15:46:09 2006
@@ -1,11 +1,13 @@
package org.roller.business;
import java.io.InputStream;
-import java.util.HashMap;
import java.util.Map;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.roller.TestUtils;
import org.roller.model.FileManager;
import org.roller.model.PropertiesManager;
import org.roller.model.Roller;
@@ -22,6 +24,11 @@
*/
public class FileManagerTest extends TestCase {
+ public static Log log = LogFactory.getLog(FileManagerTest.class);
+
+ UserData testUser = null;
+ WebsiteData testWeblog = null;
+
public FileManagerTest(String name) {
super(name);
@@ -34,103 +41,71 @@
public void setUp() throws Exception {
+
+ try {
+ testUser = TestUtils.setupUser("FileManagerTest_userName");
+ testWeblog = TestUtils.setupWeblog("FileManagerTest_handle",
testUser);
+ } catch (Exception ex) {
+ log.error(ex);
+ }
}
public void tearDown() throws Exception {
- }
-
-
- public void testCanSave() {
+
try {
- // do some setup for our test
- Roller mRoller = RollerFactory.getRoller();
-
- UserManager umgr = mRoller.getUserManager();
- UserData user = umgr.getUser("FileManagerTest_userName");
- WebsiteData mWebsite = (WebsiteData)umgr.getWebsites(user,null,
null).get(0);
-
- if(mWebsite == null)
- mWebsite = this.createTestUser();
-
- // update roller properties to prepare for test
- PropertiesManager pmgr = mRoller.getPropertiesManager();
- Map config = pmgr.getProperties();
-
((RollerPropertyData)config.get("uploads.enabled")).setValue("false");
-
((RollerPropertyData)config.get("uploads.types.forbid")).setValue("gif");
-
((RollerPropertyData)config.get("uploads.dir.maxsize")).setValue("1.00");
- pmgr.store(config);
- mRoller.commit();
-
- FileManager fmgr = new FileManagerImpl();
- RollerMessages msgs = new RollerMessages();
- assertFalse(fmgr.canSave(mWebsite.getHandle(), "test.gif",
2500000, msgs));
- //assertEquals(4, msgs.getErrorCount());
- } catch (Exception e) {
- e.printStackTrace();
+ TestUtils.teardownWeblog(testWeblog.getHandle());
+ TestUtils.teardownUser(testUser.getUserName());
+ } catch (Exception ex) {
+ log.error(ex);
}
}
- public void testSave() {
- try {
- // do some setup for our test
- Roller roller = RollerFactory.getRoller();
- UserManager umgr = roller.getUserManager();
- UserData user = umgr.getUser("FileManagerTest_userName");
- WebsiteData mWebsite = (WebsiteData)umgr.getWebsites(user,null,
null).get(0);
-
- if(mWebsite == null)
- mWebsite = this.createTestUser();
-
- // update roller properties to prepare for test
- PropertiesManager pmgr = roller.getPropertiesManager();
- Map config = pmgr.getProperties();
-
((RollerPropertyData)config.get("uploads.enabled")).setValue("true");
-
((RollerPropertyData)config.get("uploads.types.allowed")).setValue("opml");
-
((RollerPropertyData)config.get("uploads.dir.maxsize")).setValue("1.00");
- pmgr.store(config);
- roller.commit();
-
- /* NOTE: upload dir for unit tests is set in
- roller/personal/testing/roller-custom.properties */
- FileManager fmgr = new FileManagerImpl();
- RollerMessages msgs = new RollerMessages();
- InputStream is = getClass().getResourceAsStream("/bookmarks.opml");
- fmgr.saveFile(mWebsite.getHandle(), "bookmarks.opml", 1545, is);
-
- assertEquals(1, fmgr.getFiles(mWebsite.getHandle()).length);
-
- fmgr.deleteFile(mWebsite.getHandle(), "bookmarks.opml");
- Thread.sleep(2000);
- assertEquals(0, fmgr.getFiles(mWebsite.getHandle()).length);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ public void testCanSave() throws Exception {
+
+ // update roller properties to prepare for test
+ PropertiesManager pmgr =
RollerFactory.getRoller().getPropertiesManager();
+ Map config = pmgr.getProperties();
+ ((RollerPropertyData)config.get("uploads.enabled")).setValue("false");
+
((RollerPropertyData)config.get("uploads.types.forbid")).setValue("gif");
+
((RollerPropertyData)config.get("uploads.dir.maxsize")).setValue("1.00");
+ pmgr.store(config);
+
+ // test quota functionality
+ FileManager fmgr = RollerFactory.getRoller().getFileManager();
+ RollerMessages msgs = new RollerMessages();
+ assertFalse(fmgr.canSave(testWeblog.getHandle(), "test.gif", 2500000,
msgs));
}
- private WebsiteData createTestUser() throws Exception {
- // do some setup for our test
- Roller mRoller = RollerFactory.getRoller();
- UserManager umgr = mRoller.getUserManager();
- UserData user = new UserData(null,
- "FileManagerTest_userName",
- "FileManagerTest_password",
- "FileManagerTest_description",
- "[EMAIL PROTECTED]",
- "en_US_WIN", "America/Los_Angeles",
- new java.util.Date(), Boolean.TRUE);
- Map pages = new HashMap();
- pages.put("Weblog","Weblog page content");
- pages.put("_day","Day page content");
- pages.put("css","CSS page content");
- umgr.addUser(user);
- umgr.createWebsite(user, pages,
- user.getUserName(), user.getUserName(), user.getUserName(),
- "[EMAIL PROTECTED]","basic", "en_US_WIN",
"America/Los_Angeles");
- mRoller.commit();
- WebsiteData website = (WebsiteData)umgr.getWebsites(user,null,
null).get(0);
- return website;
+ public void testSave() throws Exception {
+
+ // update roller properties to prepare for test
+ PropertiesManager pmgr =
RollerFactory.getRoller().getPropertiesManager();
+ Map config = pmgr.getProperties();
+ ((RollerPropertyData)config.get("uploads.enabled")).setValue("true");
+
((RollerPropertyData)config.get("uploads.types.allowed")).setValue("opml");
+
((RollerPropertyData)config.get("uploads.dir.maxsize")).setValue("1.00");
+ pmgr.store(config);
+
+ /* NOTE: upload dir for unit tests is set in
+ roller/personal/testing/roller-custom.properties */
+ FileManager fmgr = RollerFactory.getRoller().getFileManager();
+ RollerMessages msgs = new RollerMessages();
+
+ // store a file
+ InputStream is = getClass().getResourceAsStream("/bookmarks.opml");
+ fmgr.saveFile(testWeblog.getHandle(), "bookmarks.opml", 1545, is);
+
+ // make sure file was stored successfully
+ assertEquals(1, fmgr.getFiles(testWeblog.getHandle()).length);
+
+ // delete a file
+ fmgr.deleteFile(testWeblog.getHandle(), "bookmarks.opml");
+
+ // make sure delete was successful
+ Thread.sleep(2000);
+ assertEquals(0, fmgr.getFiles(testWeblog.getHandle()).length);
}
}
