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/23 18:04:46 UTC
svn commit: r1353154 - in
/rave/branches/model_interfaces/rave-components/rave-jpa/src:
main/java/org/apache/rave/portal/model/conversion/
test/java/org/apache/rave/portal/model/
Author: mfranklin
Date: Sat Jun 23 16:04:45 2012
New Revision: 1353154
URL: http://svn.apache.org/viewvc?rev=1353154&view=rev
Log:
made constructor for JpaConverter package private RAVE-689
Modified:
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaConverter.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaConverter.java?rev=1353154&r1=1353153&r2=1353154&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaConverter.java Sat Jun 23 16:04:45 2012
@@ -2,7 +2,6 @@ package org.apache.rave.portal.model.con
import org.apache.rave.model.ModelConverter;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
import java.util.HashMap;
@@ -22,7 +21,7 @@ public class JpaConverter {
Map<Class<?>, ModelConverter> converterMap;
@Autowired
- public JpaConverter(List<ModelConverter> converters) {
+ JpaConverter(List<ModelConverter> converters) {
converterMap = new HashMap<Class<?>, ModelConverter>();
for(ModelConverter converter : converters) {
converterMap.put(converter.getSourceType(), converter);
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java?rev=1353154&r1=1353153&r2=1353154&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java Sat Jun 23 16:04:45 2012
@@ -15,20 +15,13 @@
*/
package org.apache.rave.portal.model;
-import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.conversion.JpaConverter;
-import org.apache.rave.portal.model.impl.AddressImpl;
-import org.apache.rave.portal.model.impl.PersonImpl;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.List;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
/**
*
@@ -45,24 +38,6 @@ public class WidgetTagTest {
@Before
public void setUp() {
- ModelConverter personConverter = createMock(ModelConverter.class);
- expect(personConverter.getSourceType()).andReturn(Person.class).anyTimes();
- expect(personConverter.convert(isA(PersonImpl.class))).andReturn(new JpaPerson());
- replay(personConverter);
-
- ModelConverter addressConverter = createMock(ModelConverter.class);
- expect(addressConverter.getSourceType()).andReturn(Address.class).anyTimes();
- expect(addressConverter.convert(isA(AddressImpl.class))).andReturn(new JpaAddress());
- replay(addressConverter);
-
- ModelConverter pageLayoutConverter = createMock(ModelConverter.class);
- expect(pageLayoutConverter.getSourceType()).andReturn(Address.class).anyTimes();
- expect(pageLayoutConverter.convert(isA(PageLayout.class))).andReturn(new JpaPageLayout());
- replay(pageLayoutConverter);
- List<ModelConverter> converters = new ArrayList<ModelConverter>();
- converters.add(personConverter);
- converters.add(addressConverter);
- new JpaConverter(converters);
widgetTag = new JpaWidgetTag();
widgetTag.setEntityId(VALID_ENTITY_ID);
widgetTag.setWidgetId(VALID_WIDGET_ID);
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java?rev=1353154&r1=1353153&r2=1353154&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java Sat Jun 23 16:04:45 2012
@@ -19,10 +19,6 @@
package org.apache.rave.portal.model;
-import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.conversion.JpaConverter;
-import org.apache.rave.portal.model.impl.AddressImpl;
-import org.apache.rave.portal.model.impl.PersonImpl;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -33,7 +29,6 @@ import java.util.Date;
import java.util.List;
import static junit.framework.Assert.assertEquals;
-import static org.easymock.EasyMock.*;
/**
* Test for {@link JpaWidget}
@@ -56,24 +51,6 @@ public class WidgetTest {
@Before
public void setUp() throws Exception {
- ModelConverter personConverter = createMock(ModelConverter.class);
- expect(personConverter.getSourceType()).andReturn(Person.class).anyTimes();
- expect(personConverter.convert(isA(PersonImpl.class))).andReturn(new JpaPerson());
- replay(personConverter);
-
- ModelConverter addressConverter = createMock(ModelConverter.class);
- expect(addressConverter.getSourceType()).andReturn(Address.class).anyTimes();
- expect(addressConverter.convert(isA(AddressImpl.class))).andReturn(new JpaAddress());
- replay(addressConverter);
-
- ModelConverter pageLayoutConverter = createMock(ModelConverter.class);
- expect(pageLayoutConverter.getSourceType()).andReturn(Address.class).anyTimes();
- expect(pageLayoutConverter.convert(isA(PageLayout.class))).andReturn(new JpaPageLayout());
- replay(pageLayoutConverter);
- List<ModelConverter> converters = new ArrayList<ModelConverter>();
- converters.add(personConverter);
- converters.add(addressConverter);
- new JpaConverter(converters);
widget = new JpaWidget();
id = 3511L;
title = "Test Widget";