You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/19 20:14:10 UTC
svn commit: r1351791 - in /rave/branches/model_interfaces/rave-components:
rave-core/src/main/java/org/apache/rave/portal/model/impl/
rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/
rave-jpa/src/test/java/org/apache/rave/portal/model/co...
Author: mfranklin
Date: Tue Jun 19 18:14:10 2012
New Revision: 1351791
URL: http://svn.apache.org/viewvc?rev=1351791&view=rev
Log:
Updated Portal Preference conversion RAVE-652
Added:
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverterTest.java
- copied, changed from r1349202, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java?rev=1351791&r1=1351790&r2=1351791&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java Tue Jun 19 18:14:10 2012
@@ -11,6 +11,8 @@ public class PortalPreferenceImpl implem
private String key;
private List<String> values = new LinkedList<String>();
+ public PortalPreferenceImpl() {}
+
public PortalPreferenceImpl(String key, List<String> values) {
this.key = key;
this.values = values;
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java?rev=1351791&r1=1351790&r2=1351791&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java Tue Jun 19 18:14:10 2012
@@ -46,6 +46,7 @@ public class JpaPortalPreferenceConverte
}
private void updateProperties(PortalPreference source, JpaPortalPreference converted) {
-
+ converted.setKey(source.getKey());
+ converted.setValues(source.getValues());
}
}
Copied: rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverterTest.java (from r1349202, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverterTest.java?p2=rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverterTest.java&p1=rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java&r1=1349202&r2=1351791&rev=1351791&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverterTest.java Tue Jun 19 18:14:10 2012
@@ -1,8 +1,8 @@
package org.apache.rave.portal.model.conversion;
-import org.apache.rave.portal.model.JpaWidget;
-import org.apache.rave.portal.model.Widget;
-import org.apache.rave.portal.model.impl.WidgetImpl;
+import org.apache.rave.portal.model.JpaPortalPreference;
+import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -15,10 +15,10 @@ import static org.junit.Assert.assertTha
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:test-applicationContext.xml", "classpath:test-dataContext.xml"})
-public class JpaWidgetConverterTest {
+public class JpaPortalPreferenceConverterTest {
@Autowired
- JpaWidgetConverter converter;
+ JpaPortalPreferenceConverter converter;
@Before
public void setup() {
@@ -27,26 +27,29 @@ public class JpaWidgetConverterTest {
@Test
public void testNoConversion() {
- JpaWidget template = new JpaWidget();
+ JpaPortalPreference template = new JpaPortalPreference();
assertThat(converter.convert(template), is(sameInstance(template)));
}
@Test
public void nullConversion() {
- Widget template = null;
+ PortalPreference template = null;
assertThat(converter.convert(template), is(nullValue()));
}
@Test
public void convertValid() {
- Widget template = new WidgetImpl();
+ PortalPreference template = new PortalPreferenceImpl();
+ template.setKey("KEY");
+ template.setValue("VALUE");
- JpaWidget jpaTemplate = converter.convert(template);
+ JpaPortalPreference jpaTemplate = converter.convert(template);
assertThat(jpaTemplate, is(not(sameInstance(template))));
- assertThat(jpaTemplate, is(instanceOf(JpaWidget.class)));
- //TODO: Add coverage for all methods
+ assertThat(jpaTemplate, is(instanceOf(JpaPortalPreference.class)));
+ assertThat(jpaTemplate.getKey(), is(equalTo(template.getKey())));
+ assertThat(jpaTemplate.getValue(), is(equalTo(template.getValue())));
}
}