You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/09/02 10:55:51 UTC
[sling-org-apache-sling-api] branch master updated: Clean up code
and replace usage of deprecated api
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
The following commit(s) were added to refs/heads/master by this push:
new a459f15 Clean up code and replace usage of deprecated api
a459f15 is described below
commit a459f157b87e2ca6a274a1d890aad1d86ff7a631
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Sep 2 12:55:35 2020 +0200
Clean up code and replace usage of deprecated api
---
.../sling/api/wrappers/ValueMapDecorator.java | 15 ++++++
.../apache/sling/api/wrappers/impl/JcrRules.java | 2 +-
.../sling/api/resource/path/PathBuilderTest.java | 25 +++++----
.../sling/api/scripting/LazyBindingsTest.java | 11 ++--
.../sling/api/wrappers/CompositeValueMapTest.java | 13 +++--
.../api/wrappers/ResourceResolverWrapperTest.java | 16 +++---
.../apache/sling/api/wrappers/impl/Convert.java | 30 +++++------
.../api/wrappers/impl/ObjectConverterTest.java | 60 +++++++++++-----------
8 files changed, 96 insertions(+), 76 deletions(-)
diff --git a/src/main/java/org/apache/sling/api/wrappers/ValueMapDecorator.java b/src/main/java/org/apache/sling/api/wrappers/ValueMapDecorator.java
index 0ca5cdb..bf24b3f 100644
--- a/src/main/java/org/apache/sling/api/wrappers/ValueMapDecorator.java
+++ b/src/main/java/org/apache/sling/api/wrappers/ValueMapDecorator.java
@@ -49,6 +49,8 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
+ @SuppressWarnings("unchecked")
public <T> T get(@NotNull String name, @NotNull Class<T> type) {
if (base instanceof ValueMap) {
// shortcut if decorated map is ValueMap
@@ -67,6 +69,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
@NotNull
@SuppressWarnings("unchecked")
public <T> T get(@NotNull String name, @NotNull T defaultValue) {
@@ -87,6 +90,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public int size() {
return base.size();
}
@@ -94,6 +98,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEmpty() {
return base.isEmpty();
}
@@ -101,6 +106,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public boolean containsKey(Object key) {
return base.containsKey(key);
}
@@ -108,6 +114,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public boolean containsValue(Object value) {
return base.containsValue(value);
}
@@ -115,6 +122,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public Object get(Object key) {
return base.get(key);
}
@@ -122,6 +130,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public Object put(String key, Object value) {
return base.put(key, value);
}
@@ -129,6 +138,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public Object remove(Object key) {
return base.remove(key);
}
@@ -136,6 +146,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public void putAll(Map<? extends String, ?> t) {
base.putAll(t);
}
@@ -143,6 +154,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
base.clear();
}
@@ -150,6 +162,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public Set<String> keySet() {
return base.keySet();
}
@@ -157,6 +170,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public Collection<Object> values() {
return base.values();
}
@@ -164,6 +178,7 @@ public class ValueMapDecorator implements ValueMap {
/**
* {@inheritDoc}
*/
+ @Override
public Set<Entry<String, Object>> entrySet() {
return base.entrySet();
}
diff --git a/src/main/java/org/apache/sling/api/wrappers/impl/JcrRules.java b/src/main/java/org/apache/sling/api/wrappers/impl/JcrRules.java
index bbb54ff..4ce7405 100644
--- a/src/main/java/org/apache/sling/api/wrappers/impl/JcrRules.java
+++ b/src/main/java/org/apache/sling/api/wrappers/impl/JcrRules.java
@@ -43,7 +43,7 @@ public final class JcrRules {
}));
converterBuilder.rule(new TypeRule<Value, InputStream>(Value.class, InputStream.class, value -> {
try {
- return value.getStream();
+ return value.getBinary().getStream();
} catch (Exception e) {
return (InputStream) ConverterFunction.CANNOT_HANDLE;
}
diff --git a/src/test/java/org/apache/sling/api/resource/path/PathBuilderTest.java b/src/test/java/org/apache/sling/api/resource/path/PathBuilderTest.java
index b74299a..0c92c18 100644
--- a/src/test/java/org/apache/sling/api/resource/path/PathBuilderTest.java
+++ b/src/test/java/org/apache/sling/api/resource/path/PathBuilderTest.java
@@ -20,7 +20,6 @@ package org.apache.sling.api.resource.path;
import static org.junit.Assert.assertThat;
-import org.apache.sling.api.resource.path.PathBuilder;
import org.hamcrest.Matchers;
import org.junit.Test;
@@ -28,49 +27,49 @@ public class PathBuilderTest {
@Test
public void noChangeNeeded_root() {
-
+
assertThat(new PathBuilder("/").append("path").toString(), Matchers.equalTo("/path"));
}
@Test
public void noChangeNeeded_intermediate() {
-
+
assertThat(new PathBuilder("/parent").append("/child").toString(), Matchers.equalTo("/parent/child"));
}
-
+
@Test
public void removeSlash_root() {
-
+
assertThat(new PathBuilder("/").append("/path").toString(), Matchers.equalTo("/path"));
}
@Test
public void removeSlash_intermediate() {
-
+
assertThat(new PathBuilder("/parent/").append("/child").toString(), Matchers.equalTo("/parent/child"));
}
-
+
@Test
public void addSlash() {
-
+
assertThat(new PathBuilder("/parent").append("child").toString(), Matchers.equalTo("/parent/child"));
}
-
- @Test(expected = IllegalArgumentException.class)
+
+ @Test(expected = IllegalArgumentException.class)
public void relativeInitialPaths() {
new PathBuilder("relative");
}
- @Test(expected = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void nullInitialPath() {
new PathBuilder(null);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void emptyInitialPath() {
new PathBuilder("");
}
-
+
@Test(expected = IllegalArgumentException.class)
public void emptyAppendedPath() {
new PathBuilder("/parent").append("");
diff --git a/src/test/java/org/apache/sling/api/scripting/LazyBindingsTest.java b/src/test/java/org/apache/sling/api/scripting/LazyBindingsTest.java
index f4bcf3d..65a65bf 100644
--- a/src/test/java/org/apache/sling/api/scripting/LazyBindingsTest.java
+++ b/src/test/java/org/apache/sling/api/scripting/LazyBindingsTest.java
@@ -18,6 +18,11 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
package org.apache.sling.api.scripting;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.AbstractMap;
import java.util.Arrays;
import java.util.Collection;
@@ -25,18 +30,12 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
public class LazyBindingsTest {
private static final String THE_QUESTION = "What is The Answer to the Ultimate Question of Life, The Universe, and Everything?";
private static final int THE_ANSWER = 42;
diff --git a/src/test/java/org/apache/sling/api/wrappers/CompositeValueMapTest.java b/src/test/java/org/apache/sling/api/wrappers/CompositeValueMapTest.java
index 154055b..dc287b1 100644
--- a/src/test/java/org/apache/sling/api/wrappers/CompositeValueMapTest.java
+++ b/src/test/java/org/apache/sling/api/wrappers/CompositeValueMapTest.java
@@ -18,16 +18,16 @@
*/
package org.apache.sling.api.wrappers;
-import org.apache.sling.api.resource.ValueMap;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.hamcrest.Matchers.containsInAnyOrder;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import static org.hamcrest.Matchers.containsInAnyOrder;
+import org.apache.sling.api.resource.ValueMap;
+import org.junit.Assert;
+import org.junit.Test;
public class CompositeValueMapTest {
@@ -54,6 +54,7 @@ public class CompositeValueMapTest {
@Test
public void testMerge() throws Exception {
// Get value map for extended node using default node as defaults
+ @SuppressWarnings("deprecation")
CompositeValueMap valueMap = new CompositeValueMap(
getExtendedProps(),
getDefaultProps()
@@ -72,6 +73,7 @@ public class CompositeValueMapTest {
@Test
public void testMergeNoDefaults() throws Exception {
// Get value map for extended node using an empty default
+ @SuppressWarnings("deprecation")
CompositeValueMap valueMap = new CompositeValueMap(
getExtendedProps(),
null
@@ -91,6 +93,7 @@ public class CompositeValueMapTest {
public void testOverride() throws Exception {
// Get value map for extended node using default node as defaults
// and override only mode
+ @SuppressWarnings("deprecation")
CompositeValueMap valueMap = new CompositeValueMap(
getExtendedProps(),
getDefaultProps(),
@@ -107,6 +110,7 @@ public class CompositeValueMapTest {
verifyResults(valueMap, expectations);
}
+ @SuppressWarnings("deprecation")
@Test
public void testOverrideNoDefaults() throws Exception {
// Get value map for extended node using an empty default
@@ -140,6 +144,7 @@ public class CompositeValueMapTest {
return new ValueMapDecorator(defaultProps);
}
+ @SuppressWarnings("deprecation")
private void verifyResults(CompositeValueMap valueMap, Set<CompositeValueMapTestResult> expectations) {
Map<String, Object> expectedMap = new HashMap<String, Object>();
diff --git a/src/test/java/org/apache/sling/api/wrappers/ResourceResolverWrapperTest.java b/src/test/java/org/apache/sling/api/wrappers/ResourceResolverWrapperTest.java
index 21617e5..2bf4f87 100644
--- a/src/test/java/org/apache/sling/api/wrappers/ResourceResolverWrapperTest.java
+++ b/src/test/java/org/apache/sling/api/wrappers/ResourceResolverWrapperTest.java
@@ -16,11 +16,20 @@
******************************************************************************/
package org.apache.sling.api.wrappers;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import javax.servlet.http.HttpServletRequest;
import org.apache.sling.api.resource.Resource;
@@ -31,11 +40,6 @@ import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
public class ResourceResolverWrapperTest {
private static final String PATH = "path";
@@ -427,7 +431,7 @@ public class ResourceResolverWrapperTest {
@Test
public void testAdaptTo() throws Exception {
- List list = mock(List.class);
+ List<?> list = mock(List.class);
when(wrappedResolver.adaptTo(List.class)).thenReturn(list);
assertEquals(list, underTest.adaptTo(List.class));
diff --git a/src/test/java/org/apache/sling/api/wrappers/impl/Convert.java b/src/test/java/org/apache/sling/api/wrappers/impl/Convert.java
index 9507352..423fa22 100644
--- a/src/test/java/org/apache/sling/api/wrappers/impl/Convert.java
+++ b/src/test/java/org/apache/sling/api/wrappers/impl/Convert.java
@@ -18,8 +18,6 @@
*/
package org.apache.sling.api.wrappers.impl;
-import org.apache.commons.lang3.ClassUtils;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -27,13 +25,12 @@ import static org.junit.Assert.assertNull;
import java.lang.reflect.Array;
import java.util.Calendar;
import java.util.Date;
-import java.util.GregorianCalendar;
/**
* Tests all permutations of object conversions between single values and array types, and null handling.
*/
final class Convert {
-
+
private Convert() {
// static methods only
}
@@ -62,7 +59,7 @@ final class Convert {
return new ConversionAssert<T, U>(input1, input2, inputType, expected1, expected2, expectedType);
}
}
-
+
@SuppressWarnings("unchecked")
public static class ConversionAssert<T,U> {
@@ -105,10 +102,10 @@ final class Convert {
private static <T, U> void assertPermuations(T input1, T input2, Class<? super T> inputType,
U expected1, U expected2, U nullValue, Class<? super U> expectedType, Class<? super U[]> expectedArrayType) {
-
+
// single value to single value
assertConversion(expected1, input1, expectedType);
-
+
// single value to array
Object expectedSingletonArray;
if (expected1 == null && expected2 == null) {
@@ -119,7 +116,7 @@ final class Convert {
Array.set(expectedSingletonArray, 0, expected1);
}
assertConversion(expectedSingletonArray, input1, expectedArrayType);
-
+
// array to array
Object inputDoubleArray = Array.newInstance(inputType, 2);
Array.set(inputDoubleArray, 0, input1);
@@ -134,16 +131,16 @@ final class Convert {
Array.set(expectedDoubleArray, 1, expected2);
}
assertConversion(expectedDoubleArray, inputDoubleArray, expectedArrayType);
-
+
// array to single (first) value
assertConversion(expected1, inputDoubleArray, expectedType);
-
+
// null to single value
assertConversion(nullValue, null, expectedType);
-
+
// null to array
// assertConversion(null, null, expectedArrayType);
-
+
// empty array to single value
Object inputEmptyArray = Array.newInstance(inputType, 0);
assertConversion(nullValue, inputEmptyArray, expectedType);
@@ -152,8 +149,7 @@ final class Convert {
Object expectedEmptyArray = Array.newInstance(expectedType, 0);
assertConversion(expectedEmptyArray, inputEmptyArray, expectedArrayType);
}
-
- @SuppressWarnings("unchecked")
+
private static <T,U> void assertConversion(Object expected, Object input, Class<U> expectedType) {
U result = ObjectConverter.convert(input, expectedType);
String msg = "Convert '" + toString(input) + "' to " + expectedType.getSimpleName();
@@ -167,7 +163,7 @@ final class Convert {
assertEquals(msg, toStringIfDate(expected), toStringIfDate(result));
}
}
-
+
private static String toString(Object input) {
if (input == null) {
return "null";
@@ -188,7 +184,7 @@ final class Convert {
return toStringIfDate(input);
}
}
-
+
private static String toStringIfDate(Object input) {
if (input instanceof Calendar) {
return "(Calendar)" + ((Calendar)input).getTime().toInstant().toString();
@@ -210,5 +206,5 @@ final class Convert {
}
return null;
}
-
+
}
diff --git a/src/test/java/org/apache/sling/api/wrappers/impl/ObjectConverterTest.java b/src/test/java/org/apache/sling/api/wrappers/impl/ObjectConverterTest.java
index 81f42a0..0872854 100644
--- a/src/test/java/org/apache/sling/api/wrappers/impl/ObjectConverterTest.java
+++ b/src/test/java/org/apache/sling/api/wrappers/impl/ObjectConverterTest.java
@@ -18,6 +18,13 @@
*/
package org.apache.sling.api.wrappers.impl;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.Calendar;
@@ -30,15 +37,8 @@ import javax.jcr.Value;
import org.junit.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
public class ObjectConverterTest {
-
+
private static final String STRING_1 = "item1";
private static final String STRING_2 = "item2";
private static final boolean BOOLEAN_1 = true;
@@ -87,7 +87,7 @@ public class ObjectConverterTest {
Convert.from(CALENDAR_1, CALENDAR_2, Calendar.class).to(calendarToString(CALENDAR_1), calendarToString(CALENDAR_2), String.class).test();
Convert.from(DATE_1, DATE_2, Date.class).to(calendarToString(toCalendar(DATE_1)), calendarToString(toCalendar(DATE_2)), String.class).test();
}
-
+
private String calendarToString(Calendar calendar) {
return calendar.getTime().toInstant().toString();
}
@@ -107,13 +107,13 @@ public class ObjectConverterTest {
Convert.from(1, 0, int.class).to(true, false, boolean.class).test();
Convert.from(DATE_1, DATE_2, Date.class).to(false, false, boolean.class).test();
}
-
+
@Test
public void testToByte() {
Convert.from(BYTE_1, BYTE_2, byte.class).to(BYTE_1, BYTE_2, Byte.class).test();
Convert.from(BYTE_1, BYTE_2, Byte.class).to(BYTE_1, BYTE_2, Byte.class).test();
Convert.from(Byte.toString(BYTE_1), Byte.toString(BYTE_2), String.class).to(BYTE_1, BYTE_2, byte.class).test();
-
+
// test conversion from other number types
Convert.from(INT_1, INT_2, Integer.class).to((byte)INT_1, (byte)INT_2, byte.class).test();
Convert.from(INT_1, INT_2, int.class).to((byte)INT_1, (byte)INT_2, Byte.class).test();
@@ -121,13 +121,13 @@ public class ObjectConverterTest {
// test other types that should not be converted
Convert.from(DATE_1, DATE_2, Date.class).to(null, null, Byte.class).test();
}
-
+
@Test
public void testToShort() {
Convert.from(SHORT_1, SHORT_2, short.class).to(SHORT_1, SHORT_2, Short.class).test();
Convert.from(SHORT_1, SHORT_2, Short.class).to(SHORT_1, SHORT_2, short.class).test();
Convert.from(Short.toString(SHORT_1), Short.toString(SHORT_2), String.class).to(SHORT_1, SHORT_2, short.class).test();
-
+
// test conversion from other number types
Convert.from(INT_1, INT_2, Integer.class).to((short)INT_1, (short)INT_2, short.class).test();
Convert.from(INT_1, INT_2, int.class).to((short)INT_1, (short)INT_2, Short.class).test();
@@ -135,13 +135,13 @@ public class ObjectConverterTest {
// test other types that should not be converted
Convert.from(DATE_1, DATE_2, Date.class).to(null, null, Short.class).test();
}
-
+
@Test
public void testToInteger() {
Convert.from(INT_1, INT_2, int.class).to(INT_1, INT_2, int.class).test();
Convert.from(INT_1, INT_2, Integer.class).to(INT_1, INT_2, int.class).test();
Convert.from(Integer.toString(INT_1), Integer.toString(INT_2), String.class).to(INT_1, INT_2, int.class).test();
-
+
// test conversion from other number types
Convert.from(SHORT_1, SHORT_2, Short.class).to((int)SHORT_1, (int)SHORT_2, Integer.class).test();
Convert.from(SHORT_1, SHORT_2, short.class).to((int)SHORT_1, (int)SHORT_2, int.class).test();
@@ -149,13 +149,13 @@ public class ObjectConverterTest {
// test other types that should not be converted
Convert.from(DATE_1, DATE_2, Date.class).to(null, null, Integer.class).test();
}
-
+
@Test
public void testToLong() {
Convert.from(LONG_1, LONG_2, long.class).to(LONG_1, LONG_2, long.class).test();
Convert.from(LONG_1, LONG_2, Long.class).to(LONG_1, LONG_2, Long.class).test();
Convert.from(Long.toString(LONG_1), Long.toString(LONG_2), String.class).to(LONG_1, LONG_2, long.class).test();
-
+
// test conversion from other number types
Convert.from(SHORT_1, SHORT_2, Short.class).to((long)SHORT_1, (long)SHORT_2, long.class).test();
Convert.from(SHORT_1, SHORT_2, short.class).to((long)SHORT_1, (long)SHORT_2, Long.class).test();
@@ -163,13 +163,13 @@ public class ObjectConverterTest {
// test conversion from DATE to LONG
Convert.from(DATE_1, DATE_2, Date.class).to(DATE_1.getTime(), DATE_2.getTime(), long.class).test();
}
-
+
@Test
public void testToFloat() {
Convert.from(FLOAT_1, FLOAT_2, float.class).to(FLOAT_1, FLOAT_2, float.class).test();
Convert.from(FLOAT_1, FLOAT_2, Float.class).to(FLOAT_1, FLOAT_2, float.class).test();
Convert.from(Float.toString(FLOAT_1), Float.toString(FLOAT_2), String.class).to(FLOAT_1, FLOAT_2, float.class).test();
-
+
// test conversion from other number types
Convert.from(SHORT_1, SHORT_2, Short.class).to((float)SHORT_1, (float)SHORT_2, Float.class).test();
Convert.from(SHORT_1, SHORT_2, short.class).to((float)SHORT_1, (float)SHORT_2, float.class).test();
@@ -177,13 +177,13 @@ public class ObjectConverterTest {
// test other types that should not be converted
Convert.from(DATE_1, DATE_2, Date.class).to(null, null, Float.class).test();
}
-
+
@Test
public void testToDouble() {
Convert.from(DOUBLE_1, DOUBLE_2, double.class).to(DOUBLE_1, DOUBLE_2, double.class).test();
Convert.from(DOUBLE_1, DOUBLE_2, Double.class).to(DOUBLE_1, DOUBLE_2, Double.class).test();
Convert.from(Double.toString(DOUBLE_1), Double.toString(DOUBLE_2), String.class).to(DOUBLE_1, DOUBLE_2, double.class).test();
-
+
// test conversion from other number types
Convert.from(SHORT_1, SHORT_2, Short.class).to((double)SHORT_1, (double)SHORT_2, Double.class).test();
Convert.from(SHORT_1, SHORT_2, short.class).to((double)SHORT_1, (double)SHORT_2, double.class).test();
@@ -191,12 +191,12 @@ public class ObjectConverterTest {
// test other types that should not be converted
Convert.from(DATE_1, DATE_2, Date.class).to(null, null, Double.class).test();
}
-
+
@Test
public void testToBigDecimal() {
Convert.from(BIGDECIMAL_1, BIGDECIMAL_2, BigDecimal.class).to(BIGDECIMAL_1, BIGDECIMAL_2, BigDecimal.class).test();
Convert.from(BIGDECIMAL_1.toString(), BIGDECIMAL_2.toString(), String.class).to(BIGDECIMAL_1, BIGDECIMAL_2, BigDecimal.class).test();
-
+
// test conversion from other number types
Convert.from(LONG_1, LONG_2, Long.class).to(BigDecimal.valueOf(LONG_1), BigDecimal.valueOf(LONG_2), BigDecimal.class).test();
Convert.from(LONG_1, LONG_2, Long.class).to(BigDecimal.valueOf(LONG_1), BigDecimal.valueOf(LONG_2), BigDecimal.class).test();
@@ -206,12 +206,12 @@ public class ObjectConverterTest {
// test other types that should not be converted
Convert.from(DATE_1, DATE_2, Date.class).to(null, null, BigDecimal.class).test();
}
-
+
@Test
public void testToCalendar() {
Convert.from(CALENDAR_1, CALENDAR_2, Calendar.class).to(CALENDAR_1, CALENDAR_2, Calendar.class).test();
Convert.from(calendarToString(CALENDAR_1), calendarToString(CALENDAR_2), String.class).to(CALENDAR_1, CALENDAR_2, Calendar.class).test();
-
+
// test conversion from other date types
Convert.from(DATE_1, DATE_2, Date.class).to(toCalendar(DATE_1), toCalendar(DATE_2), Calendar.class).test();
@@ -219,12 +219,12 @@ public class ObjectConverterTest {
Convert.from(STRING_1, STRING_2, String.class).to(null, null, Calendar.class).test();
Convert.from(BOOLEAN_1, BOOLEAN_2, Boolean.class).to(null, null, Calendar.class).test();
}
-
+
@Test
public void testToDate() {
Convert.from(DATE_1, DATE_2, Date.class).to(DATE_1, DATE_2, Date.class).test();
Convert.from(dateToString(DATE_1), dateToString(DATE_2), String.class).to(DATE_1, DATE_2, Date.class).test();
-
+
// test conversion from other date types
Convert.from(CALENDAR_1, CALENDAR_2, Calendar.class).to(toDate(CALENDAR_1), toDate(CALENDAR_2), Date.class).test();
@@ -232,7 +232,7 @@ public class ObjectConverterTest {
Convert.from(STRING_1, STRING_2, String.class).to(null, null, Date.class).test();
Convert.from(BOOLEAN_1, BOOLEAN_2, Boolean.class).to(null, null, Date.class).test();
}
-
+
private Date toDate(Calendar calendar1) {
return calendar1.getTime();
}
@@ -267,7 +267,9 @@ public class ObjectConverterTest {
public void testJcrStreamValue() throws Exception {
Value streamValue = mock(Value.class);
InputStream stream = mock(InputStream.class);
- when(streamValue.getStream()).thenReturn(stream);
+ Binary bin = mock(Binary.class);
+ when(streamValue.getBinary()).thenReturn(bin);
+ when(bin.getStream()).thenReturn(stream);
assertEquals(stream, ObjectConverter.convert(streamValue, InputStream.class));
}