Repository: cloudstack Updated Branches: refs/heads/master 9b16a6dfd -> 54c83c168
removed redundant Integer instantiation in GenericDaoBase Signed-off-by: Laszlo Hornyak <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54c83c16 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54c83c16 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54c83c16 Branch: refs/heads/master Commit: 54c83c168f4a8b0d63bd99ad3cbf7082ded081f4 Parents: 05c9d54 Author: Laszlo Hornyak <[email protected]> Authored: Fri Mar 28 18:33:48 2014 +0100 Committer: Laszlo Hornyak <[email protected]> Committed: Fri Mar 28 18:40:25 2014 +0100 ---------------------------------------------------------------------- .../src/com/cloud/utils/db/GenericDaoBase.java | 4 +-- .../com/cloud/utils/db/GenericDaoBaseTest.java | 29 ++++++++++++++++---- 2 files changed, 25 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54c83c16/framework/db/src/com/cloud/utils/db/GenericDaoBase.java ---------------------------------------------------------------------- diff --git a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java index cecea84..2052aad 100755 --- a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java +++ b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java @@ -686,12 +686,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone return null; } } else if (type == int.class) { - return (M)new Integer(rs.getInt(index)); + return (M) (Integer) rs.getInt(index); } else if (type == Integer.class) { if (rs.getObject(index) == null) { return null; } else { - return (M)new Integer(rs.getInt(index)); + return (M) (Integer) rs.getInt(index); } } else if (type == long.class) { return (M) (Long) rs.getLong(index); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54c83c16/framework/db/test/com/cloud/utils/db/GenericDaoBaseTest.java ---------------------------------------------------------------------- diff --git a/framework/db/test/com/cloud/utils/db/GenericDaoBaseTest.java b/framework/db/test/com/cloud/utils/db/GenericDaoBaseTest.java index b7febcb..aef0c69 100644 --- a/framework/db/test/com/cloud/utils/db/GenericDaoBaseTest.java +++ b/framework/db/test/com/cloud/utils/db/GenericDaoBaseTest.java @@ -19,8 +19,7 @@ package com.cloud.utils.db; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -73,7 +72,7 @@ public class GenericDaoBaseTest { Mockito.when(resultSet.getObject(1)).thenReturn(0.1f); Mockito.when(resultSet.getFloat(1)).thenReturn(0.1f); Assert.assertEquals(0.1f, - GenericDaoBase.getObject(Float.class, resultSet, 1)); + GenericDaoBase.getObject(Float.class, resultSet, 1), 0.1); Mockito.verify(resultSet).getFloat(1); } @@ -82,7 +81,7 @@ public class GenericDaoBaseTest { Mockito.when(resultSet.getObject(1)).thenReturn(0.1f); Mockito.when(resultSet.getFloat(1)).thenReturn(0.1f); Assert.assertEquals(0.1f, - GenericDaoBase.getObject(float.class, resultSet, 1)); + GenericDaoBase.getObject(float.class, resultSet, 1), 0.1); Mockito.verify(resultSet).getFloat(1); } @@ -91,7 +90,7 @@ public class GenericDaoBaseTest { Mockito.when(resultSet.getObject(1)).thenReturn(0.1d); Mockito.when(resultSet.getDouble(1)).thenReturn(0.1d); Assert.assertEquals(0.1d, - GenericDaoBase.getObject(double.class, resultSet, 1)); + GenericDaoBase.getObject(double.class, resultSet, 1), 0.1); Mockito.verify(resultSet).getDouble(1); } @@ -100,7 +99,7 @@ public class GenericDaoBaseTest { Mockito.when(resultSet.getObject(1)).thenReturn(0.1d); Mockito.when(resultSet.getDouble(1)).thenReturn(0.1d); Assert.assertEquals(0.1d, - GenericDaoBase.getObject(Double.class, resultSet, 1)); + GenericDaoBase.getObject(Double.class, resultSet, 1), 0.1); Mockito.verify(resultSet).getDouble(1); } @@ -123,6 +122,24 @@ public class GenericDaoBaseTest { } @Test + public void getObjectPrimitiveInt() throws SQLException { + Mockito.when(resultSet.getObject(1)).thenReturn(1l); + Mockito.when(resultSet.getInt(1)).thenReturn(1); + Assert.assertEquals((Integer) 1, + GenericDaoBase.getObject(int.class, resultSet, 1)); + Mockito.verify(resultSet).getInt(1); + } + + @Test + public void getObjectInteger() throws SQLException { + Mockito.when(resultSet.getObject(1)).thenReturn(1l); + Mockito.when(resultSet.getInt(1)).thenReturn(1); + Assert.assertEquals((Integer) 1, + GenericDaoBase.getObject(Integer.class, resultSet, 1)); + Mockito.verify(resultSet).getInt(1); + } + + @Test public void getObjectPrimitiveByte() throws SQLException { Mockito.when(resultSet.getObject(1)).thenReturn((byte) 1); Mockito.when(resultSet.getByte(1)).thenReturn((byte) 1);
