You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2012/05/31 18:09:20 UTC
svn commit: r1344794 - in
/rave/branches/model_interfaces/rave-components/rave-core/src:
main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java
test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
Author: cgeer
Date: Thu May 31 16:09:19 2012
New Revision: 1344794
URL: http://svn.apache.org/viewvc?rev=1344794&view=rev
Log:
RAVE-635 Updated unit test for converter.
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java?rev=1344794&r1=1344793&r2=1344794&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java Thu May 31 16:09:19 2012
@@ -21,6 +21,7 @@ package org.apache.rave.portal.model.con
import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.Group;
import org.apache.rave.portal.model.JpaGroup;
+import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -29,6 +30,7 @@ import java.util.List;
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
+@Component
public class JpaGroupConverter implements ModelConverter<Group, JpaGroup> {
@PersistenceContext
private EntityManager manager;
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java?rev=1344794&r1=1344793&r2=1344794&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java Thu May 31 16:09:19 2012
@@ -18,58 +18,73 @@
*/
package org.apache.rave.portal.model.conversion;
+import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import org.apache.rave.portal.model.*;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
import java.util.ArrayList;
import java.util.List;
-//@RunWith(SpringJUnit4ClassRunner.class)
-//@ContextConfiguration(locations={"classpath:test-applicationContext.xml","classpath:test-dataContext.xml"} )
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations={"classpath:test-applicationContext.xml","classpath:test-dataContext.xml"} )
public class JpaGroupConverterTest {
-// private Group group;
-//
-// private String description = "Test Group";
-// private Long entityId = Long.valueOf(400);
-// private String title = "GroupTitle";
-// private Person owner = null;
-// private List<Person> members = null;
-//
-// private String ownerDisplayName = "Bob";
-// private String ownerGivenName = "Smith";
-//
-// public void setup() {
-// members = new ArrayList<Person>();
-// owner = new PersonImpl();
-// owner.setDisplayName(ownerDisplayName);
-// owner.setGivenName(ownerGivenName);
-// members.add(owner);
-//
-// group = new GroupImpl();
-// group.setDescription(description);
-// group.setEntityId(entityId);
-// group.setTitle(title);
-// group.setOwner(owner);
-// group.setMembers(members);
-// }
-//
-// @Test
-// public void testConvertGroupToJpaGroup() {
-// JpaGroupConverter converter = new JpaGroupConverter();
-//
-// JpaGroup jpaGroup = converter.convert(group);
-//
-// assertEquals(description, jpaGroup.getDescription());
-// assertEquals(entityId, jpaGroup.getEntityId());
-// assertEquals(title, jpaGroup.getTitle());
-// assertEquals(owner, jpaGroup.getOwner());
-// assertEquals(members.size(), jpaGroup.getMembers().size());
-// }
+ @Autowired
+ JpaGroupConverter converter;
+
+ private Group group;
+
+ private String description = "Test Group";
+ private Long entityId = Long.valueOf(400);
+ private String title = "GroupTitle";
+ private Person owner = null;
+ private List<Person> members = null;
+
+ private String ownerDisplayName = "Bob";
+ private String ownerGivenName = "Smith";
+
+ @Before
+ public void setup() {
+ members = new ArrayList<Person>();
+ owner = new PersonImpl();
+ owner.setDisplayName(ownerDisplayName);
+ owner.setGivenName(ownerGivenName);
+ members.add(owner);
+
+ group = new GroupImpl();
+ group.setDescription(description);
+ group.setEntityId(entityId);
+ group.setTitle(title);
+ group.setOwner(owner);
+ group.setMembers(members);
+ }
+
+ @Test
+ public void testNoConversion() {
+ JpaGroup group = new JpaGroup();
+ assertThat(converter.convert(group), is(sameInstance(group)));
+ }
+
+ @Test
+ public void testConvertGroupToJpaGroup() {
+ JpaGroup jpaGroup = converter.convert(group);
+
+ assertThat(jpaGroup, is(not(sameInstance(group))));
+ assertThat(jpaGroup, is(instanceOf(JpaGroup.class)));
+ assertEquals(description, jpaGroup.getDescription());
+ assertEquals(entityId, jpaGroup.getEntityId());
+ assertEquals(title, jpaGroup.getTitle());
+ assertEquals(owner, jpaGroup.getOwner());
+ assertEquals(members.size(), jpaGroup.getMembers().size());
+ }
}