svn commit: r1351826 - in /rave/branches/model_interfaces/rave-components/rave-jpa/src: main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java

[mf...@apache.org]

Author: mfranklin
Date: Tue Jun 19 20:02:07 2012
New Revision: 1351826

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

Modified:
    rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java
    rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java

Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java?rev=1351826&r1=1351825&r2=1351826&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java Tue Jun 19 20:02:07 2012
@@ -19,8 +19,9 @@
 package org.apache.rave.portal.model.conversion;
 
 import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.JpaAuthority;
 import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.JpaAuthority;
+import org.apache.rave.portal.model.User;
 import org.springframework.stereotype.Component;
 
 import javax.persistence.EntityManager;
@@ -62,5 +63,8 @@ public class JpaAuthorityConverter imple
     private void updateProperties(Authority source, JpaAuthority converted) {
         converted.setDefaultForNewUser(source.isDefaultForNewUser());
         converted.setAuthority(source.getAuthority());
+        for(User user : source.getUsers()) {
+            converted.addUser(user);
+        }
     }
 }

Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java?rev=1351826&r1=1351825&r2=1351826&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java Tue Jun 19 20:02:07 2012
@@ -3,6 +3,7 @@ package org.apache.rave.portal.model.con
 import org.apache.rave.portal.model.JpaAuthority;
 import org.apache.rave.portal.model.Authority;
 import org.apache.rave.portal.model.impl.AuthorityImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,12 +42,18 @@ public class JpaAuthorityConverterTest {
     @Test
     public void convertValid() {
         Authority template = new AuthorityImpl();
+        template.setAuthority("FOO");
+        template.setDefaultForNewUser(true);
+        template.addUser(new UserImpl(42L));
 
         JpaAuthority jpaTemplate = converter.convert(template);
 
         assertThat(jpaTemplate, is(not(sameInstance(template))));
         assertThat(jpaTemplate, is(instanceOf(JpaAuthority.class)));
-        //TODO: Add coverage for all methods
+        assertThat(jpaTemplate.getAuthority(), is(equalTo(template.getAuthority())));
+        assertThat(jpaTemplate.isDefaultForNewUser(), is(equalTo(template.isDefaultForNewUser())));
+        assertThat(jpaTemplate.getUsers().iterator().next().getId(), is(equalTo(template.getUsers().iterator().next().getId())));
+
     }
 
 }