You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2012/06/05 19:50:38 UTC
svn commit: r1346490 - in
/rave/branches/model_interfaces/rave-components/rave-core/src:
main/java/org/apache/rave/portal/model/conversion/
main/java/org/apache/rave/portal/model/impl/
test/java/org/apache/rave/portal/model/conversion/
Author: cgeer
Date: Tue Jun 5 17:50:38 2012
New Revision: 1346490
URL: http://svn.apache.org/viewvc?rev=1346490&view=rev
Log:
RAVE-647 Added JpaRegionConverterTest and JpaRegionWidgetConverterTest
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionConverter.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverter.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionConverter.java?rev=1346490&r1=1346489&r2=1346490&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionConverter.java Tue Jun 5 17:50:38 2012
@@ -41,19 +41,21 @@ public class JpaRegionConverter implemen
@Override
public JpaRegion convert(Region source) {
- return source instanceof JpaRegion ? (JpaRegion)source : createEntity(source);
+ return source instanceof JpaRegion ? (JpaRegion) source : createEntity(source);
}
private JpaRegion createEntity(Region source) {
- JpaRegion converted;
- TypedQuery<JpaRegion> query = manager.createNamedQuery(JpaRegion.FIND_BY_ENTITY_ID, JpaRegion.class);
- query.setParameter(JpaRegion.ENTITY_ID_PARAM, source.getId());
- converted = getSingleResult(query.getResultList());
+ JpaRegion converted = null;
+ if (source != null) {
+ TypedQuery<JpaRegion> query = manager.createNamedQuery(JpaRegion.FIND_BY_ENTITY_ID, JpaRegion.class);
+ query.setParameter(JpaRegion.ENTITY_ID_PARAM, source.getId());
+ converted = getSingleResult(query.getResultList());
- if(converted == null) {
- converted = new JpaRegion();
+ if (converted == null) {
+ converted = new JpaRegion();
+ }
+ updateProperties(source, converted);
}
- updateProperties(source, converted);
return converted;
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverter.java?rev=1346490&r1=1346489&r2=1346490&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverter.java Tue Jun 5 17:50:38 2012
@@ -23,19 +23,21 @@ public class JpaRegionWidgetConverter im
@Override
public JpaRegionWidget convert(RegionWidget source) {
- return source instanceof JpaRegionWidget ? (JpaRegionWidget)source : createEntity(source);
+ return source instanceof JpaRegionWidget ? (JpaRegionWidget) source : createEntity(source);
}
private JpaRegionWidget createEntity(RegionWidget source) {
- JpaRegionWidget converted;
- TypedQuery<JpaRegionWidget> query = manager.createNamedQuery(JpaRegionWidget.FIND_BY_ID, JpaRegionWidget.class);
- query.setParameter(JpaRegionWidget.PARAM_WIDGET_ID, source.getId());
- converted = getSingleResult(query.getResultList());
+ JpaRegionWidget converted = null;
+ if (source != null) {
+ TypedQuery<JpaRegionWidget> query = manager.createNamedQuery(JpaRegionWidget.FIND_BY_ID, JpaRegionWidget.class);
+ query.setParameter(JpaRegionWidget.PARAM_WIDGET_ID, source.getId());
+ converted = getSingleResult(query.getResultList());
- if(converted == null) {
- converted = new JpaRegionWidget();
+ if (converted == null) {
+ converted = new JpaRegionWidget();
+ }
+ updateProperties(source, converted);
}
- updateProperties(source, converted);
return converted;
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java?rev=1346490&r1=1346489&r2=1346490&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java Tue Jun 5 17:50:38 2012
@@ -27,8 +27,8 @@ import java.util.List;
public class RegionImpl implements Region {
private Long id;
private Page page;
- private Boolean locked;
- private Integer renderOrder;
+ private Boolean locked = false;
+ private Integer renderOrder = 0;
private List<RegionWidget> regionWidgets;
public RegionImpl() {
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java?rev=1346490&r1=1346489&r2=1346490&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java Tue Jun 5 17:50:38 2012
@@ -30,11 +30,11 @@ public class RegionWidgetImpl implements
private Widget widget;
private Region region;
private String renderPosition;
- private int renderOrder;
- private boolean collapsed;
+ private Integer renderOrder = 0;
+ private Boolean collapsed = false;
private List<RegionWidgetPreference> preferences;
- private boolean locked;
- private boolean hideChrome;
+ private Boolean locked = false;
+ private Boolean hideChrome = false;
public RegionWidgetImpl() {
@@ -146,4 +146,40 @@ public class RegionWidgetImpl implements
public void setHideChrome(boolean hideChrome) {
this.hideChrome = hideChrome;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof RegionWidgetImpl)) return false;
+
+ RegionWidgetImpl rw = (RegionWidgetImpl) o;
+
+ if (id != null ? !id.equals(rw.id) : rw.id != null) return false;
+ if (locked != null ? !locked.equals(rw.locked) : rw.locked != null)
+ return false;
+ if (renderOrder != null ? !renderOrder.equals(rw.renderOrder) : rw.renderOrder != null) return false;
+ if (widget != null ? !widget.equals(rw.widget) : rw.widget != null)
+ return false;
+ if (region != null ? !region.equals(rw.region) : rw.region != null) return false;
+ if (hideChrome != null ? !hideChrome.equals(rw.hideChrome) : rw.hideChrome != null) return false;
+ if (preferences != null ? !preferences.equals(rw.preferences) : rw.preferences != null) return false;
+ if (collapsed != null ? !collapsed.equals(rw.collapsed) : rw.collapsed != null) return false;
+ if (renderPosition != null ? !renderPosition.equals(rw.renderPosition) : rw.renderPosition != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = (widget != null ? widget.hashCode() : 0);
+ result = 31 * result + (preferences != null ? preferences.hashCode() : 0);
+ result = 31 * result + (id != null ? id.hashCode() : 0);
+ result = 31 * result + (renderOrder != null ? renderOrder.hashCode() : 0);
+ result = 31 * result + (locked != null ? locked.hashCode() : 0);
+ result = 31 * result + (renderPosition != null ? renderPosition.hashCode() : 0);
+ result = 31 * result + (region != null ? region.hashCode() : 0);
+ result = 31 * result + (hideChrome != null ? hideChrome.hashCode() : 0);
+ result = 31 * result + (collapsed != null ? collapsed.hashCode() : 0);
+ return result;
+ }
}
Added: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java?rev=1346490&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java Tue Jun 5 17:50:38 2012
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.portal.model.conversion;
+
+import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.RegionImpl;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:test-dataContext.xml", "classpath:test-applicationContext.xml"})
+public class JpaRegionConverterTest {
+
+ @Autowired
+ private JpaRegionConverter regionConverter;
+
+ @Test
+ public void noConversion() {
+ Region region = new JpaRegion();
+ assertThat(regionConverter.convert(region), is(sameInstance(region)));
+ }
+
+ @Test
+ public void nullConversion() {
+ Region template = null;
+ assertThat(regionConverter.convert(template), is(nullValue()));
+ }
+
+
+ @Test
+ public void newRegion() {
+ Region region = new RegionImpl();
+ region.setId(9L);
+ region.setLocked(false);
+ region.setPage(new Page());
+ region.setRegionWidgets(new ArrayList<RegionWidget>());
+ region.setRenderOrder(9);
+
+ JpaRegion converted = regionConverter.convert(region);
+ assertThat(converted, is(not(sameInstance(region))));
+ assertThat(converted, is(instanceOf(JpaRegion.class)));
+ assertThat(converted.getRegionWidgets(), is(equalTo(region.getRegionWidgets())));
+ assertThat(converted.getEntityId(), is(equalTo(region.getId())));
+ assertThat(converted.getId(), is(equalTo(region.getId())));
+ assertThat(converted.getPage(), is(instanceOf(Page.class)));
+ assertThat(converted.getRenderOrder(), is(equalTo(region.getRenderOrder())));
+ assertThat(converted.isLocked(), is(equalTo(region.isLocked())));
+ }
+}
Added: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java?rev=1346490&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java Tue Jun 5 17:50:38 2012
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.portal.model.conversion;
+
+import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.RegionImpl;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:test-dataContext.xml", "classpath:test-applicationContext.xml"})
+public class JpaRegionWidgetConverterTest {
+
+ @Autowired
+ private JpaRegionWidgetConverter regionWidgetConverter;
+
+ @Test
+ public void noConversion() {
+ RegionWidget rw = new JpaRegionWidget();
+ assertThat(regionWidgetConverter.convert(rw), is(sameInstance(rw)));
+ }
+
+ @Test
+ public void nullConversion() {
+ RegionWidget template = null;
+ assertThat(regionWidgetConverter.convert(template), is(nullValue()));
+ }
+
+
+ @Test
+ public void newRegion() {
+ RegionWidget rw = new RegionWidgetImpl();
+ rw.setId(9L);
+ rw.setLocked(false);
+ rw.setCollapsed(false);
+ rw.setHideChrome(true);
+ rw.setRenderOrder(9);
+ rw.setPreferences(new ArrayList<RegionWidgetPreference>());
+ rw.setRegion(new RegionImpl());
+ rw.setRenderPosition("last");
+ rw.setWidget(new WidgetImpl());
+
+ JpaRegionWidget converted = regionWidgetConverter.convert(rw);
+ assertThat(converted, is(not(sameInstance(rw))));
+ assertThat(converted, is(instanceOf(JpaRegionWidget.class)));
+ assertThat(converted.getPreferences(), is(equalTo(rw.getPreferences())));
+ assertThat(converted.getEntityId(), is(equalTo(rw.getId())));
+ assertThat(converted.getId(), is(equalTo(rw.getId())));
+ assertThat(converted.isCollapsed(), is(equalTo(rw.isCollapsed())));
+ assertThat(converted.getRenderOrder(), is(equalTo(rw.getRenderOrder())));
+ assertThat(converted.isLocked(), is(equalTo(rw.isLocked())));
+ assertThat(converted.isHideChrome(), is(equalTo(rw.isHideChrome())));
+ assertThat(converted.getRegion(), is(instanceOf(JpaRegion.class)));
+ assertThat(converted.getRenderPosition(), is(equalTo(rw.getRenderPosition())));
+ assertThat(converted.getWidget(), is(instanceOf(JpaWidget.class)));
+ }
+}