Merge branch 'release/v1.2.1'

Author: luankevinferreira

.gitignore

@@ -6,3 +6,4 @@
 /captures
 .idea
 app/app-release.apk
+app/release/

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "luankevinferreira.expenses"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 16
-        versionName "1.2.0"
+        versionCode 17
+        versionName "1.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/androidTest/java/luankevinferreira/expenses/dao/TypeDAOTest.java

@@ -6,22 +6,16 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.util.List;
 
-import luankevinferreira.expenses.domain.Type;
-
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNotNull;
 
-/**
- * Created by Luan Kevin Ferreira.
- */
 @RunWith(AndroidJUnit4.class)
 @LargeTest
 public class TypeDAOTest {
@@ -46,7 +40,7 @@ public void testPreConditions() {
     @Test
     public void testFindAllDescriptions() throws Exception {
         // Prepare
-        String expectedName = "Food";
+        String expectedName = "Clothes";
 
         // Action
         List<String> descriptions = typeDAO.findAllDescriptions();
@@ -56,4 +50,20 @@ public void testFindAllDescriptions() throws Exception {
         assertFalse(descriptions.isEmpty());
         assertEquals(expectedName, descriptions.get(0));
     }
+
+    @Test
+    public void testOrderBy() {
+        // Prepare
+        List<String> descriptions;
+
+        // Action
+        descriptions = typeDAO.findAllDescriptions();
+
+        // Verify
+        assertNotNull(descriptions);
+        assertFalse(descriptions.isEmpty());
+        assertEquals("Clothes", descriptions.get(0));
+        assertEquals("Dwelling", descriptions.get(1));
+        assertEquals("Education", descriptions.get(2));
+    }
 }

app/src/main/java/luankevinferreira/expenses/dao/TypeDAO.java

@@ -41,7 +41,7 @@ private SQLiteDatabase getSqLiteDatabase() {
      * @return list of all description types of expenses stored in the database.
      */
     public List<String> findAllDescriptions() {
-        Cursor cursor = getSqLiteDatabase().rawQuery("SELECT * FROM type", null);
+        Cursor cursor = getSqLiteDatabase().rawQuery("SELECT * FROM type ORDER BY description", null);
 
         List<String> types = new ArrayList<>();