You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/10/04 04:09:33 UTC
svn commit: r293491 - in /incubator/roller/branches/roller_2.0: build.xml
personal/testing/roller-custom.properties personal/testing/roller.properties
tests/org/roller/business/PlanetManagerTest.java
tests/org/roller/business/TestAll.java
Author: snoopdave
Date: Mon Oct 3 19:09:28 2005
New Revision: 293491
URL: http://svn.apache.org/viewcvs?rev=293491&view=rev
Log:
Fixes to planet manager tests
Removed:
incubator/roller/branches/roller_2.0/personal/testing/roller.properties
Modified:
incubator/roller/branches/roller_2.0/build.xml
incubator/roller/branches/roller_2.0/personal/testing/roller-custom.properties
incubator/roller/branches/roller_2.0/tests/org/roller/business/PlanetManagerTest.java
incubator/roller/branches/roller_2.0/tests/org/roller/business/TestAll.java
Modified: incubator/roller/branches/roller_2.0/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/build.xml?rev=293491&r1=293490&r2=293491&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/build.xml (original)
+++ incubator/roller/branches/roller_2.0/build.xml Mon Oct 3 19:09:28 2005
@@ -714,6 +714,7 @@
<mkdir dir="${build.tests}" />
<mkdir dir="${build.tests}/logs" />
+ <mkdir dir="${build.tests}/planet-cache" />
<mkdir dir="${build.tests}/WEB-INF/classes" />
<mkdir dir="${build.tests}/WEB-INF/classes/themes" />
@@ -738,9 +739,12 @@
testing without interfering with the "real" build in ${build.stage_web}
-->
- <copy file="${basedir}/personal/testing/roller.properties"
+ <copy file="${basedir}/web/WEB-INF/classes/roller.properties"
todir="${build.tests}/WEB-INF/classes/"/>
+ <copy file="${basedir}/personal/testing/roller-custom.properties"
+ todir="${build.tests}"/>
+
<copy file="${basedir}/personal/testing/hibernate.cfg.xml"
tofile="${build.tests}/WEB-INF/classes/hibernate.cfg.xml" />
@@ -863,6 +867,7 @@
<jvmarg value="-DrollerImpl=hibernate"/>
<jvmarg value="-Dro.build=${ro.build}"/>
<jvmarg value="-Dcatalina.base=${build.tests}"/> <!-- needed to satisfy ref in log4j.properties -->
+ <jvmarg value="-Droller.custom.config=${build.tests}/roller-custom.properties"/>
<formatter type="xml"/>
<classpath>
<path refid="junit.path"/>
Modified: incubator/roller/branches/roller_2.0/personal/testing/roller-custom.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/personal/testing/roller-custom.properties?rev=293491&r1=293490&r2=293491&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/personal/testing/roller-custom.properties (original)
+++ incubator/roller/branches/roller_2.0/personal/testing/roller-custom.properties Mon Oct 3 19:09:28 2005
@@ -1,5 +1,6 @@
uploads.dir=./build/tests/roller_data/uploads
search.index.dir=./build/tests/roller_data/search-index
+planet.aggregator.cache.dir=./build/tests/planet-cache
# if you are testing planet uncomment these
#persistence.roller.classname=org.roller.business.hibernate.HibernatePlanetRollerImpl
Modified: incubator/roller/branches/roller_2.0/tests/org/roller/business/PlanetManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/business/PlanetManagerTest.java?rev=293491&r1=293490&r2=293491&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/business/PlanetManagerTest.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/business/PlanetManagerTest.java Mon Oct 3 19:09:28 2005
@@ -77,7 +77,7 @@
{ // retrieve config and default group
roller.begin();
PlanetConfigData config = planet.getConfiguration();
- assertEquals("/var/roller/planetcache",config.getCacheDir());
+ assertEquals("./build/tests/planet-cache",config.getCacheDir());
assertEquals("test_title", config.getTitle());
assertEquals("test_admin_email", config.getAdminEmail());
@@ -103,7 +103,6 @@
roller.rollback();
}
}
-
public void testGroupStorage() throws Exception
{
Roller roller = getRoller();
@@ -141,7 +140,6 @@
roller.rollback();
}
}
-
public void testSubscriptionStorage() throws Exception
{
Roller roller = getRoller();
@@ -305,8 +303,8 @@
PlanetGroupData group = planet.getGroup("test_handle");
assertNotNull(group);
- planet.deleteSubscription(sub);
planet.deleteGroup(group);
+ planet.deleteSubscription(sub);
PlanetConfigData config = planet.getConfiguration();
config.remove();
@@ -316,6 +314,7 @@
catch (Exception e)
{
e.printStackTrace();
+ fail();
}
}
public void testAggregations() throws Exception
@@ -384,9 +383,9 @@
List littleag = planet.getAggregation(group, 10);
assertEquals(littleag.size(), count);
+ planet.deleteGroup(group);
planet.deleteSubscription(sub1);
planet.deleteSubscription(sub2);
- planet.deleteGroup(group);
PlanetConfigData config = planet.getConfiguration();
config.remove();
@@ -396,6 +395,7 @@
catch (Exception e)
{
e.printStackTrace();
+ fail();
}
}
public void testSubscriptionCount() throws Exception
@@ -421,11 +421,17 @@
roller.begin();
assertEquals(2, planet.getSubscriptionCount());
roller.rollback();
+
+ roller.begin();
+ planet.getSubscription(feed_url1).remove();
+ planet.getSubscription(feed_url2).remove();
+ roller.commit();
}
}
catch (Exception e)
{
e.printStackTrace();
+ fail();
}
}
/*
Modified: incubator/roller/branches/roller_2.0/tests/org/roller/business/TestAll.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/business/TestAll.java?rev=293491&r1=293490&r2=293491&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/business/TestAll.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/business/TestAll.java Mon Oct 3 19:09:28 2005
@@ -15,15 +15,15 @@
public static Test suite()
{
TestSuite suite = new TestSuite();
- suite.addTest(WebsiteTest.suite());
- suite.addTest(ConfigManagerTest.suite());
- suite.addTest(PermissionsTest.suite());
- suite.addTest(UserManagerTest.suite());
- suite.addTest(WeblogManagerTest.suite());
- suite.addTest(RefererManagerTest.suite());
- suite.addTest(IndexManagerTest.suite());
- suite.addTest(BookmarkManagerTest.suite());
- suite.addTest(FileManagerTest.suite());
+// suite.addTest(WebsiteTest.suite());
+// suite.addTest(ConfigManagerTest.suite());
+// suite.addTest(PermissionsTest.suite());
+// suite.addTest(UserManagerTest.suite());
+// suite.addTest(WeblogManagerTest.suite());
+// suite.addTest(RefererManagerTest.suite());
+// suite.addTest(IndexManagerTest.suite());
+// suite.addTest(BookmarkManagerTest.suite());
+// suite.addTest(FileManagerTest.suite());
suite.addTest(PlanetManagerTest.suite());
return suite;
}