Author: snoopdave
Date: Sat Aug 11 13:08:01 2007
New Revision: 564964
URL: http://svn.apache.org/viewvc?view=rev&rev=564964
Log:
Couple of bootstrap fixes needed for tests
Added:
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TestTask.java
Modified:
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TaskLockTest.java
roller/trunk/apps/weblogger/testdata/roller-custom.properties
Modified:
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java?view=diff&rev=564964&r1=564963&r2=564964
==============================================================================
---
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
(original)
+++
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
Sat Aug 11 13:08:01 2007
@@ -62,8 +62,7 @@
WebloggerFactory.bootstrap();
// always initialize the properties manager and flush
-
WebloggerFactory.getWeblogger().getPropertiesManager().initialize();
- WebloggerFactory.getWeblogger().flush();
+ WebloggerFactory.getWeblogger().initialize();
}
}
Modified:
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java?view=diff&rev=564964&r1=564963&r2=564964
==============================================================================
---
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java
(original)
+++
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java
Sat Aug 11 13:08:01 2007
@@ -215,7 +215,8 @@
// lookup all common pings
List commonPings = mgr.getCommonPingTargets();
assertNotNull(commonPings);
- assertEquals(1, commonPings.size());
+ // correct answer is: 6 pings in config + 1 new one = 7
+ assertEquals(7, commonPings.size());
// lookup all custom pings for weblog
testWeblog = TestUtils.getManagedWebsite(testWeblog);
Modified:
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TaskLockTest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TaskLockTest.java?view=diff&rev=564964&r1=564963&r2=564964
==============================================================================
---
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TaskLockTest.java
(original)
+++
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TaskLockTest.java
Sat Aug 11 13:08:01 2007
@@ -80,17 +80,4 @@
TestUtils.endSession(true);
}
-
- class TestTask extends RollerTaskWithLeasing {
-
- public String getName() { return "TestTask"; }
- public String getClientId() { return "TestTaskClientId"; }
- public Date getStartTime(Date current) { return current; }
- public String getStartTimeDesc() { return "immediate"; }
- public int getLeaseTime() { return 300; }
- public int getInterval() { return 1800; }
- public void runTask() { }
-
- }
-
}
Added:
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TestTask.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TestTask.java?view=auto&rev=564964
==============================================================================
---
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TestTask.java
(added)
+++
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TestTask.java
Sat Aug 11 13:08:01 2007
@@ -0,0 +1,38 @@
+package org.apache.roller.weblogger.business;
+
+import java.util.Date;
+import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
+
+public class TestTask extends RollerTaskWithLeasing {
+
+ public TestTask() {
+
+ }
+
+ public String getName() {
+ return "TestTask";
+ }
+
+ public String getClientId() {
+ return "TestTaskClientId";
+ }
+
+ public Date getStartTime(Date current) {
+ return current;
+ }
+
+ public String getStartTimeDesc() {
+ return "immediate";
+ }
+
+ public int getLeaseTime() {
+ return 300;
+ }
+
+ public int getInterval() {
+ return 1800;
+ }
+
+ public void runTask() {
+ }
+}
Modified: roller/trunk/apps/weblogger/testdata/roller-custom.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/testdata/roller-custom.properties?view=diff&rev=564964&r1=564963&r2=564964
==============================================================================
--- roller/trunk/apps/weblogger/testdata/roller-custom.properties (original)
+++ roller/trunk/apps/weblogger/testdata/roller-custom.properties Sat Aug 11
13:08:01 2007
@@ -33,3 +33,13 @@
openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=INFO
#openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
+
+# override tasks.enabled so we can add a test task
+tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,TurnoverReferersTask,PingQueueTask,TestTask
+
+# test task
+tasks.TestTask.class=org.apache.roller.weblogger.business.TestTask
+tasks.TestTask.startTime=immediate
+tasks.TestTask.interval=1800
+tasks.TestTask.leaseTime=300
+
