Merge pull request #1177 from hiqua/fix_csv_exporter

Use the value of the Entry during CSV export

Author: iSoron

uhabits-core/assets/test/csv_export/001 Meditate/Checkmarks.csv

@@ -0,0 +1 @@
+2015-01-25,0.0000

uhabits-core/assets/test/csv_export/001 Meditate/Scores.csv

@@ -0,0 +1,10 @@
+2015-01-25,2
+2015-01-24,0
+2015-01-23,1
+2015-01-22,2
+2015-01-21,2
+2015-01-20,2
+2015-01-19,1
+2015-01-18,1
+2015-01-17,2
+2015-01-16,2

uhabits-core/assets/test/csv_export/002 Wake up early/Checkmarks.csv

@@ -0,0 +1,10 @@
+2015-01-25,0.2557
+2015-01-24,0.2226
+2015-01-23,0.1991
+2015-01-22,0.1746
+2015-01-21,0.1379
+2015-01-20,0.0995
+2015-01-19,0.0706
+2015-01-18,0.0515
+2015-01-17,0.0315
+2015-01-16,0.0107

uhabits-core/assets/test/csv_export/002 Wake up early/Scores.csv

@@ -0,0 +1,11 @@
+Date,Meditate,Wake up early,
+2015-01-25,-1,2,
+2015-01-24,-1,0,
+2015-01-23,-1,1,
+2015-01-22,-1,2,
+2015-01-21,-1,2,
+2015-01-20,-1,2,
+2015-01-19,-1,1,
+2015-01-18,-1,1,
+2015-01-17,-1,2,
+2015-01-16,-1,2,

uhabits-core/assets/test/csv_export/Checkmarks.csv

@@ -0,0 +1,3 @@
+Position,Name,Question,Description,NumRepetitions,Interval,Color
+001,Meditate,Did you meditate this morning?,,1,1,#FF8F00
+002,Wake up early,Did you wake up before 6am?,,2,3,#00897B

uhabits-core/assets/test/csv_export/Habits.csv

@@ -0,0 +1,11 @@
+Date,Meditate,Wake up early,
+2015-01-25,0.0000,0.2557,
+2015-01-24,0.0000,0.2226,
+2015-01-23,0.0000,0.1991,
+2015-01-22,0.0000,0.1746,
+2015-01-21,0.0000,0.1379,
+2015-01-20,0.0000,0.0995,
+2015-01-19,0.0000,0.0706,
+2015-01-18,0.0000,0.0515,
+2015-01-17,0.0000,0.0315,
+2015-01-16,0.0000,0.0107,

uhabits-core/assets/test/csv_export/Scores.csv

@@ -167,7 +167,7 @@ class HabitsCSVExporter(
             checksWriter.write(sb.toString())
             scoresWriter.write(sb.toString())
             for (j in selectedHabits.indices) {
-                checksWriter.write(checkmarks[j][i].toString())
+                checksWriter.write(checkmarks[j][i].value.toString())
                 checksWriter.write(delimiter)
                 val score = String.format(Locale.US, "%.4f", scores[j][i].value)
                 scoresWriter.write(score)

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitsCSVExporter.kt

@@ -34,19 +34,15 @@ import java.util.zip.ZipFile
 
 class HabitsCSVExporterTest : BaseUnitTest() {
     private lateinit var baseDir: File
+
     @Before
     @Throws(Exception::class)
     override fun setUp() {
         super.setUp()
         habitList.add(fixtures.createShortHabit())
         habitList.add(fixtures.createEmptyHabit())
         baseDir = Files.createTempDirectory("csv").toFile()
-    }
-
-    @Throws(Exception::class)
-    override fun tearDown() {
-        FileUtils.deleteDirectory(baseDir)
-        super.tearDown()
+        baseDir.deleteOnExit()
     }
 
     @Test
@@ -63,14 +59,20 @@ class HabitsCSVExporterTest : BaseUnitTest() {
         assertAbsolutePathExists(filename)
         val archive = File(filename)
         unzip(archive)
-        assertPathExists("Habits.csv")
-        assertPathExists("001 Meditate/Checkmarks.csv")
-        assertPathExists("001 Meditate/Scores.csv")
-        assertPathExists("002 Wake up early")
-        assertPathExists("002 Wake up early/Checkmarks.csv")
-        assertPathExists("002 Wake up early/Scores.csv")
-        assertPathExists("Checkmarks.csv")
-        assertPathExists("Scores.csv")
+        val filesToCheck = arrayOf(
+            "001 Meditate/Checkmarks.csv",
+            "001 Meditate/Scores.csv",
+            "002 Wake up early/Checkmarks.csv",
+            "002 Wake up early/Scores.csv",
+            "Checkmarks.csv",
+            "Habits.csv",
+            "Scores.csv"
+        )
+
+        for (file in filesToCheck) {
+            assertPathExists(file)
+            assertFileAndReferenceAreEqual(file)
+        }
     }
 
     @Throws(IOException::class)
@@ -104,4 +106,18 @@ class HabitsCSVExporterTest : BaseUnitTest() {
             file.exists()
         )
     }
+
+    private fun assertFileAndReferenceAreEqual(s: String) {
+        val assetFilename = String.format("csv_export/%s", s)
+        val file = File.createTempFile("asset", "")
+        file.deleteOnExit()
+        copyAssetToFile(assetFilename, file)
+
+        assertTrue(
+            FileUtils.contentEquals(
+                file,
+                File(String.format("%s/%s", baseDir.absolutePath, s))
+            )
+        )
+    }
 }