Author: ghuber
Date: Wed Jul 31 11:40:05 2013
New Revision: 1508815
URL: http://svn.apache.org/r1508815
Log:
Make tests easier to run locally.
Added:
roller/trunk/app/src/test/resources/junit-cleartables-mysql.sql
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseScriptProvider.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java?rev=1508815&r1=1508814&r2=1508815&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
Wed Jul 31 11:40:05 2013
@@ -1,20 +1,20 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
/*
* TestUtils.java
*
@@ -23,82 +23,172 @@
package org.apache.roller.weblogger;
+import java.io.InputStream;
+import java.sql.Connection;
+
+import org.apache.commons.lang3.StringUtils;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.Planet;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
import org.apache.roller.planet.pojos.SubscriptionEntry;
import org.apache.roller.weblogger.business.BookmarkManager;
-import org.apache.roller.weblogger.business.pings.AutoPingManager;
-import org.apache.roller.weblogger.business.pings.PingTargetManager;
-import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.DatabaseProvider;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogEntryManager;
import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.pings.AutoPingManager;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import
org.apache.roller.weblogger.business.startup.ClasspathDatabaseScriptProvider;
+import org.apache.roller.weblogger.business.startup.SQLScriptRunner;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
import org.apache.roller.weblogger.pojos.AutoPing;
-import org.apache.roller.weblogger.pojos.WeblogEntryComment;
-import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogHitCount;
import org.apache.roller.weblogger.pojos.PingTarget;
import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogEntry;
-import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.WeblogHitCount;
import org.apache.roller.weblogger.pojos.WeblogPermission;
/**
* Utility class for unit test classes.
*/
public final class TestUtils {
-
-
+
+ // Username prefix we are using (simplifies local testing)
+ public static final String JUNIT_PREFIX = "junit_";
+
public static void setupWeblogger() throws Exception {
-
- if(!WebloggerFactory.isBootstrapped()) {
+
+ if (!WebloggerFactory.isBootstrapped()) {
+
+ System.out.println("Bootstrapping system, please wait....");
+
// do core services preparation
WebloggerStartup.prepare();
-
+
// do application bootstrapping
WebloggerFactory.bootstrap();
-
+
// always initialize the properties manager and flush
WebloggerFactory.getWeblogger().initialize();
+
+ // Reset for local tests
+ // On junit test jvm argument -Droller.tests.reset=true/false
+ String local = System.getProperty("roller.tests.reset");
+ if (StringUtils.isNotEmpty(local) && local.equals("true")) {
+
+ System.out
+ .println("Reseting tables for local tests:
roller.tests.reset="
+ + local);
+
+ try {
+ clearTestData();
+ } catch (Exception e) {
+ System.out.println("Error reseting tables : "
+ + e.getMessage());
+ } finally {
+ // flush
+ endSession(true);
+ }
+ }
+
+ System.out
+ .println("Bootstrapping successful, running tests please
wait....");
+
}
}
-
-
+
public static void shutdownWeblogger() throws Exception {
-
+
// trigger shutdown
WebloggerFactory.getWeblogger().shutdown();
}
-
+
/**
* Convenience method that simulates the end of a typical session.
- *
+ *
* Normally this would be triggered by the end of the response in the
webapp
* but for unit tests we need to do this explicitly.
- *
- * @param flush true if you want to flush changes to db before releasing
+ *
+ * @param flush
+ * true if you want to flush changes to db before releasing
*/
public static void endSession(boolean flush) throws Exception {
-
- if(flush) {
+
+ if (flush) {
WebloggerFactory.getWeblogger().flush();
}
-
+
WebloggerFactory.getWeblogger().release();
}
-
-
+
+ /**
+ * Clear test data.
+ *
+ * @throws Exception
+ * the exception
+ */
+ private static void clearTestData() throws Exception {
+
+ DatabaseProvider dbp = WebloggerStartup.getDatabaseProvider();
+ Connection con = dbp.getConnection();
+
+ // normally local tests run against mysql
+ String databaseProductName =
con.getMetaData().getDatabaseProductName();
+ String dbname = "mysql";
+ if (databaseProductName.toLowerCase().indexOf("derby") > 0) {
+ // tests against Derby
+ dbname = "derby";
+ }
+
+ // Somewhere on classpath
+ ClasspathDatabaseScriptProvider scriptProvider = new
ClasspathDatabaseScriptProvider();
+
+ InputStream script = scriptProvider
+ .getAbsoluteDatabaseScript("junit-cleartables-" + dbname
+ + ".sql");
+
+ try {
+
+ if (script != null) {
+
+ // run script to reset tables
+ SQLScriptRunner create = new SQLScriptRunner(script);
+ create.runScript(con, true);
+
+ } else {
+
+ throw new RuntimeException(
+ "Reseting tables script unsupported database or not
found :"
+ + dbname);
+
+ }
+
+ } finally {
+ try {
+ script.close();
+ } catch (Exception e) {
+ // ignored
+ }
+ }
+
+ }
+
/**
* Convenience method that creates a user and stores it.
*/
- public static User setupUser(String username) throws Exception {
-
+ public static User setupUser(String userName) throws Exception {
+
+ // Set local name
+ userName = JUNIT_PREFIX + userName;
+
User testUser = new User();
- testUser.setUserName(username);
+ testUser.setUserName(userName);
testUser.setPassword("password");
testUser.setScreenName("Test User Screen Name");
testUser.setFullName("Test User");
@@ -107,46 +197,45 @@ public final class TestUtils {
testUser.setTimeZone("America/Los_Angeles");
testUser.setDateCreated(new java.util.Date());
testUser.setEnabled(Boolean.TRUE);
-
+
// store the user
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
mgr.addUser(testUser);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
-
+
// query for the user to make sure we return the persisted object
- User user = mgr.getUserByUserName(username);
-
- if(user == null)
+ User user = mgr.getUserByUserName(userName);
+
+ if (user == null)
throw new WebloggerException("error inserting new user");
-
+
return user;
}
-
-
+
/**
* Convenience method for removing a user.
*/
public static void teardownUser(String userName) throws Exception {
-
+
// lookup the user
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
User user = mgr.getUserByUserName(userName, null);
-
+
// remove the user
mgr.removeUser(user);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method that creates a weblog and stores it.
*/
- public static Weblog setupWeblog(String handle, User creator) throws
Exception {
-
+ public static Weblog setupWeblog(String handle, User creator)
+ throws Exception {
+
Weblog testWeblog = new Weblog();
testWeblog.setName("Test Weblog");
testWeblog.setDescription("Test Weblog");
@@ -160,386 +249,383 @@ public final class TestUtils {
testWeblog.setTimeZone("America/Los_Angeles");
testWeblog.setDateCreated(new java.util.Date());
testWeblog.setCreatorUserName(creator.getUserName());
-
+
// add weblog
WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
mgr.addWeblog(testWeblog);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
-
+
// query for the new weblog and return it
Weblog weblog = mgr.getWeblogByHandle(handle);
-
- if(weblog == null)
+
+ if (weblog == null)
throw new WebloggerException("error setting up weblog");
-
+
return weblog;
}
-
-
+
/**
* Convenience method for removing a weblog.
*/
public static void teardownWeblog(String id) throws Exception {
-
+
// lookup the weblog
WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
Weblog weblog = mgr.getWeblog(id);
-
+
// remove the weblog
mgr.removeWeblog(weblog);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method for removing a permission.
*/
- public static void teardownPermissions(WeblogPermission perm) throws
Exception {
-
+ public static void teardownPermissions(WeblogPermission perm)
+ throws Exception {
+
// remove all permissions
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
- mgr.revokeWeblogPermission(perm.getWeblog(), perm.getUser(),
WeblogPermission.ALL_ACTIONS);
-
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+ mgr.revokeWeblogPermission(perm.getWeblog(), perm.getUser(),
+ WeblogPermission.ALL_ACTIONS);
+
// flush to db
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method for creating a weblog category.
*/
public static WeblogCategory setupWeblogCategory(Weblog weblog,
- String name,
- WeblogCategory parent)
- throws Exception {
-
- WeblogEntryManager mgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
+ String name, WeblogCategory parent) throws Exception {
+
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger()
+ .getWeblogEntryManager();
WeblogCategory root = mgr.getRootWeblogCategory(weblog);
-
+
WeblogCategory catParent = root;
- if(parent != null) {
+ if (parent != null) {
catParent = parent;
}
- WeblogCategory testCat = new WeblogCategory(weblog, catParent, name,
null, null);
+ WeblogCategory testCat = new WeblogCategory(weblog, catParent, name,
+ null, null);
mgr.saveWeblogCategory(testCat);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
-
+
// query for object
WeblogCategory cat = mgr.getWeblogCategory(testCat.getId());
-
- if(cat == null)
+
+ if (cat == null)
throw new WebloggerException("error setting up weblog category");
-
+
return cat;
}
-
-
+
/**
* Convenience method for removing a weblog category.
*/
public static void teardownWeblogCategory(String id) throws Exception {
-
+
// lookup the cat
- WeblogEntryManager mgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger()
+ .getWeblogEntryManager();
WeblogCategory cat = mgr.getWeblogCategory(id);
-
+
// remove the cat
mgr.removeWeblogCategory(cat);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method for creating a weblog entry.
*/
public static WeblogEntry setupWeblogEntry(String anchor,
- WeblogCategory cat,
- Weblog weblog,
- User user)
- throws Exception {
-
+ WeblogCategory cat, Weblog weblog, User user) throws Exception {
+
WeblogEntry testEntry = new WeblogEntry();
testEntry.setTitle(anchor);
testEntry.setLink("testEntryLink");
testEntry.setText("blah blah entry");
testEntry.setAnchor(anchor);
- testEntry.setPubTime(new java.sql.Timestamp(new
java.util.Date().getTime()));
- testEntry.setUpdateTime(new java.sql.Timestamp(new
java.util.Date().getTime()));
+ testEntry.setPubTime(new java.sql.Timestamp(new java.util.Date()
+ .getTime()));
+ testEntry.setUpdateTime(new java.sql.Timestamp(new java.util.Date()
+ .getTime()));
testEntry.setStatus(WeblogEntry.PUBLISHED);
testEntry.setWebsite(getManagedWebsite(weblog));
testEntry.setCreatorUserName(getManagedUser(user).getUserName());
testEntry.setCategory(cat);
-
+
// store entry
- WeblogEntryManager mgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger()
+ .getWeblogEntryManager();
mgr.saveWeblogEntry(testEntry);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
-
+
// query for object
WeblogEntry entry = mgr.getWeblogEntry(testEntry.getId());
-
- if(entry == null)
+
+ if (entry == null)
throw new WebloggerException("error setting up weblog entry");
-
+
return entry;
}
-
-
+
/**
* Convenience method for removing a weblog entry.
*/
public static void teardownWeblogEntry(String id) throws Exception {
-
+
// lookup the entry
- WeblogEntryManager mgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger()
+ .getWeblogEntryManager();
WeblogEntry entry = mgr.getWeblogEntry(id);
-
+
// remove the entry
mgr.removeWeblogEntry(entry);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method for creating a comment.
*/
- public static WeblogEntryComment setupComment(String content, WeblogEntry
entry)
- throws Exception {
-
+ public static WeblogEntryComment setupComment(String content,
+ WeblogEntry entry) throws Exception {
+
WeblogEntryComment testComment = new WeblogEntryComment();
testComment.setName("test");
testComment.setEmail("test");
testComment.setUrl("test");
testComment.setRemoteHost("foofoo");
testComment.setContent("this is a test comment");
- testComment.setPostTime(new java.sql.Timestamp(new
java.util.Date().getTime()));
+ testComment.setPostTime(new java.sql.Timestamp(new java.util.Date()
+ .getTime()));
testComment.setWeblogEntry(getManagedWeblogEntry(entry));
testComment.setStatus(WeblogEntryComment.APPROVED);
-
+
// store testComment
- WeblogEntryManager mgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger()
+ .getWeblogEntryManager();
mgr.saveComment(testComment);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
-
+
// query for object
WeblogEntryComment comment = mgr.getComment(testComment.getId());
-
- if(comment == null)
+
+ if (comment == null)
throw new WebloggerException("error setting up comment");
-
+
return comment;
}
-
-
+
/**
* Convenience method for removing a comment.
*/
public static void teardownComment(String id) throws Exception {
-
+
// lookup the comment
- WeblogEntryManager mgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger()
+ .getWeblogEntryManager();
WeblogEntryComment comment = mgr.getComment(id);
-
+
// remove the comment
mgr.removeComment(comment);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method for creating a ping target.
*/
- public static PingTarget setupPingTarget(String name, String url)
+ public static PingTarget setupPingTarget(String name, String url)
throws Exception {
-
+
PingTarget testPing = new PingTarget();
testPing.setName("testCommonPing");
testPing.setPingUrl("http://localhost/testCommonPing";);
-
+
// store ping
- PingTargetManager pingMgr =
WebloggerFactory.getWeblogger().getPingTargetManager();
+ PingTargetManager pingMgr = WebloggerFactory.getWeblogger()
+ .getPingTargetManager();
pingMgr.savePingTarget(testPing);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
-
+
// query for it
PingTarget ping = pingMgr.getPingTarget(testPing.getId());
-
- if(ping == null)
+
+ if (ping == null)
throw new WebloggerException("error setting up ping target");
-
+
return ping;
}
-
-
+
/**
* Convenience method for removing a ping target.
*/
public static void teardownPingTarget(String id) throws Exception {
-
+
// query for it
- PingTargetManager pingMgr =
WebloggerFactory.getWeblogger().getPingTargetManager();
+ PingTargetManager pingMgr = WebloggerFactory.getWeblogger()
+ .getPingTargetManager();
PingTarget ping = pingMgr.getPingTarget(id);
-
+
// remove the ping
pingMgr.removePingTarget(ping);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method for creating an auto ping.
*/
public static AutoPing setupAutoPing(PingTarget ping, Weblog weblog)
throws Exception {
-
- AutoPingManager mgr =
WebloggerFactory.getWeblogger().getAutopingManager();
-
+
+ AutoPingManager mgr = WebloggerFactory.getWeblogger()
+ .getAutopingManager();
+
// store auto ping
- AutoPing autoPing = new AutoPing(null, ping, getManagedWebsite(weblog)
);
+ AutoPing autoPing = new AutoPing(null, ping,
getManagedWebsite(weblog));
mgr.saveAutoPing(autoPing);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
-
+
// query for it
autoPing = mgr.getAutoPing(autoPing.getId());
-
- if(autoPing == null)
+
+ if (autoPing == null)
throw new WebloggerException("error setting up auto ping");
-
+
return autoPing;
}
-
-
+
/**
* Convenience method for removing an auto ping.
*/
public static void teardownAutoPing(String id) throws Exception {
-
+
// query for it
- AutoPingManager mgr =
WebloggerFactory.getWeblogger().getAutopingManager();
+ AutoPingManager mgr = WebloggerFactory.getWeblogger()
+ .getAutopingManager();
AutoPing autoPing = mgr.getAutoPing(id);
-
+
// remove the auto ping
mgr.removeAutoPing(autoPing);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method for creating a hit count.
*/
public static WeblogHitCount setupHitCount(Weblog weblog, int amount)
throws Exception {
-
- WeblogEntryManager mgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
-
+
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger()
+ .getWeblogEntryManager();
+
// store
WeblogHitCount testCount = new WeblogHitCount();
testCount.setWeblog(getManagedWebsite(weblog));
testCount.setDailyHits(amount);
mgr.saveHitCount(testCount);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
-
+
// query for it
testCount = mgr.getHitCount(testCount.getId());
-
- if(testCount == null)
+
+ if (testCount == null)
throw new WebloggerException("error setting up hit count");
-
+
return testCount;
}
-
-
+
/**
* Convenience method for removing a hit count.
*/
public static void teardownHitCount(String id) throws Exception {
-
+
// query for it
- WeblogEntryManager mgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger()
+ .getWeblogEntryManager();
WeblogHitCount testCount = mgr.getHitCount(id);
-
+
// remove
mgr.removeHitCount(testCount);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method for creating a weblog folder.
*/
- public static WeblogBookmarkFolder setupFolder(Weblog weblog,
- String name,
- WeblogBookmarkFolder parent)
- throws Exception {
-
- BookmarkManager mgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
+ public static WeblogBookmarkFolder setupFolder(Weblog weblog, String name,
+ WeblogBookmarkFolder parent) throws Exception {
+
+ BookmarkManager mgr = WebloggerFactory.getWeblogger()
+ .getBookmarkManager();
WeblogBookmarkFolder root = mgr.getRootFolder(weblog);
-
+
WeblogBookmarkFolder folderParent = root;
- if(parent != null) {
+ if (parent != null) {
folderParent = parent;
}
- WeblogBookmarkFolder testFolder = new
WeblogBookmarkFolder(folderParent, name, null, weblog);
+ WeblogBookmarkFolder testFolder = new WeblogBookmarkFolder(
+ folderParent, name, null, weblog);
mgr.saveFolder(testFolder);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
-
+
// query for object
WeblogBookmarkFolder cat = mgr.getFolder(testFolder.getId());
-
- if(testFolder == null)
+
+ if (testFolder == null)
throw new WebloggerException("error setting up weblog folder");
-
+
return testFolder;
}
-
-
+
/**
* Convenience method for removing a weblog folder.
*/
public static void teardownFolder(String id) throws Exception {
-
+
// lookup the folder
- BookmarkManager mgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
+ BookmarkManager mgr = WebloggerFactory.getWeblogger()
+ .getBookmarkManager();
WeblogBookmarkFolder folder = mgr.getFolder(id);
-
+
// remove the cat
mgr.removeFolder(folder);
-
+
// flush to db
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method that returns managed copy of given user.
*/
@@ -547,210 +633,211 @@ public final class TestUtils {
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
return mgr.getUserByUserName(user.getUserName());
}
-
+
/**
* Convenience method that returns managed copy of given website.
*/
- public static Weblog getManagedWebsite(Weblog website) throws
WebloggerException {
- return
WebloggerFactory.getWeblogger().getWeblogManager().getWeblog(website.getId());
+ public static Weblog getManagedWebsite(Weblog website)
+ throws WebloggerException {
+ return WebloggerFactory.getWeblogger().getWeblogManager()
+ .getWeblog(website.getId());
}
-
+
/**
* Convenience method that returns managed copy of given WeblogEntry.
*/
- public static WeblogEntry getManagedWeblogEntry(WeblogEntry weblogEntry)
throws WebloggerException {
- return
WebloggerFactory.getWeblogger().getWeblogEntryManager().getWeblogEntry(weblogEntry.getId());
+ public static WeblogEntry getManagedWeblogEntry(WeblogEntry weblogEntry)
+ throws WebloggerException {
+ return WebloggerFactory.getWeblogger().getWeblogEntryManager()
+ .getWeblogEntry(weblogEntry.getId());
}
/**
* Convenience method that returns managed copy of given WeblogEntry.
*/
- public static WeblogCategory getManagedWeblogCategory(WeblogCategory cat)
throws WebloggerException {
- return
WebloggerFactory.getWeblogger().getWeblogEntryManager().getWeblogCategory(cat.getId());
+ public static WeblogCategory getManagedWeblogCategory(WeblogCategory cat)
+ throws WebloggerException {
+ return WebloggerFactory.getWeblogger().getWeblogEntryManager()
+ .getWeblogCategory(cat.getId());
}
- /**
+ /**
* Convenience method that creates a planet and stores it.
*/
public static Planet setupPlanet(String handle) throws Exception {
-
+
Planet testPlanet = new Planet(handle, handle, handle);
-
+
// store
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
mgr.savePlanet(testPlanet);
-
+
// flush
WebloggerFactory.getWeblogger().flush();
-
+
// query to make sure we return the persisted object
Planet planet = mgr.getWeblogger(handle);
-
- if(planet == null)
+
+ if (planet == null)
throw new WebloggerException("error inserting new planet");
-
+
return planet;
}
-
-
+
/**
* Convenience method for removing a planet.
*/
public static void teardownPlanet(String id) throws Exception {
-
+
// lookup
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Planet planet = mgr.getWebloggerById(id);
-
+
// remove
mgr.deletePlanet(planet);
-
+
// flush
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method that creates a group and stores it.
*/
- public static PlanetGroup setupGroup(Planet planet, String handle)
+ public static PlanetGroup setupGroup(Planet planet, String handle)
throws Exception {
-
+
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
-
+
// make sure we are using a persistent object
Planet testPlanet = mgr.getWebloggerById(planet.getId());
-
+
// store
- PlanetGroup testGroup = new PlanetGroup(testPlanet, handle, handle,
handle);
+ PlanetGroup testGroup = new PlanetGroup(testPlanet, handle, handle,
+ handle);
testPlanet.getGroups().add(testGroup);
mgr.saveGroup(testGroup);
-
+
// flush
WebloggerFactory.getWeblogger().flush();
-
+
// query to make sure we return the persisted object
PlanetGroup group = mgr.getGroupById(testGroup.getId());
-
- if(group == null)
+
+ if (group == null)
throw new WebloggerException("error inserting new group");
-
+
return group;
}
-
-
+
/**
* Convenience method for removing a group.
*/
public static void teardownGroup(String id) throws Exception {
-
+
// lookup
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
PlanetGroup group = mgr.getGroupById(id);
-
+
// remove
mgr.deleteGroup(group);
group.getPlanet().getGroups().remove(group);
-
+
// flush
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method that creates a sub and stores it.
*/
- public static Subscription setupSubscription(String feedUrl)
+ public static Subscription setupSubscription(String feedUrl)
throws Exception {
-
+
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
-
+
// store
Subscription testSub = new Subscription();
testSub.setFeedURL(feedUrl);
testSub.setTitle(feedUrl);
mgr.saveSubscription(testSub);
-
+
// flush
WebloggerFactory.getWeblogger().flush();
-
+
// query to make sure we return the persisted object
Subscription sub = mgr.getSubscriptionById(testSub.getId());
-
- if(sub == null)
+
+ if (sub == null)
throw new WebloggerException("error inserting new subscription");
-
+
return sub;
}
-
-
+
/**
* Convenience method for removing a sub.
*/
public static void teardownSubscription(String id) throws Exception {
-
+
// lookup
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Subscription sub = mgr.getSubscriptionById(id);
-
+
// remove
mgr.deleteSubscription(sub);
-
+
// flush
WebloggerFactory.getWeblogger().flush();
}
-
-
+
/**
* Convenience method that creates an entry and stores it.
*/
- public static SubscriptionEntry setupEntry(Subscription sub, String title)
+ public static SubscriptionEntry setupEntry(Subscription sub, String title)
throws Exception {
-
+
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
-
+
// make sure we are using a persistent object
Subscription testSub = mgr.getSubscriptionById(sub.getId());
-
+
// store
SubscriptionEntry testEntry = new SubscriptionEntry();
testEntry.setPermalink(title);
testEntry.setTitle(title);
- testEntry.setPubTime(new
java.sql.Timestamp(System.currentTimeMillis()));
+ testEntry
+ .setPubTime(new
java.sql.Timestamp(System.currentTimeMillis()));
testEntry.setSubscription(testSub);
testSub.getEntries().add(testEntry);
mgr.saveEntry(testEntry);
-
+
// flush
WebloggerFactory.getWeblogger().flush();
-
+
// query to make sure we return the persisted object
SubscriptionEntry entry = mgr.getEntryById(testEntry.getId());
-
- if(entry == null)
+
+ if (entry == null)
throw new WebloggerException("error inserting new entry");
-
+
return entry;
}
-
-
+
/**
* Convenience method for removing an entry.
*/
public static void teardownEntry(String id) throws Exception {
-
+
// lookup
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
SubscriptionEntry entry = mgr.getEntryById(id);
-
+
// remove
mgr.deleteEntry(entry);
entry.getSubscription().getEntries().remove(entry);
-
+
// flush
WebloggerFactory.getWeblogger().flush();
}
-
+
public void testNothing() {
// TODO: remove this method
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java?rev=1508815&r1=1508814&r2=1508815&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
Wed Jul 31 11:40:05 2013
@@ -20,15 +20,30 @@ package org.apache.roller.weblogger.busi
import java.io.InputStream;
-
/**
* Reads dbscripts from the classpath.
*/
public class ClasspathDatabaseScriptProvider implements DatabaseScriptProvider
{
-
+
+ /**
+ * @see
org.apache.roller.weblogger.business.startup.DatabaseScriptProvider#getDatabaseScript(java.lang.String)
+ */
public InputStream getDatabaseScript(String path) {
String resourcePath = "/dbscripts/" + path;
return this.getClass().getResourceAsStream(resourcePath);
}
-
+
+ /**
+ * @see
org.apache.roller.weblogger.business.startup.DatabaseScriptProvider#getAbsoluteDatabaseScript(java.lang.String)
+ */
+ public InputStream getAbsoluteDatabaseScript(String path) {
+
+ // Add leading slash if not present
+ if (!path.startsWith("/")) {
+ path = "/" + path;
+ }
+
+ return ClasspathDatabaseScriptProvider.class.getResourceAsStream(path);
+ }
+
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseScriptProvider.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseScriptProvider.java?rev=1508815&r1=1508814&r2=1508815&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseScriptProvider.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseScriptProvider.java
Wed Jul 31 11:40:05 2013
@@ -20,15 +20,21 @@ package org.apache.roller.weblogger.busi
import java.io.InputStream;
-
/**
* Interface for retrieving database script.
*/
public interface DatabaseScriptProvider {
-
- /**
- * Get an InputStream to a database script at the given path.
+
+ /**
+ * Get an InputStream to a database script at the given path in the
+ * classes/dbscripts/ folder.
*/
InputStream getDatabaseScript(String path) throws Exception;
-
+
+ /**
+ * Get an InputStream to a database script at the given path relative to
+ * classes folder.
+ */
+ InputStream getAbsoluteDatabaseScript(String absolutePath) throws
Exception;
+
}
Added: roller/trunk/app/src/test/resources/junit-cleartables-mysql.sql
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/junit-cleartables-mysql.sql?rev=1508815&view=auto
==============================================================================
--- roller/trunk/app/src/test/resources/junit-cleartables-mysql.sql (added)
+++ roller/trunk/app/src/test/resources/junit-cleartables-mysql.sql Wed Jul 31
11:40:05 2013
@@ -0,0 +1,36 @@
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. The ASF licenses this file to You
+-- under the Apache License, Version 2.0 (the "License"); you may not
+-- use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License. For additional information regarding
+-- copyright in this work, please see the NOTICE file in the top level
+-- directory of this distribution.
+
+-- Script is used to clear old data prior to running local tests
+
+delete mt from website w, roller_mediafile mf, roller_mediafiletag mt where
w.id = mf.weblogid and mt.mediafile_id = mf.id and w.creator like 'junit_%';
+delete mf from website w, roller_mediafile mf where w.id = mf.weblogid and
w.creator like 'junit_%';
+delete md from website w, roller_mediafiledir md where w.id = md.websiteid and
w.creator like 'junit_%';
+
+delete r from website w, referer r WHERE w.id = r.websiteid and w.creator like
'junit_%';
+
+delete from website WHERE creator like 'junit_%';
+
+delete b from website w, folder f, bookmark b where f.id = b.folderid and w.id
= f.websiteid and w.creator like 'junit_%';
+delete from folder WHERE websiteid like 'junit_%';
+
+delete from userrole WHERE username like 'junit_%';
+delete from roller_permission WHERE username like 'junit_%';
+delete from rolleruser WHERE username like 'junit_%';
+delete from roller_userattribute WHERE username like 'junit_%';
+delete from roller_oauthconsumer WHERE username like 'junit_%';
+delete from roller_oauthaccessor WHERE username like 'junit_%';
+
