apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed redundant Integer instantiation in GenericDaoBase

Browse Source 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
This commit is contained in:
Laszlo Hornyak 2014-03-28 18:33:48 +01:00
parent 05c9d54c4f
commit 54c83c168f
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/db/src/com/cloud/utils/db/GenericDaoBase.java
View File

@ -686,12 +686,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return null; return null;
} }
} else if (type == int.class) { } else if (type == int.class) {
return (M)new Integer(rs.getInt(index)); return (M) (Integer) rs.getInt(index);
} else if (type == Integer.class) { } else if (type == Integer.class) {
if (rs.getObject(index) == null) { if (rs.getObject(index) == null) {
return null; return null;
} else { } else {
return (M)new Integer(rs.getInt(index)); return (M) (Integer) rs.getInt(index);
} }
} else if (type == long.class) { } else if (type == long.class) {
return (M) (Long) rs.getLong(index); return (M) (Long) rs.getLong(index);

29
framework/db/test/com/cloud/utils/db/GenericDaoBaseTest.java
View File

@ -19,8 +19,7 @@ package com.cloud.utils.db;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import junit.framework.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@ -73,7 +72,7 @@ public class GenericDaoBaseTest {
Mockito.when(resultSet.getObject(1)).thenReturn(0.1f); Mockito.when(resultSet.getObject(1)).thenReturn(0.1f);
Mockito.when(resultSet.getFloat(1)).thenReturn(0.1f); Mockito.when(resultSet.getFloat(1)).thenReturn(0.1f);
Assert.assertEquals(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); Mockito.verify(resultSet).getFloat(1);
} }
@ -82,7 +81,7 @@ public class GenericDaoBaseTest {
Mockito.when(resultSet.getObject(1)).thenReturn(0.1f); Mockito.when(resultSet.getObject(1)).thenReturn(0.1f);
Mockito.when(resultSet.getFloat(1)).thenReturn(0.1f); Mockito.when(resultSet.getFloat(1)).thenReturn(0.1f);
Assert.assertEquals(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); Mockito.verify(resultSet).getFloat(1);
} }
@ -91,7 +90,7 @@ public class GenericDaoBaseTest {
Mockito.when(resultSet.getObject(1)).thenReturn(0.1d); Mockito.when(resultSet.getObject(1)).thenReturn(0.1d);
Mockito.when(resultSet.getDouble(1)).thenReturn(0.1d); Mockito.when(resultSet.getDouble(1)).thenReturn(0.1d);
Assert.assertEquals(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); Mockito.verify(resultSet).getDouble(1);
} }
@ -100,7 +99,7 @@ public class GenericDaoBaseTest {
Mockito.when(resultSet.getObject(1)).thenReturn(0.1d); Mockito.when(resultSet.getObject(1)).thenReturn(0.1d);
Mockito.when(resultSet.getDouble(1)).thenReturn(0.1d); Mockito.when(resultSet.getDouble(1)).thenReturn(0.1d);
Assert.assertEquals(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); Mockito.verify(resultSet).getDouble(1);
} }
@ -122,6 +121,24 @@ public class GenericDaoBaseTest {
Mockito.verify(resultSet).getLong(1); Mockito.verify(resultSet).getLong(1);
} }
@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 @Test
public void getObjectPrimitiveByte() throws SQLException { public void getObjectPrimitiveByte() throws SQLException {
Mockito.when(resultSet.getObject(1)).thenReturn((byte) 1); Mockito.when(resultSet.getObject(1)).thenReturn((byte) 1);