isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of null values in AndroidDatabase

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-06-23 09:14:36 -04:00
parent f55dc0d811
commit 5d9563b9d8
7 changed files with 163 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.java
View File

@@ -19,18 +19,50 @@
package org.isoron.uhabits.core.database;
import android.support.annotation.*;
public interface Cursor extends AutoCloseable
{
@Override
void close();
/**
* Moves the cursor forward one row from its current position. Returns
* true if the current position is valid, or false if the cursor is already
* past the last row. The cursor start at position -1, so this method must
* be called first.
*/
boolean moveToNext();
/**
* Retrieves the value of the designated column in the current row of this
* Cursor as an Integer. If the value is null, returns null. The first
* column has index zero.
*/
@Nullable
Integer getInt(int index);
/**
* Retrieves the value of the designated column in the current row of this
* Cursor as a Long. If the value is null, returns null. The first
* column has index zero.
*/
@Nullable
Long getLong(int index);
/**
* Retrieves the value of the designated column in the current row of this
* Cursor as a Double. If the value is null, returns null. The first
* column has index zero.
*/
@Nullable
Double getDouble(int index);
/**
* Retrieves the value of the designated column in the current row of this
* Cursor as a String. If the value is null, returns null. The first
* column has index zero.
*/
@Nullable
String getString(int index);
}

16
uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.java
View File

@@ -63,7 +63,9 @@ public class JdbcCursor implements Cursor
{
try
{
return resultSet.getInt(index + 1);
Integer value = resultSet.getInt(index + 1);
if(resultSet.wasNull()) return null;
else return value;
}
catch (SQLException e)
{
@@ -76,7 +78,9 @@ public class JdbcCursor implements Cursor
{
try
{
return resultSet.getLong(index + 1);
Long value = resultSet.getLong(index + 1);
if(resultSet.wasNull()) return null;
else return value;
}
catch (SQLException e)
{
@@ -89,7 +93,9 @@ public class JdbcCursor implements Cursor
{
try
{
return resultSet.getDouble(index + 1);
Double value = resultSet.getDouble(index + 1);
if(resultSet.wasNull()) return null;
else return value;
}
catch (SQLException e)
{
@@ -102,7 +108,9 @@ public class JdbcCursor implements Cursor
{
try
{
return resultSet.getString(index + 1);
String value = resultSet.getString(index + 1);
if(resultSet.wasNull()) return null;
else return value;
}
catch (SQLException e)
{

17
uhabits-core/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java
View File

@@ -47,7 +47,7 @@ public class RepositoryTest extends BaseUnitTest
db.execute("create table tests(" +
"id integer not null primary key autoincrement, " +
"color_number integer not null, score float not null, " +
"name string not null)");
"name string)");
}
@Test
@@ -82,6 +82,21 @@ public class RepositoryTest extends BaseUnitTest
assertThat(record, equalTo(repository.find(50L)));
}
@Test
public void testSave_withNull() throws Exception
{
ThingRecord record = new ThingRecord();
record.color = 50;
record.name = null;
record.score = 12.0;
repository.save(record);
ThingRecord retrieved = repository.find(record.id);
assertNotNull(retrieved);
assertNull(retrieved.name);
assertThat(record, equalTo(retrieved));
}
@Test
public void testSave_withoutId() throws Exception
{

28
uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java
View File

@@ -32,7 +32,7 @@ public class HabitRecordTest extends BaseUnitTest
{
@Test
public void testCopyFrom()
public void testCopyRestore1()
{
Habit original = modelFactory.buildHabit();
original.setName("Hello world");
@@ -52,4 +52,30 @@ public class HabitRecordTest extends BaseUnitTest
assertThat(original.getData(), equalTo(duplicate.getData()));
}
@Test
public void testCopyRestore2()
{
Habit original = modelFactory.buildHabit();
original.setName("Hello world");
original.setDescription("Did you greet the world today?");
original.setColor(5);
original.setArchived(false);
original.setFrequency(Frequency.DAILY);
original.setReminder(null);
original.setId(1L);
original.setPosition(15);
original.setType(Habit.NUMBER_HABIT);
original.setTargetValue(100);
original.setTargetType(Habit.AT_LEAST);
original.setUnit("miles");
HabitRecord record = new HabitRecord();
record.copyFrom(original);
Habit duplicate = modelFactory.buildHabit();
record.copyTo(duplicate);
assertThat(original.getData(), equalTo(duplicate.getData()));
}
}