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 21:12:42 UTC
svn commit: r1351802 - in
/rave/branches/model_interfaces/rave-components/rave-jpa/src:
main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java
test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java
Author: mfranklin
Date: Tue Jun 19 19:12:41 2012
New Revision: 1351802
URL: http://svn.apache.org/viewvc?rev=1351802&view=rev
Log:
Updated Widget conversion RAVE-652
Modified:
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java
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-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java?rev=1351802&r1=1351801&r2=1351802&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java Tue Jun 19 19:12:41 2012
@@ -39,6 +39,21 @@ public class JpaWidgetConverter implemen
converted.setEntityId(source.getId());
converted.setUrl(source.getUrl());
converted.setType(source.getType());
- //TODO: Finish all properties
+ converted.setTitle(source.getTitle());
+ converted.setTitleUrl(source.getTitleUrl());
+ converted.setUrl(source.getUrl());
+ converted.setThumbnailUrl(source.getThumbnailUrl());
+ converted.setScreenshotUrl(source.getScreenshotUrl());
+ converted.setAuthor(source.getAuthor());
+ converted.setAuthorEmail(source.getAuthorEmail());
+ converted.setDescription(source.getDescription());
+ converted.setWidgetStatus(source.getWidgetStatus());
+ converted.setComments(source.getComments());
+ converted.setOwner(source.getOwner());
+ converted.setDisableRendering(source.isDisableRendering());
+ converted.setRatings(source.getRatings());
+ converted.setTags(source.getTags());
+ converted.setCategories(source.getCategories());
+ converted.setFeatured(source.isFeatured());
}
}
Modified: 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/JpaWidgetConverterTest.java?rev=1351802&r1=1351801&r2=1351802&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/JpaWidgetConverterTest.java Tue Jun 19 19:12:41 2012
@@ -1,7 +1,7 @@
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.*;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.junit.Before;
import org.junit.Test;
@@ -10,6 +10,8 @@ import org.springframework.beans.factory
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import java.util.ArrayList;
+
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
@@ -40,13 +42,50 @@ public class JpaWidgetConverterTest {
@Test
public void convertValid() {
- Widget template = new WidgetImpl();
+ WidgetImpl template = new WidgetImpl();
+ template.setId(42L);
+ template.setUrl("TEST_A");
+ template.setType("TEST_B");
+ template.setTitle("TEST_C");
+ template.setTitleUrl("TEST_D");
+ template.setUrl("TEST_E");
+ template.setThumbnailUrl("TEST_F");
+ template.setScreenshotUrl("TEST_G");
+ template.setAuthor("TEST_H");
+ template.setAuthorEmail("TEST_I");
+ template.setDescription("TEST_J");
+ template.setWidgetStatus(WidgetStatus.PUBLISHED);
+ template.setComments(new ArrayList<WidgetComment>());
+ template.setOwner(new UserImpl(24L));
+ template.setDisableRendering(true);
+ template.setRatings(new ArrayList<WidgetRating>());
+ template.setTags(new ArrayList<WidgetTag>());
+ template.setCategories(new ArrayList<Category>());
+ template.setFeatured(true);
- JpaWidget jpaTemplate = converter.convert(template);
+ Widget jpaTemplate = converter.convert(template);
- assertThat(jpaTemplate, is(not(sameInstance(template))));
+ assertThat(jpaTemplate, is(not(sameInstance((Widget)template))));
assertThat(jpaTemplate, is(instanceOf(JpaWidget.class)));
- //TODO: Add coverage for all methods
+ assertThat(jpaTemplate.getId(), is(equalTo(template.getId())));
+ assertThat(jpaTemplate.getUrl(), is(equalTo(template.getUrl())));
+ assertThat(jpaTemplate.getType(), is(equalTo(template.getType())));
+ assertThat(jpaTemplate.getTitle(), is(equalTo(template.getTitle())));
+ assertThat(jpaTemplate.getTitleUrl(), is(equalTo(template.getTitleUrl())));
+ assertThat(jpaTemplate.getUrl(), is(equalTo(template.getUrl())));
+ assertThat(jpaTemplate.getThumbnailUrl(), is(equalTo(template.getThumbnailUrl())));
+ assertThat(jpaTemplate.getScreenshotUrl(), is(equalTo(template.getScreenshotUrl())));
+ assertThat(jpaTemplate.getAuthor(), is(equalTo(template.getAuthor())));
+ assertThat(jpaTemplate.getAuthorEmail(), is(equalTo(template.getAuthorEmail())));
+ assertThat(jpaTemplate.getDescription(), is(equalTo(template.getDescription())));
+ assertThat(jpaTemplate.getWidgetStatus(), is(equalTo(template.getWidgetStatus())));
+ assertThat(jpaTemplate.getComments(), is(equalTo(template.getComments())));
+ assertThat(jpaTemplate.getOwner().getId(), is(equalTo(template.getOwner().getId())));
+ assertThat(jpaTemplate.isDisableRendering(), is(equalTo(template.isDisableRendering())));
+ assertThat(jpaTemplate.getRatings(), is(equalTo(template.getRatings())));
+ assertThat(jpaTemplate.getTags(), is(equalTo(template.getTags())));
+ assertThat(jpaTemplate.getCategories(), is(equalTo(template.getCategories())));
+ assertThat(jpaTemplate.isFeatured(), is(equalTo(template.isFeatured())));
}
}