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 2007/03/05 20:29:53 UTC
svn commit: r514828 - in
/incubator/roller/branches/roller_4.0_newbackend/apps/planet:
src/java/org/apache/roller/planet/business/datamapper/
src/java/org/apache/roller/planet/business/jpa/
test/java/org/apache/roller/planet/business/
Author: snoopdave
Date: Mon Mar 5 11:29:52 2007
New Revision: 514828
URL: http://svn.apache.org/viewvc?view=rev&rev=514828
Log:
Merging changes from trunk, adjusting JPA implementation accordingly
Modified:
incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/GroupTest.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java?view=diff&rev=514828&r1=514827&r2=514828
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java Mon Mar 5 11:29:52 2007
@@ -173,7 +173,7 @@
public List getGroups() throws RollerException {
return (List) strategy.newQuery(PlanetGroupData.class,
- "PlanetGroupData.getWithPlanetNull").execute();
+ "PlanetGroupData.getAll").execute();
}
public List getGroupHandles() throws RollerException {
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?view=diff&rev=514828&r1=514827&r2=514828
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java Mon Mar 5 11:29:52 2007
@@ -181,7 +181,7 @@
public List getGroups() throws RollerException {
return strategy.getNamedQuery(
- "PlanetGroupData.getWithPlanetNull").getResultList();
+ "PlanetGroupData.getAll").getResultList();
}
public List getGroupHandles() throws RollerException {
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/GroupTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/GroupTest.java?view=diff&rev=514828&r1=514827&r2=514828
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/GroupTest.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/GroupTest.java Mon Mar 5 11:29:52 2007
@@ -95,6 +95,7 @@
testGroup2.setDescription("group2");
testGroup2.setHandle("test_group2");
testGroup2.setTitle("test_group2");
+ testGroup2.setPlanet(testPlanet);
PlanetGroupData group = null;
List groups = null;
@@ -104,31 +105,27 @@
mgr.saveGroup(testGroup2);
TestUtils.endSession(true);
- // lookup groups not in a planet
+ // lookup all grous
groups = mgr.getGroups();
assertNotNull(groups);
- assertEquals(1, groups.size());
- assertTrue("test_group2".equals(((PlanetGroupData)groups.get(0)).getHandle()));
+ assertEquals(2, groups.size());
// lookup groups in test planet
groups = mgr.getGroups(testPlanet);
assertNotNull(groups);
- assertEquals(1, groups.size());
- assertTrue("test_group1".equals(((PlanetGroupData)groups.get(0)).getHandle()));
+ assertEquals(2, groups.size());
- // lookup group handles not in a planet
+ // lookup all group handles
groups = null;
groups = mgr.getGroupHandles();
assertNotNull(groups);
- assertEquals(1, groups.size());
- assertTrue("test_group2".equals(((String)groups.get(0))));
+ assertEquals(2, groups.size());
// lookup group handles in test planet
groups = null;
groups = mgr.getGroupHandles(testPlanet);
assertNotNull(groups);
- assertEquals(1, groups.size());
- assertTrue("test_group1".equals(((String)groups.get(0))));
+ assertEquals(2, groups.size());
// lookup group by id
group = null;
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java?view=diff&rev=514828&r1=514827&r2=514828
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java Mon Mar 5 11:29:52 2007
@@ -43,22 +43,11 @@
public class PlanetManagerTest extends TestCase {
public static Log log = LogFactory.getLog(PlanetManagerTest.class);
- private PlanetData testPlanet = null;
- private PlanetData testPlanet = null;
-
+ private PlanetData testPlanet = null;
protected void setUp() throws Exception {
testPlanet = TestUtils.setupPlanet("groupTestPlanet");
- }
-
- protected void tearDown() throws Exception {
- TestUtils.teardownPlanet(testPlanet.getId());
- }
-
- protected void setUp() throws Exception {
- testPlanet = TestUtils.setupPlanet("groupTestPlanet");
- }
-
+ }
protected void tearDown() throws Exception {
TestUtils.teardownPlanet(testPlanet.getId());