svn commit: r1344687 - in /rave/branches/model_interfaces/rave-components/rave-core/src: main/java/org/apache/rave/portal/model/JpaPerson.java test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java

[mfranklin]

Author: mfranklin
Date: Thu May 31 12:46:06 2012
New Revision: 1344687

URL: http://svn.apache.org/viewvc?rev=1344687&view=rev
Log:
Added AddressConverter test (RAVE-630)

Modified:
    
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
    
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java

Modified: 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java?rev=1344687&r1=1344686&r2=1344687&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
 Thu May 31 12:46:06 2012
@@ -30,6 +30,7 @@ import java.util.List;
  */
 @Entity
 @Table(name = "person")
+@Access(AccessType.FIELD)
 @NamedQueries(value = {
     @NamedQuery(name = JpaPerson.FIND_BY_USERNAME, query = "select p from 
JpaPerson p where p.username like :username"),
     @NamedQuery(name = JpaPerson.FIND_FRIENDS_BY_USERNAME, query = "select 
a.followed from PersonAssociation a where a.follower.username = :username"),

Modified: 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java?rev=1344687&r1=1344686&r2=1344687&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java
 Thu May 31 12:46:06 2012
@@ -1,6 +1,48 @@
 package org.apache.rave.portal.model.conversion;
 
+import org.apache.rave.portal.model.Address;
+import org.apache.rave.portal.model.AddressImpl;
+import org.apache.rave.portal.model.JpaAddress;
+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 static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
+
 /**
  */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:test-dataContext.xml", 
"classpath:test-applicationContext.xml"})
 public class JpaAddressConverterTest {
+
+    @Autowired
+    private JpaAddressConverter addressConverter;
+
+    @Test
+    public void noConversion() {
+        Address address = new JpaAddress();
+        assertThat(addressConverter.convert(address), 
is(sameInstance(address)));
+    }
+
+    @Test
+    public void newAddress() {
+        Address address = new AddressImpl();
+        address.setStreetAddress("1600 Pennsylvania Avenue");
+        address.setLocality("Washington DC");
+        address.setCountry("USA");
+        address.setRegion("Washington DC");
+        address.setPrimary(true);
+
+        JpaAddress converted = addressConverter.convert(address);
+        assertThat(converted, is(not(sameInstance(address))));
+        assertThat(converted, is(instanceOf(JpaAddress.class)));
+        assertThat(converted.getStreetAddress(), 
is(equalTo(address.getStreetAddress())));
+        assertThat(converted.getLocality(), 
is(equalTo(address.getLocality())));
+        assertThat(converted.getCountry(), is(equalTo(address.getCountry())));
+        assertThat(converted.getRegion(), is(equalTo(address.getRegion())));
+        assertThat(converted.getPrimary(), is(true));
+    }
 }