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/11 11:33:00 UTC
svn commit: r1348769 - in /rave/branches/model_interfaces:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/
rave-components/rave-core/src/main/java/or...
Author: mfranklin
Date: Mon Jun 11 09:32:59 2012
New Revision: 1348769
URL: http://svn.apache.org/viewvc?rev=1348769&view=rev
Log:
Refactored RegionWidgetPreference RAVE-663
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java
- copied, changed from r1348733, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java
- copied, changed from r1348733, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java
- copied, changed from r1348733, rave/branches/model_interfaces/rave-components/rave-core/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/JpaCategory.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaCategory.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaCategory.java?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaCategory.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaCategory.java Mon Jun 11 09:32:59 2012
@@ -162,9 +162,8 @@ public class JpaCategory implements Basi
@JsonIgnore
@Override
- @SuppressWarnings("unchecked")
public List<Widget> getWidgets() {
- return ConvertingListProxyFactory.createProxyList(JpaWidget.class, widgets);
+ return ConvertingListProxyFactory.createProxyList(Widget.class, widgets);
}
@Override
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java Mon Jun 11 09:32:59 2012
@@ -235,7 +235,6 @@ public class JpaPerson implements BasicE
}
@Override
- @SuppressWarnings("unchecked")
public List<Address> getAddresses() {
return ConvertingListProxyFactory.createProxyList(Address.class, addresses);
}
@@ -252,7 +251,6 @@ public class JpaPerson implements BasicE
}
@Override
- @SuppressWarnings("unchecked")
public List<PersonProperty> getProperties() {
return ConvertingListProxyFactory.createProxyList(PersonProperty.class, this.properties);
}
@@ -269,7 +267,6 @@ public class JpaPerson implements BasicE
}
@Override
- @SuppressWarnings("unchecked")
public List<Person> getFriends() {
return ConvertingListProxyFactory.createProxyList(Person.class, friends);
}
@@ -287,7 +284,6 @@ public class JpaPerson implements BasicE
}
@Override
- @SuppressWarnings("unchecked")
public List<Organization> getOrganizations() {
return ConvertingListProxyFactory.createProxyList(Organization.class, organizations);
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java Mon Jun 11 09:32:59 2012
@@ -19,11 +19,13 @@
package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
+import org.apache.rave.portal.model.conversion.ConvertingListProxyFactory;
import org.apache.rave.portal.model.conversion.JpaConverter;
import org.codehaus.jackson.annotate.JsonBackReference;
import javax.persistence.*;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -78,7 +80,7 @@ public class JpaRegionWidget implements
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name = "region_widget_id", referencedColumnName = "entity_id")
- private List<RegionWidgetPreference> preferences;
+ private List<JpaRegionWidgetPreference> preferences;
@Basic(optional = false)
@Column(name = "locked")
@@ -220,12 +222,18 @@ public class JpaRegionWidget implements
*/
@Override
public List<RegionWidgetPreference> getPreferences() {
- return preferences;
+ return ConvertingListProxyFactory.createProxyList(RegionWidgetPreference.class, preferences);
}
@Override
public void setPreferences(List<RegionWidgetPreference> preferences) {
- this.preferences = preferences;
+ if(this.preferences == null) {
+ this.preferences = new ArrayList<JpaRegionWidgetPreference>();
+ }
+ this.getPreferences().clear();
+ if(preferences != null) {
+ this.getPreferences().addAll(preferences);
+ }
}
@Override
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java (from r1348733, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java&r1=1348733&r2=1348769&rev=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java Mon Jun 11 09:32:59 2012
@@ -31,8 +31,16 @@ import java.io.Serializable;
@Entity
@Access(AccessType.FIELD)
@Table(name = "region_widget_preference")
+@NamedQueries(value = {
+ @NamedQuery(name = JpaRegionWidgetPreference.FIND_BY_REGION_WIDGET_AND_NAME, query = "select p from JpaRegionWidgetPreference p where p.regionWidgetId = :widgetId and p.name = :name")
+})
@XmlRootElement
-public class RegionWidgetPreference implements BasicEntity, Serializable {
+public class JpaRegionWidgetPreference implements BasicEntity, Serializable, RegionWidgetPreference {
+
+ public static final String FIND_BY_REGION_WIDGET_AND_NAME = "JpaRegionWidgetPreference.findByRegionWidgetAndName";
+ public static final String NAME_PARAM = "name";
+ public static final String REGION_WIDGET_ID = "widgetId";
+
private static final long serialVersionUID = 1L;
@Id
@@ -54,10 +62,10 @@ public class RegionWidgetPreference impl
@Column(name = "value")
private String value;
- public RegionWidgetPreference() {
+ public JpaRegionWidgetPreference() {
}
- public RegionWidgetPreference(Long entityId, Long regionWidgetId, String name, String value) {
+ public JpaRegionWidgetPreference(Long entityId, Long regionWidgetId, String name, String value) {
this.entityId = entityId;
this.regionWidgetId = regionWidgetId;
this.name = name;
@@ -79,40 +87,32 @@ public class RegionWidgetPreference impl
this.entityId = entityId;
}
- /**
- * Gets the ID of the RegionWidget this preference is for
- * @return The ID of the RegionWidget this preference is for
- */
+ @Override
public Long getRegionWidgetId() {
return regionWidgetId;
}
+ @Override
public void setRegionWidgetId(Long regionWidgetId) {
this.regionWidgetId = regionWidgetId;
}
- /**
- * Gets the name of the preference
- *
- * @return The name of the preference
- */
+ @Override
public String getName() {
return name;
}
+ @Override
public void setName(String name) {
this.name = name;
}
- /**
- * Gets the value of this preference
- *
- * @return The value of this preference
- */
+ @Override
public String getValue() {
return value;
}
+ @Override
public void setValue(String value) {
this.value = value;
}
@@ -125,7 +125,7 @@ public class RegionWidgetPreference impl
if (getClass() != obj.getClass()) {
return false;
}
- final RegionWidgetPreference other = (RegionWidgetPreference) obj;
+ final JpaRegionWidgetPreference other = (JpaRegionWidgetPreference) obj;
if (this.entityId != other.entityId && (this.entityId == null || !this.entityId.equals(other.entityId))) {
return false;
}
Added: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java?rev=1348769&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java Mon Jun 11 09:32:59 2012
@@ -0,0 +1,29 @@
+package org.apache.rave.portal.model;
+
+public interface RegionWidgetPreference {
+ /**
+ * Gets the ID of the RegionWidget this preference is for
+ * @return The ID of the RegionWidget this preference is for
+ */
+ Long getRegionWidgetId();
+
+ void setRegionWidgetId(Long regionWidgetId);
+
+ /**
+ * Gets the name of the preference
+ *
+ * @return The name of the preference
+ */
+ String getName();
+
+ void setName(String name);
+
+ /**
+ * Gets the value of this preference
+ *
+ * @return The value of this preference
+ */
+ String getValue();
+
+ void setValue(String value);
+}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java Mon Jun 11 09:32:59 2012
@@ -15,7 +15,7 @@ import java.util.List;
public class ConvertingListProxyFactory {
@SuppressWarnings("unchecked")
- public static <E, T extends E> List createProxyList(Class<E> targetType, List<T> underlyingList) {
+ public static <E, T extends E> List<E> createProxyList(Class<E> targetType, List<T> underlyingList) {
// ensure the list is not null by creating an empty list to prevent unnecessary downstream NullPointerExceptions
if (underlyingList == null) {
underlyingList = new ArrayList<T>();
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java (from r1348733, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java&r1=1348733&r2=1348769&rev=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java Mon Jun 11 09:32:59 2012
@@ -19,8 +19,8 @@
package org.apache.rave.portal.model.conversion;
import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.Group;
-import org.apache.rave.portal.model.JpaGroup;
+import org.apache.rave.portal.model.JpaRegionWidgetPreference;
+import org.apache.rave.portal.model.RegionWidgetPreference;
import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
@@ -30,39 +30,39 @@ import javax.persistence.TypedQuery;
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
@Component
-public class JpaGroupConverter implements ModelConverter<Group, JpaGroup> {
+public class JpaRegionWidgetPreferenceConverter implements ModelConverter<RegionWidgetPreference, JpaRegionWidgetPreference> {
@PersistenceContext
private EntityManager manager;
@Override
- public Class<Group> getSourceType() {
- return Group.class;
+ public Class<RegionWidgetPreference> getSourceType() {
+ return RegionWidgetPreference.class;
}
@Override
- public JpaGroup convert(Group source) {
- return source instanceof JpaGroup ? (JpaGroup) source : createEntity(source);
+ public JpaRegionWidgetPreference convert(RegionWidgetPreference source) {
+ return source instanceof JpaRegionWidgetPreference ? (JpaRegionWidgetPreference) source : createEntity(source);
}
- private JpaGroup createEntity(Group source) {
- JpaGroup converted = null;
+ private JpaRegionWidgetPreference createEntity(RegionWidgetPreference source) {
+ JpaRegionWidgetPreference converted = null;
if (source != null) {
- TypedQuery<JpaGroup> query = manager.createNamedQuery(JpaGroup.FIND_BY_TITLE, JpaGroup.class);
- query.setParameter(JpaGroup.GROUP_ID_PARAM, source.getTitle());
+ TypedQuery<JpaRegionWidgetPreference> query = manager.createNamedQuery(JpaRegionWidgetPreference.FIND_BY_REGION_WIDGET_AND_NAME, JpaRegionWidgetPreference.class);
+ query.setParameter(JpaRegionWidgetPreference.NAME_PARAM, source.getName());
+ query.setParameter(JpaRegionWidgetPreference.REGION_WIDGET_ID, source.getRegionWidgetId());
converted = getSingleResult(query.getResultList());
if (converted == null) {
- converted = new JpaGroup();
+ converted = new JpaRegionWidgetPreference();
}
updateProperties(source, converted);
}
return converted;
}
- private void updateProperties(Group source, JpaGroup converted) {
- converted.setDescription(source.getDescription());
- converted.setTitle(source.getTitle());
- converted.setOwner(source.getOwner());
- converted.setMembers(source.getMembers());
+ private void updateProperties(RegionWidgetPreference source, JpaRegionWidgetPreference converted) {
+ converted.setName(source.getName());
+ converted.setRegionWidgetId(source.getRegionWidgetId());
+ converted.setValue(source.getValue());
}
}
Added: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java?rev=1348769&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java Mon Jun 11 09:32:59 2012
@@ -0,0 +1,66 @@
+package org.apache.rave.portal.model.impl;
+
+
+import org.apache.rave.portal.model.RegionWidgetPreference;
+
+public class RegionWidgetPreferenceImpl implements RegionWidgetPreference {
+
+ private Long regionWidgetId;
+ private String name;
+ private String value;
+
+ public RegionWidgetPreferenceImpl() { }
+
+ public RegionWidgetPreferenceImpl(Long regionWidgetId, String name, String value) {
+ this.regionWidgetId = regionWidgetId;
+ this.name = name;
+ this.value = value;
+ }
+
+ public Long getRegionWidgetId() {
+ return regionWidgetId;
+ }
+
+ public void setRegionWidgetId(Long regionWidgetId) {
+ this.regionWidgetId = regionWidgetId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof RegionWidgetPreferenceImpl)) return false;
+
+ RegionWidgetPreferenceImpl that = (RegionWidgetPreferenceImpl) o;
+
+ if (name != null ? !name.equals(that.name) : that.name != null) return false;
+ if (regionWidgetId != null ? !regionWidgetId.equals(that.regionWidgetId) : that.regionWidgetId != null)
+ return false;
+ if (value != null ? !value.equals(that.value) : that.value != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = regionWidgetId != null ? regionWidgetId.hashCode() : 0;
+ result = 31 * result + (name != null ? name.hashCode() : 0);
+ result = 31 * result + (value != null ? value.hashCode() : 0);
+ return result;
+ }
+}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml Mon Jun 11 09:32:59 2012
@@ -27,7 +27,7 @@
<class>org.apache.rave.portal.model.JpaRegion</class>
<class>org.apache.rave.portal.model.User</class>
<class>org.apache.rave.portal.model.JpaRegionWidget</class>
- <class>org.apache.rave.portal.model.RegionWidgetPreference</class>
+ <class>org.apache.rave.portal.model.JpaRegionWidgetPreference</class>
<class>org.apache.rave.portal.model.JpaWidget</class>
<class>org.apache.rave.portal.model.JpaWidgetComment</class>
<class>org.apache.rave.portal.model.JpaWidgetRating</class>
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java (from r1348733, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java&r1=1348733&r2=1348769&rev=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java Mon Jun 11 09:32:59 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.JpaRegionWidgetPreference;
+import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
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 JpaRegionWidgetPreferenceConverterTest {
@Autowired
- JpaWidgetConverter converter;
+ JpaRegionWidgetPreferenceConverter converter;
@Before
public void setup() {
@@ -27,25 +27,25 @@ public class JpaWidgetConverterTest {
@Test
public void testNoConversion() {
- JpaWidget template = new JpaWidget();
+ JpaRegionWidgetPreference template = new JpaRegionWidgetPreference();
assertThat(converter.convert(template), is(sameInstance(template)));
}
@Test
public void nullConversion() {
- Widget template = null;
+ RegionWidgetPreference template = null;
assertThat(converter.convert(template), is(nullValue()));
}
@Test
public void convertValid() {
- Widget template = new WidgetImpl();
+ RegionWidgetPreference template = new RegionWidgetPreferenceImpl();
- JpaWidget jpaTemplate = converter.convert(template);
+ JpaRegionWidgetPreference jpaTemplate = converter.convert(template);
assertThat(jpaTemplate, is(not(sameInstance(template))));
- assertThat(jpaTemplate, is(instanceOf(JpaWidget.class)));
+ assertThat(jpaTemplate, is(instanceOf(JpaRegionWidgetPreference.class)));
//TODO: Add coverage for all methods
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java Mon Jun 11 09:32:59 2012
@@ -19,7 +19,9 @@
package org.apache.rave.portal.model.util;
+import org.apache.rave.portal.model.JpaRegionWidgetPreference;
import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
import org.junit.Test;
import java.util.Arrays;
@@ -32,7 +34,7 @@ public class ModelUtilsTest {
@Test
public void normalizeRegionWidgetPreference() {
- RegionWidgetPreference testPreference = new RegionWidgetPreference(null, null, "camelCaseName", "FOO");
+ RegionWidgetPreference testPreference = new JpaRegionWidgetPreference(null, null, "camelCaseName", "FOO");
ModelUtils.normalizeRegionWidgetPreference(VALID_REGION_WIDGET_ID, testPreference);
assertTrue(testPreference.getRegionWidgetId() == VALID_REGION_WIDGET_ID);
@@ -48,8 +50,8 @@ public class ModelUtilsTest {
}
public List<RegionWidgetPreference> getTestRegionWidgetPreferences() {
- return Arrays.asList(new RegionWidgetPreference(null, null, "camelCaseName", "FOO"),
- new RegionWidgetPreference(null, 20L, "lowercasename", "FOO"),
- new RegionWidgetPreference(null, -100L, "UPPERCASENAME", "FOO"));
+ return Arrays.asList((RegionWidgetPreference)new RegionWidgetPreferenceImpl( null, "camelCaseName", "FOO"),
+ (RegionWidgetPreference)new RegionWidgetPreferenceImpl(20L, "lowercasename", "FOO"),
+ (RegionWidgetPreference)new RegionWidgetPreferenceImpl( -100L, "UPPERCASENAME", "FOO"));
}
}
\ No newline at end of file
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java Mon Jun 11 09:32:59 2012
@@ -20,8 +20,10 @@
package org.apache.rave.portal.repository.impl;
import org.apache.rave.portal.model.JpaRegionWidget;
+import org.apache.rave.portal.model.JpaRegionWidgetPreference;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,13 +36,7 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import java.util.ArrayList;
-import org.apache.rave.portal.repository.RegionWidgetRepository;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
@Transactional
@@ -101,7 +97,7 @@ public class JpaRegionWidgetRepositoryTe
public void save_cascadePersist() {
RegionWidget regionWidget = new JpaRegionWidget();
regionWidget.setPreferences(new ArrayList<RegionWidgetPreference>());
- RegionWidgetPreference regionWidgetPreference = new RegionWidgetPreference(null, null, VALID_PREFERENCE_NAME,
+ RegionWidgetPreference regionWidgetPreference = new JpaRegionWidgetPreference(null, null, VALID_PREFERENCE_NAME,
VALID_PREFERENCE_VALUE);
regionWidget.getPreferences().add(regionWidgetPreference);
@@ -109,7 +105,7 @@ public class JpaRegionWidgetRepositoryTe
manager.flush();
assertThat(saved.getPreferences().size(), is(equalTo(1)));
- RegionWidgetPreference actual = saved.getPreferences().get(0);
+ JpaRegionWidgetPreference actual = (JpaRegionWidgetPreference)saved.getPreferences().get(0);
assertThat(actual, is(sameInstance(regionWidgetPreference)));
assertThat(actual.getEntityId(), is(notNullValue()));
@@ -123,7 +119,7 @@ public class JpaRegionWidgetRepositoryTe
RegionWidget regionWidget = new JpaRegionWidget();
regionWidget.setId(VALID_REGION_WIDGET_ID);
regionWidget.setPreferences(new ArrayList<RegionWidgetPreference>());
- RegionWidgetPreference regionWidgetPreference = new RegionWidgetPreference(VALID_PREFERENCE_ID,
+ JpaRegionWidgetPreference regionWidgetPreference = new JpaRegionWidgetPreference(VALID_PREFERENCE_ID,
VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME, VALID_PREFERENCE_VALUE);
regionWidget.getPreferences().add(regionWidgetPreference);
@@ -131,7 +127,7 @@ public class JpaRegionWidgetRepositoryTe
manager.flush();
assertThat(saved.getPreferences().size(), is(equalTo(1)));
- RegionWidgetPreference actual = saved.getPreferences().get(0);
+ JpaRegionWidgetPreference actual = (JpaRegionWidgetPreference)saved.getPreferences().get(0);
assertThat(actual, is(not(sameInstance(regionWidgetPreference))));
assertThat(actual.getEntityId(), is(equalTo(regionWidgetPreference.getEntityId())));
@@ -147,7 +143,7 @@ public class JpaRegionWidgetRepositoryTe
RegionWidget saved = repository.save(regionWidget);
manager.flush();
- RegionWidgetPreference preference = manager.find(RegionWidgetPreference.class, VALID_PREFERENCE_ID);
+ RegionWidgetPreference preference = manager.find(JpaRegionWidgetPreference.class, VALID_PREFERENCE_ID);
assertThat(saved.getPreferences().size(), is(equalTo(0)));
assertThat(preference, is(nullValue()));
@@ -155,12 +151,12 @@ public class JpaRegionWidgetRepositoryTe
private long addPreferenceToRegionWidget(long validRegionWidgetId) {
RegionWidget regionWidget = repository.get(validRegionWidgetId);
- RegionWidgetPreference regionWidgetPreference = new RegionWidgetPreference(null, validRegionWidgetId,
+ RegionWidgetPreference regionWidgetPreference = new JpaRegionWidgetPreference(null, validRegionWidgetId,
VALID_PREFERENCE_NAME, VALID_PREFERENCE_VALUE);
regionWidget.getPreferences().add(regionWidgetPreference);
RegionWidget saved = repository.save(regionWidget);
manager.flush();
- return saved.getPreferences().get(0).getEntityId();
+ return ((JpaRegionWidgetPreference)saved.getPreferences().get(0)).getEntityId();
}
}
\ No newline at end of file
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java Mon Jun 11 09:32:59 2012
@@ -21,11 +21,11 @@ package org.apache.rave.portal.service.i
import org.apache.commons.lang.StringUtils;
import org.apache.rave.portal.model.JpaRegionWidget;
+import org.apache.rave.portal.model.JpaRegionWidgetPreference;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.RegionWidgetPreference;
import org.apache.rave.portal.repository.RegionWidgetRepository;
-import org.apache.rave.portal.service.impl.DefaultRegionWidgetService;
-import static org.hamcrest.CoreMatchers.*;
+import org.apache.rave.portal.service.RegionWidgetService;
import org.junit.Before;
import org.junit.Test;
@@ -34,8 +34,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.rave.portal.service.RegionWidgetService;
import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -106,9 +106,9 @@ public class DefaultRegionWidgetServiceT
replay(regionWidgetRepository);
//Add and update a preference.
- RegionWidgetPreference newPreference = new RegionWidgetPreference(null, null, "age", "30");
+ RegionWidgetPreference newPreference = new JpaRegionWidgetPreference(null, null, "age", "30");
RegionWidgetPreference savedNewPreference = regionWidgetService.saveRegionWidgetPreference(VALID_REGION_WIDGET_ID, newPreference);
- RegionWidgetPreference updatedPreference = new RegionWidgetPreference(null, null, "color", "purple");
+ RegionWidgetPreference updatedPreference = new JpaRegionWidgetPreference(null, null, "color", "purple");
RegionWidgetPreference savedUpdatedPreference = regionWidgetService.saveRegionWidgetPreference(VALID_REGION_WIDGET_ID, updatedPreference);
//Make sure the new and updated preference got mixed in properly with the existing preferences.
@@ -180,8 +180,8 @@ public class DefaultRegionWidgetServiceT
private List<RegionWidgetPreference> getTestExistingRegionWidgetPreferences() {
ArrayList<RegionWidgetPreference> regionWidgetPreferences = new ArrayList<RegionWidgetPreference>();
- regionWidgetPreferences.add(new RegionWidgetPreference(1L, VALID_REGION_WIDGET_ID, "color", "blue"));
- regionWidgetPreferences.add(new RegionWidgetPreference(2L, VALID_REGION_WIDGET_ID, "speed", "fast"));
+ regionWidgetPreferences.add(new JpaRegionWidgetPreference(1L, VALID_REGION_WIDGET_ID, "color", "blue"));
+ regionWidgetPreferences.add(new JpaRegionWidgetPreference(2L, VALID_REGION_WIDGET_ID, "speed", "fast"));
return regionWidgetPreferences;
}
@@ -189,7 +189,7 @@ public class DefaultRegionWidgetServiceT
List<RegionWidgetPreference> regionWidgetPreferences = getTestExistingRegionWidgetPreferences();
regionWidgetPreferences.remove(0);
regionWidgetPreferences.get(0).setValue("slow");
- regionWidgetPreferences.add(new RegionWidgetPreference(null, VALID_REGION_WIDGET_ID, "size", "small"));
+ regionWidgetPreferences.add(new JpaRegionWidgetPreference(null, VALID_REGION_WIDGET_ID, "size", "small"));
return regionWidgetPreferences;
}
}
\ No newline at end of file
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java Mon Jun 11 09:32:59 2012
@@ -19,16 +19,12 @@
package org.apache.rave.portal.web.api.rest;
import org.apache.rave.portal.model.impl.*;
-import org.junit.Ignore;
import org.apache.rave.portal.model.*;
-import org.junit.runner.RunWith;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.MockHttpServletResponse;
import org.apache.rave.portal.service.PageService;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.ArrayList;
@@ -73,7 +69,7 @@ public class PageApiTest {
region.setRegionWidgets(new ArrayList<RegionWidget>());
RegionWidget w = new RegionWidgetImpl();
w.setPreferences(new ArrayList<RegionWidgetPreference>());
- w.getPreferences().add(new RegionWidgetPreference());
+ w.getPreferences().add(new JpaRegionWidgetPreference());
region.getRegionWidgets().add(w);
p.getRegions().add(region);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java Mon Jun 11 09:32:59 2012
@@ -19,18 +19,19 @@
package org.apache.rave.portal.web.api.rest;
-import org.apache.rave.portal.model.JpaRegionWidget;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
import org.apache.rave.portal.service.RegionWidgetService;
import org.apache.rave.portal.web.model.RegionWidgetPreferenceListWrapper;
-import static org.hamcrest.CoreMatchers.*;
import org.junit.Before;
import org.junit.Test;
import java.util.Arrays;
import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
public class RegionWidgetApiTest {
@@ -51,8 +52,8 @@ public class RegionWidgetApiTest {
@Test
public void replaceAllRegionWidgetPreferences_validParams() {
- RegionWidgetPreferenceListWrapper LIST_WRAPPER = new RegionWidgetPreferenceListWrapper(Arrays.asList(
- new RegionWidgetPreference(), new RegionWidgetPreference()
+ RegionWidgetPreferenceListWrapper LIST_WRAPPER = new RegionWidgetPreferenceListWrapper(Arrays.asList( (RegionWidgetPreference)
+ new RegionWidgetPreferenceImpl(), new RegionWidgetPreferenceImpl()
));
expect(regionWidgetService.saveRegionWidgetPreferences(VALID_REGION_WIDGET_ID, LIST_WRAPPER.getPreferences())).
@@ -68,8 +69,8 @@ public class RegionWidgetApiTest {
@Test(expected = IllegalArgumentException.class)
public void replaceAllRegionWidgetPreferences_invalidParams() {
- RegionWidgetPreferenceListWrapper LIST_WRAPPER = new RegionWidgetPreferenceListWrapper(Arrays.asList(
- new RegionWidgetPreference(), new RegionWidgetPreference()
+ RegionWidgetPreferenceListWrapper LIST_WRAPPER = new RegionWidgetPreferenceListWrapper(Arrays.asList( (RegionWidgetPreference)
+ new RegionWidgetPreferenceImpl(), new RegionWidgetPreferenceImpl()
));
expect(regionWidgetService.saveRegionWidgetPreferences(INVALID_REGION_WIDGET_ID, LIST_WRAPPER.getPreferences())).
@@ -81,7 +82,7 @@ public class RegionWidgetApiTest {
@Test
public void createOrReplaceRegionWidgetPreference_validParams() {
- RegionWidgetPreference PREFERENCE = new RegionWidgetPreference(1L, VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
+ RegionWidgetPreference PREFERENCE = new RegionWidgetPreferenceImpl(VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
VALID_PREFERENCE_VALUE);
expect(regionWidgetService.saveRegionWidgetPreference(VALID_REGION_WIDGET_ID, PREFERENCE)).andReturn(PREFERENCE);
@@ -96,7 +97,7 @@ public class RegionWidgetApiTest {
@Test(expected = IllegalArgumentException.class)
public void createOrReplaceRegionWidgetPreference_invalidParams_preferenceName() {
- RegionWidgetPreference PREFERENCE = new RegionWidgetPreference(1L, VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
+ RegionWidgetPreference PREFERENCE = new RegionWidgetPreferenceImpl(VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
VALID_PREFERENCE_VALUE);
regionWidgetApi.createOrReplaceRegionWidgetPreference(VALID_REGION_WIDGET_ID, "different", PREFERENCE);
@@ -104,7 +105,7 @@ public class RegionWidgetApiTest {
@Test(expected = IllegalArgumentException.class)
public void createOrReplaceRegionWidgetPreference_invalidParams_regionWidgetId() {
- RegionWidgetPreference PREFERENCE = new RegionWidgetPreference(1L, VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
+ RegionWidgetPreference PREFERENCE = new RegionWidgetPreferenceImpl(VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
VALID_PREFERENCE_VALUE);
expect(regionWidgetService.saveRegionWidgetPreference(INVALID_REGION_WIDGET_ID, PREFERENCE)).andThrow(
@@ -118,7 +119,7 @@ public class RegionWidgetApiTest {
public void updateRegionWidgetCollapsedStatus() {
final boolean COLLAPSED = true;
- RegionWidget expectedRegionWidget = new JpaRegionWidget(VALID_REGION_WIDGET_ID);
+ RegionWidget expectedRegionWidget = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
expectedRegionWidget.setCollapsed(COLLAPSED);
expect(regionWidgetService.saveRegionWidgetCollapsedState(VALID_REGION_WIDGET_ID, COLLAPSED)).andReturn(expectedRegionWidget);
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java?rev=1348769&r1=1348768&r2=1348769&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java Mon Jun 11 09:32:59 2012
@@ -20,7 +20,13 @@
package org.apache.rave.provider.opensocial.web.renderer;
import org.apache.rave.exception.NotSupportedException;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Region;
+import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.portal.model.impl.RegionImpl;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.web.renderer.RenderScope;
import org.apache.rave.portal.web.renderer.Renderer;
import org.apache.rave.portal.web.renderer.ScriptLocation;
@@ -73,21 +79,21 @@ public class OpenSocialWidgetRendererTes
expect(openSocialService.getGadgetMetadata(VALID_GADGET_URL)).andReturn(VALID_METADATA);
replay(openSocialService);
- JpaWidget w = new JpaWidget();
- w.setEntityId(1L);
+ WidgetImpl w = new WidgetImpl();
+ w.setId(1L);
w.setType(Constants.WIDGET_TYPE);
w.setUrl(VALID_GADGET_URL);
- Region region = new JpaRegion(1L);
- RegionWidget rw = new JpaRegionWidget();
+ Region region = new RegionImpl(1L);
+ RegionWidget rw = new RegionWidgetImpl();
rw.setId(1L);
rw.setCollapsed(VALID_COLLAPSED);
rw.setWidget(w);
rw.setRegion(region);
rw.setHideChrome(VALID_HIDE_CHROME);
rw.setLocked(VALID_LOCKED);
- rw.setPreferences(Arrays.asList(new RegionWidgetPreference(1L, 1L, "color", "blue"),
- new RegionWidgetPreference(2L, 1L, "speed", "fast"),
- new RegionWidgetPreference(3L, 1L, null, null)));
+ rw.setPreferences(Arrays.asList((RegionWidgetPreference)new RegionWidgetPreferenceImpl( 1L, "color", "blue"),
+ new RegionWidgetPreferenceImpl(1L, "speed", "fast"),
+ new RegionWidgetPreferenceImpl( 1L, null, null)));
final String markup =
"<script>rave.registerWidget(1, {type: 'OpenSocial'," +
@@ -117,10 +123,10 @@ public class OpenSocialWidgetRendererTes
@Test
public void render_null() {
- JpaWidget w = new JpaWidget();
+ WidgetImpl w = new WidgetImpl();
w.setType(Constants.WIDGET_TYPE);
- Region region = new JpaRegion(1L);
- RegionWidget rw = new JpaRegionWidget();
+ Region region = new RegionImpl(1L);
+ RegionWidget rw = new RegionWidgetImpl();
rw.setWidget(w);
rw.setRegion(region);
@@ -144,10 +150,10 @@ public class OpenSocialWidgetRendererTes
@Test(expected = NotSupportedException.class)
public void render_invalid() {
- JpaWidget w = new JpaWidget();
+ WidgetImpl w = new WidgetImpl();
w.setType("NONE");
w.setUrl("http://www.example.com/gadget.xml");
- RegionWidget rw = new JpaRegionWidget();
+ RegionWidget rw = new RegionWidgetImpl();
rw.setId(1L);
rw.setWidget(w);