svn commit: r1351820 - in /rave/branches/model_interfaces/rave-components: rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java

[mf...@apache.org]

Author: mfranklin
Date: Tue Jun 19 19:45:18 2012
New Revision: 1351820

URL: http://svn.apache.org/viewvc?rev=1351820&view=rev
Log:
Updated organization conversion RAVE-652

Modified:
    rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java
    rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java

Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java?rev=1351820&r1=1351819&r2=1351820&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java Tue Jun 19 19:45:18 2012
@@ -17,6 +17,12 @@ public class AddressImpl implements Addr
     private String formatted;
     private Boolean primary;
 
+    public AddressImpl() {  }
+
+    public AddressImpl(String street) {
+        this.streetAddress = street;
+    }
+
     public String getCountry() {
         return country;
     }

Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java?rev=1351820&r1=1351819&r2=1351820&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java Tue Jun 19 19:45:18 2012
@@ -2,6 +2,7 @@ package org.apache.rave.portal.model.con
 
 import org.apache.rave.portal.model.JpaOrganization;
 import org.apache.rave.portal.model.Organization;
+import org.apache.rave.portal.model.impl.AddressImpl;
 import org.apache.rave.portal.model.impl.OrganizationImpl;
 import org.junit.Before;
 import org.junit.Test;
@@ -10,6 +11,8 @@ import org.springframework.beans.factory
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.Date;
+
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
@@ -41,12 +44,33 @@ public class JpaOrganizationConverterTes
     @Test
     public void convertValid() {
         Organization template = new OrganizationImpl();
+        template.setAddress(new AddressImpl("123 Sesame Street"));
+        template.setDescription("TEST_A");
+        template.setEndDate(new Date());
+        template.setField("TEST_B");
+        template.setName("TEST_C");
+        template.setStartDate(new Date());
+        template.setSubField("TEST_D");
+        template.setTitle("TEST_E");
+        template.setWebpage("TEST_F");
+        template.setQualifier("TEST_G");
+        template.setPrimary(true    );
 
         JpaOrganization jpaTemplate = converter.convert(template);
 
         assertThat(jpaTemplate, is(not(sameInstance(template))));
         assertThat(jpaTemplate, is(instanceOf(JpaOrganization.class)));
-        //TODO: Add coverage for all methods
+        assertThat(jpaTemplate.getAddress().getStreetAddress(), is(equalTo(template.getAddress().getStreetAddress())));
+        assertThat(jpaTemplate.getDescription(), is(equalTo(template.getDescription())));
+        assertThat(jpaTemplate.getEndDate(), is(equalTo(template.getEndDate())));
+        assertThat(jpaTemplate.getField(), is(equalTo(template.getField())));
+        assertThat(jpaTemplate.getName(), is(equalTo(template.getName())));
+        assertThat(jpaTemplate.getStartDate(), is(equalTo(template.getStartDate())));
+        assertThat(jpaTemplate.getSubField(), is(equalTo(template.getSubField())));
+        assertThat(jpaTemplate.getTitle(), is(equalTo(template.getTitle())));
+        assertThat(jpaTemplate.getWebpage(), is(equalTo(template.getWebpage())));
+        assertThat(jpaTemplate.getQualifier(), is(equalTo(template.getQualifier())));
+        assertThat(jpaTemplate.getPrimary(), is(equalTo(template.getPrimary())));
     }
 
 }