Issue #24 NumberToNumberConverter did not perform a check for same-ty…

…pe conversions, now it does. NumberToNumberConverterTest failed to spot the error because it did not test through the beanmapper. Removed these test in favor of higher level tests that map through beanmapper

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>io.beanmapper</groupId>
     <artifactId>beanmapper</artifactId>
-    <version>0.2.12</version>
+    <version>0.2.13-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>42 Bean Mapper</name>
     <description>Easy-to-use bean mapper for conversion from form to object to view</description>

src/main/java/io/beanmapper/core/converter/impl/NumberToNumberConverter.java

@@ -46,6 +46,9 @@ public void setBeanMapper(BeanMapper beanMapper) {
      */
     @Override
     public Object convert(Object source, Class<?> targetClass, BeanFieldMatch beanFieldMatch) {
+        if (source == null || beanFieldMatch.getSourceClass().equals(targetClass)) {
+            return source;
+        }
         Object sourceAsString = beanMapper.convert(source, String.class, beanFieldMatch);
         return beanMapper.convert(sourceAsString, targetClass, beanFieldMatch);
     }

src/test/java/io/beanmapper/BeanMapperTest.java

@@ -14,6 +14,10 @@
 import io.beanmapper.testmodel.converterBetweenNestedClasses.TargetWithNestedClass;
 import io.beanmapper.testmodel.defaults.SourceWithDefaults;
 import io.beanmapper.testmodel.defaults.TargetWithDefaults;
+import io.beanmapper.testmodel.numbers.ClassWithInteger;
+import io.beanmapper.testmodel.numbers.ClassWithLong;
+import io.beanmapper.testmodel.numbers.SourceWithDouble;
+import io.beanmapper.testmodel.numbers.TargetWithDouble;
 import io.beanmapper.testmodel.emptyobject.EmptySource;
 import io.beanmapper.testmodel.emptyobject.EmptyTarget;
 import io.beanmapper.testmodel.encapsulate.*;
@@ -251,6 +255,35 @@ public void copyToExistingTargetInstance() {
         assertEquals("Den Haag", person.getPlace());
     }
 
+    @Test
+    public void mapDouble() {
+        SourceWithDouble source = new SourceWithDouble();
+        source.number = 13.5;
+        TargetWithDouble target = beanMapper.map(source, TargetWithDouble.class);
+        assertEquals((Double)13.5, target.number);
+    }
+
+    @Test
+    public void mapLongToInteger() {
+        ClassWithLong source = new ClassWithLong();
+        source.number = 42L;
+        ClassWithInteger target = beanMapper.map(source, ClassWithInteger.class);
+        assertEquals((Integer)42, target.number);
+    }
+
+    @Test
+    public void mapIntegerToLong() {
+        ClassWithInteger source = new ClassWithInteger();
+        source.number = 42;
+        ClassWithLong target = beanMapper.map(source, ClassWithLong.class);
+        assertEquals((Long)42L, target.number);
+    }
+
+    /*
+            Assert.assertTrue(converter.match(Integer.class, Long.class));
+        Assert.assertEquals(Long.valueOf(42), converter.convert(Integer.valueOf(42), Long.class, null));
+     */
+
     @Test
     public void beanIgnore() {
         IgnoreSource ignoreSource = new IgnoreSource();

src/test/java/io/beanmapper/testmodel/numbers/ClassWithInteger.java

@@ -0,0 +1,5 @@
+package io.beanmapper.testmodel.numbers;
+
+public class ClassWithInteger {
+    public Integer number;
+}

src/test/java/io/beanmapper/testmodel/numbers/ClassWithLong.java

@@ -0,0 +1,5 @@
+package io.beanmapper.testmodel.numbers;
+
+public class ClassWithLong {
+    public Long number;
+}

src/test/java/io/beanmapper/testmodel/numbers/SourceWithDouble.java

@@ -0,0 +1,6 @@
+package io.beanmapper.testmodel.numbers;
+
+public class SourceWithDouble {
+
+    public Double number;
+}

src/test/java/io/beanmapper/testmodel/numbers/TargetWithDouble.java

@@ -0,0 +1,7 @@
+package io.beanmapper.testmodel.numbers;
+
+public class TargetWithDouble {
+
+    public Double number;
+
+}