svn commit: r1346091 - in /rave/branches/model_interfaces/rave-components/rave-core/src: main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java

[mf...@apache.org]

Author: mfranklin
Date: Mon Jun  4 19:04:20 2012
New Revision: 1346091

URL: http://svn.apache.org/viewvc?rev=1346091&view=rev
Log:
Added Test for OrganizationConverter (RAVE-625)

Added:
    rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java
      - copied, changed from r1346018, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java
Modified:
    rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java

Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java?rev=1346091&r1=1346090&r2=1346091&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java Mon Jun  4 19:04:20 2012
@@ -27,21 +27,23 @@ public class JpaAddressConverter impleme
 
     @Override
     public JpaAddress convert(Address source) {
-        return source instanceof JpaAddress ? (JpaAddress)source : createEntity(source);
+        return source instanceof JpaAddress ? (JpaAddress) source : createEntity(source);
     }
 
     private JpaAddress createEntity(Address source) {
-        JpaAddress converted;
-        TypedQuery<JpaAddress> query = manager.createNamedQuery(JpaAddress.FIND_BY_STREET_CITY_COUNTRY, JpaAddress.class);
-        query.setParameter(JpaAddress.STREET_PARAM, source.getStreetAddress());
-        query.setParameter(JpaAddress.CITY_PARAM, source.getLocality());
-        query.setParameter(JpaAddress.COUNTRY_PARAM, source.getCountry());
-        converted = getSingleResult(query.getResultList());
+        JpaAddress converted = null;
+        if (source != null) {
+            TypedQuery<JpaAddress> query = manager.createNamedQuery(JpaAddress.FIND_BY_STREET_CITY_COUNTRY, JpaAddress.class);
+            query.setParameter(JpaAddress.STREET_PARAM, source.getStreetAddress());
+            query.setParameter(JpaAddress.CITY_PARAM, source.getLocality());
+            query.setParameter(JpaAddress.COUNTRY_PARAM, source.getCountry());
+            converted = getSingleResult(query.getResultList());
 
-        if(converted == null) {
-            converted = new JpaAddress();
+            if (converted == null) {
+                converted = new JpaAddress();
+            }
+            updateProperties(source, converted);
         }
-        updateProperties(source, converted);
         return converted;
     }
 

Copied: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java (from r1346018, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java&r1=1346018&r2=1346091&rev=1346091&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java Mon Jun  4 19:04:20 2012
@@ -1,7 +1,45 @@
 package org.apache.rave.portal.model.conversion;
 
-/**
- *
- */
-public class JpaPersonConverterTest {
+import org.apache.rave.portal.model.JpaOrganization;
+import org.apache.rave.portal.model.Organization;
+import org.apache.rave.portal.model.impl.OrganizationImpl;
+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 static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:test-applicationContext.xml", "classpath:test-dataContext.xml"})
+public class JpaOrganizationConverterTest {
+
+    @Autowired
+    JpaOrganizationConverter converter;
+
+    @Before
+    public void setup() {
+
+    }
+
+    @Test
+    public void testNoConversion() {
+        JpaOrganization template = new JpaOrganization();
+        assertThat(converter.convert(template), is(sameInstance(template)));
+    }
+
+    @Test
+    public void convertValid() {
+        Organization template = new OrganizationImpl();
+
+        JpaOrganization jpaTemplate = converter.convert(template);
+
+        assertThat(jpaTemplate, is(not(sameInstance(template))));
+        assertThat(jpaTemplate, is(instanceOf(JpaOrganization.class)));
+        //TODO: Add coverage for all methods
+    }
+
 }