From 09794ccb68522d355a170b42d392ec939a505931 Mon Sep 17 00:00:00 2001
From: Quentin Hibon <qh.public@yahoo.com>
Date: Thu, 21 Jan 2021 19:47:19 +0100
Subject: [PATCH] Move ThingRecord back into RepositoryTest

---
 .../uhabits/core/database/RepositoryTest.kt   | 44 ++++++++++++++++++
 .../uhabits/core/database/ThingRecord.kt      | 46 -------------------
 2 files changed, 44 insertions(+), 46 deletions(-)
 delete mode 100644 uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/database/ThingRecord.kt

diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/database/RepositoryTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/database/RepositoryTest.kt
index 1d13b98a0..96ffa6cbd 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/database/RepositoryTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/database/RepositoryTest.kt
@@ -18,6 +18,9 @@
  */
 package org.isoron.uhabits.core.database
 
+import org.apache.commons.lang3.builder.EqualsBuilder
+import org.apache.commons.lang3.builder.HashCodeBuilder
+import org.apache.commons.lang3.builder.ToStringBuilder
 import org.hamcrest.MatcherAssert
 import org.hamcrest.core.IsEqual
 import org.isoron.uhabits.core.BaseUnitTest
@@ -153,4 +156,45 @@ class RepositoryTest : BaseUnitTest() {
         repository!!.remove(rec1) // should have no effect
         Assert.assertNull(repository!!.find(id))
     }
+
+    @Table(name = "tests")
+    class ThingRecord {
+        @field:Column
+        var id: Long? = null
+
+        @field:Column
+        var name: String? = null
+
+        @field:Column(name = "color_number")
+        var color: Int? = null
+
+        @field:Column
+        var score: Double? = null
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other == null || javaClass != other.javaClass) return false
+            val record = other as ThingRecord
+            return EqualsBuilder()
+                .append(id, record.id)
+                .append(name, record.name)
+                .append(color, record.color)
+                .isEquals
+        }
+
+        override fun hashCode(): Int {
+            return HashCodeBuilder(17, 37)
+                .append(id)
+                .append(name)
+                .append(color)
+                .toHashCode()
+        }
+
+        override fun toString(): String {
+            return ToStringBuilder(this)
+                .append("id", id)
+                .append("name", name)
+                .append("color", color)
+                .toString()
+        }
+    }
 }
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/database/ThingRecord.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/database/ThingRecord.kt
deleted file mode 100644
index ac3a252db..000000000
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/database/ThingRecord.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.isoron.uhabits.core.database
-
-import org.apache.commons.lang3.builder.EqualsBuilder
-import org.apache.commons.lang3.builder.HashCodeBuilder
-import org.apache.commons.lang3.builder.ToStringBuilder
-
-@Table(name = "tests")
-class ThingRecord {
-    @field:Column
-    var id: Long? = null
-
-    @field:Column
-    var name: String? = null
-
-    @field:Column(name = "color_number")
-    var color: Int? = null
-
-    @field:Column
-    var score: Double? = null
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || javaClass != other.javaClass) return false
-        val record = other as ThingRecord
-        return EqualsBuilder()
-            .append(id, record.id)
-            .append(name, record.name)
-            .append(color, record.color)
-            .isEquals
-    }
-
-    override fun hashCode(): Int {
-        return HashCodeBuilder(17, 37)
-            .append(id)
-            .append(name)
-            .append(color)
-            .toHashCode()
-    }
-
-    override fun toString(): String {
-        return ToStringBuilder(this)
-            .append("id", id)
-            .append("name", name)
-            .append("color", color)
-            .toString()
-    }
-}