Move tests to uhabits-core

uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java

@@ -115,7 +115,7 @@ public class SQLiteRepetitionList extends RepetitionList
         check(habit.getId());
         repository.execSQL(
             "delete from repetitions where habit = ? and timestamp = ?",
-            habit.getId());
+            habit.getId(), repetition.getTimestamp());
         observable.notifyListeners();
     }
 

uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java

@@ -20,6 +20,7 @@
 package org.isoron.uhabits.core.test;
 
 import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.models.sqlite.*;
 import org.isoron.uhabits.core.utils.*;
 
 public class HabitFixtures
@@ -42,6 +43,8 @@ public class HabitFixtures
         habit.setDescription("Did you meditate this morning?");
         habit.setColor(3);
         habit.setFrequency(Frequency.DAILY);
+        saveIfSQLite(habit);
+
         return habit;
     }
 
@@ -73,6 +76,7 @@ public class HabitFixtures
         habit.setTargetType(Habit.AT_LEAST);
         habit.setTargetValue(2.0);
         habit.setColor(1);
+        saveIfSQLite(habit);
 
         long day = DateUtils.millisecondsInOneDay;
         long today = DateUtils.getStartOfToday();
@@ -94,6 +98,7 @@ public class HabitFixtures
         habit.setName("Wake up early");
         habit.setDescription("Did you wake up before 6am?");
         habit.setFrequency(new Frequency(2, 3));
+        saveIfSQLite(habit);
 
         long timestamp = DateUtils.getStartOfToday();
         for (boolean c : NON_DAILY_HABIT_CHECKS)
@@ -104,4 +109,10 @@ public class HabitFixtures
 
         return habit;
     }
+
+    private void saveIfSQLite(Habit habit)
+    {
+        if (!(habit.getRepetitions() instanceof SQLiteRepetitionList)) return;
+        new SQLiteHabitList(modelFactory).add(habit);
+    }
 }

uhabits-core/src/main/resources/migrations/9.sql

@@ -1,41 +0,0 @@
-create table Habits (
-    id integer primary key autoincrement,
-    archived integer,
-    color integer,
-    description text,
-    freq_den integer,
-    freq_num integer,
-    highlight integer,
-    name text,
-    position integer,
-    reminder_hour integer,
-    reminder_min integer
-);
-
-create table Checkmarks (
-    id integer primary key autoincrement,
-    habit integer references habits(id),
-    timestamp integer,
-    value integer
-);
-
-create table Repetitions (
-    id integer primary key autoincrement,
-    habit integer references habits(id),
-    timestamp integer
-);
-
-create table Streak (
-    id integer primary key autoincrement,
-    end integer,
-    habit integer references habits(id),
-    length integer,
-    start integer
-);
-
-create table Score (
-    id integer primary key autoincrement,
-    habit integer references habits(id),
-    score integer,
-    timestamp integer
-);

uhabits-core/src/test/java/org/isoron/uhabits/BaseUnitTest.java

@@ -47,7 +47,7 @@ public class BaseUnitTest
 
     protected HabitFixtures fixtures;
 
-    protected MemoryModelFactory modelFactory;
+    protected ModelFactory modelFactory;
 
     protected SingleThreadTaskRunner taskRunner;
 

uhabits-core/src/test/java/org/isoron/uhabits/core/db/RepositoryTest.java

@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.uhabits.core.db;
+
+import org.apache.commons.lang3.builder.*;
+import org.isoron.uhabits.*;
+import org.junit.*;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+
+public class RepositoryTest extends BaseUnitTest
+{
+    private Repository<ThingRecord> repository;
+
+    private Database db;
+
+    @Before
+    @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        this.db = buildMemoryDatabase();
+        repository = new Repository<>(ThingRecord.class, db);
+
+        db.execute("drop table if exists tests");
+        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)");
+    }
+
+    @Test
+    public void testFind() throws Exception
+    {
+        db.execute("insert into tests(id, color_number, name, score) " +
+                   "values (10, 20, 'hello', 8.0)");
+
+        ThingRecord record = repository.find(10L);
+
+        assertNotNull(record);
+        assertThat(record.id, equalTo(10L));
+        assertThat(record.color, equalTo(20));
+        assertThat(record.name, equalTo("hello"));
+        assertThat(record.score, equalTo(8.0));
+    }
+
+    @Test
+    public void testSave_withId() throws Exception
+    {
+        ThingRecord record = new ThingRecord();
+        record.id = 50L;
+        record.color = 10;
+        record.name = "hello";
+        record.score = 5.0;
+        repository.save(record);
+        assertThat(record, equalTo(repository.find(50L)));
+
+        record.name = "world";
+        record.score = 128.0;
+        repository.save(record);
+        assertThat(record, equalTo(repository.find(50L)));
+    }
+
+    @Test
+    public void testSave_withoutId() throws Exception
+    {
+        ThingRecord r1 = new ThingRecord();
+        r1.color = 10;
+        r1.name = "hello";
+        r1.score = 16.0;
+        repository.save(r1);
+
+        ThingRecord r2 = new ThingRecord();
+        r2.color = 20;
+        r2.name = "world";
+        r2.score = 2.0;
+        repository.save(r2);
+
+        assertThat(r1.id, equalTo(1L));
+        assertThat(r2.id, equalTo(2L));
+    }
+
+    @Test
+    public void testRemove() throws Exception
+    {
+        ThingRecord rec1 = new ThingRecord();
+        rec1.color = 10;
+        rec1.name = "hello";
+        rec1.score = 16.0;
+        repository.save(rec1);
+
+        ThingRecord rec2 = new ThingRecord();
+        rec2.color = 20;
+        rec2.name = "world";
+        rec2.score = 32.0;
+        repository.save(rec2);
+
+        long id = rec1.id;
+        assertThat(rec1, equalTo(repository.find(id)));
+        assertThat(rec2, equalTo(repository.find(rec2.id)));
+
+        repository.remove(rec1);
+        assertThat(rec1.id, equalTo(null));
+        assertNull(repository.find(id));
+        assertThat(rec2, equalTo(repository.find(rec2.id)));
+
+        repository.remove(rec1); // should have no effect
+        assertNull(repository.find(id));
+    }
+}
+
+@Table(name = "tests")
+class ThingRecord
+{
+    @Column
+    public Long id;
+
+    @Column
+    public String name;
+
+    @Column(name = "color_number")
+    public Integer color;
+
+    @Column
+    public Double score;
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) return true;
+
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ThingRecord record = (ThingRecord) o;
+
+        return new EqualsBuilder()
+            .append(id, record.id)
+            .append(name, record.name)
+            .append(color, record.color)
+            .isEquals();
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return new HashCodeBuilder(17, 37)
+            .append(id)
+            .append(name)
+            .append(color)
+            .toHashCode();
+    }
+
+    @Override
+    public String toString()
+    {
+        return new ToStringBuilder(this)
+            .append("id", id)
+            .append("name", name)
+            .append("color", color)
+            .toString();
+    }
+}

uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java

@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.uhabits.core.models.sqlite;
+
+import android.support.annotation.*;
+
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.db.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.models.sqlite.records.*;
+import org.isoron.uhabits.core.test.*;
+import org.isoron.uhabits.core.utils.*;
+import org.junit.*;
+
+import java.util.*;
+
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.core.IsEqual.*;
+import static org.isoron.uhabits.core.models.Checkmark.CHECKED_EXPLICITLY;
+
+public class SQLiteRepetitionListTest extends BaseUnitTest
+{
+    private Habit habit;
+
+    private long today;
+
+    private RepetitionList repetitions;
+
+    private long day;
+
+    private Repository<RepetitionRecord> repository;
+
+    @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+
+        Database db = buildMemoryDatabase();
+        modelFactory = new SQLModelFactory(db);
+        fixtures = new HabitFixtures(modelFactory);
+        habitList = modelFactory.buildHabitList();
+        repository = new Repository<>(RepetitionRecord.class, db);
+        habit = fixtures.createLongHabit();
+
+        repetitions = habit.getRepetitions();
+        today = DateUtils.getStartOfToday();
+        day = DateUtils.millisecondsInOneDay;
+    }
+
+    @Test
+    public void testAdd()
+    {
+        RepetitionRecord record = getByTimestamp(today + day);
+        assertNull(record);
+
+        Repetition rep = new Repetition(today + day, CHECKED_EXPLICITLY);
+        habit.getRepetitions().add(rep);
+
+        record = getByTimestamp(today + day);
+        assertNotNull(record);
+        assertThat(record.value, equalTo(CHECKED_EXPLICITLY));
+    }
+
+    @Test
+    public void testGetByInterval()
+    {
+        List<Repetition> reps =
+            repetitions.getByInterval(today - 10 * day, today);
+
+        assertThat(reps.size(), equalTo(8));
+        assertThat(reps.get(0).getTimestamp(), equalTo(today - 10 * day));
+        assertThat(reps.get(4).getTimestamp(), equalTo(today - 5 * day));
+        assertThat(reps.get(5).getTimestamp(), equalTo(today - 3 * day));
+    }
+
+    @Test
+    public void testGetByTimestamp()
+    {
+        Repetition rep = repetitions.getByTimestamp(today);
+        assertNotNull(rep);
+        assertThat(rep.getTimestamp(), equalTo(today));
+
+        rep = repetitions.getByTimestamp(today - 2 * day);
+        assertNull(rep);
+    }
+
+    @Test
+    public void testGetOldest()
+    {
+        Repetition rep = repetitions.getOldest();
+        assertNotNull(rep);
+        assertThat(rep.getTimestamp(), equalTo(today - 120 * day));
+    }
+
+    @Test
+    public void testGetOldest_withEmptyHabit()
+    {
+        Habit empty = fixtures.createEmptyHabit();
+        Repetition rep = empty.getRepetitions().getOldest();
+        assertNull(rep);
+    }
+
+    @Test
+    public void testRemove()
+    {
+        RepetitionRecord record = getByTimestamp(today);
+        assertNotNull(record);
+
+        Repetition rep = record.toRepetition();
+        repetitions.remove(rep);
+
+        record = getByTimestamp(today);
+        assertNull(record);
+    }
+
+    @Nullable
+    private RepetitionRecord getByTimestamp(long timestamp)
+    {
+        String query = "where habit = ? and timestamp = ?";
+        String params[] = {
+            Long.toString(habit.getId()), Long.toString(timestamp)
+        };
+
+        return repository.findFirst(query, params);
+    }
+}