From cfac3a9f8e2b1d5e0a8a22479e28e38cb525b7b6 Mon Sep 17 00:00:00 2001 From: Eliezer Graber Date: Thu, 14 Apr 2022 14:30:39 -0400 Subject: [PATCH] Add test failures to see the action in action --- .../sqldelight/adapter/primitive/FloatColumnAdapterTest.kt | 2 +- .../src/test/fixtures_mysql/alter-table-add-constraint/1.s | 4 ++-- .../com/squareup/sqldelight/android/AndroidDriverTest.kt | 2 +- .../com/squareup/sqldelight/driver/test/DriverTest.kt | 2 +- .../drivers/native/NativeSqliteDriverTest.kt.ignore | 4 ++-- .../com/squareup/sqldelight/drivers/sqljs/JsDriverTest.kt | 2 +- .../cash/sqldelight/paging3/KeyedQueryPagingSourceTest.kt | 2 +- .../kotlin/app/cash/sqldelight/coroutines/MappingTest.kt | 2 +- .../app/cash/sqldelight/coroutines/MappingJvmTest.kt | 2 +- .../test/java/app/cash/sqldelight/rx2/QueryJavaTest.java | 7 ++++--- .../kotlin/app/cash/sqldelight/rx2/QueryObservableTest.kt | 2 +- .../test/java/app/cash/sqldelight/rx3/QueryJavaTest.java | 7 ++++--- .../kotlin/app/cash/sqldelight/rx3/QueryObservableTest.kt | 2 +- .../com/squareup/sqldelight/logs/LogSqliteDriverTest.kt | 2 +- .../cash/sqldelight/core/integration/IntegrationTest.kt | 2 +- .../test/kotlin/app/cash/sqldelight/core/ImportTests.kt | 2 +- .../app/cash/sqldelight/mysql/integration/MySqlTest.kt | 2 +- 17 files changed, 25 insertions(+), 23 deletions(-) diff --git a/adapters/primitive-adapters/src/commonTest/kotlin/app/cash/sqldelight/adapter/primitive/FloatColumnAdapterTest.kt b/adapters/primitive-adapters/src/commonTest/kotlin/app/cash/sqldelight/adapter/primitive/FloatColumnAdapterTest.kt index af30fa95f4e5..054a08931036 100644 --- a/adapters/primitive-adapters/src/commonTest/kotlin/app/cash/sqldelight/adapter/primitive/FloatColumnAdapterTest.kt +++ b/adapters/primitive-adapters/src/commonTest/kotlin/app/cash/sqldelight/adapter/primitive/FloatColumnAdapterTest.kt @@ -5,7 +5,7 @@ import kotlin.test.assertEquals class FloatColumnAdapterTest { @Test fun decode() { - assertEquals(10.0f, FloatColumnAdapter.decode(10.0), 1e-6f) + assertEquals(11.0f, FloatColumnAdapter.decode(10.0), 1e-6f) } @Test fun encode() { diff --git a/dialects/mysql/src/test/fixtures_mysql/alter-table-add-constraint/1.s b/dialects/mysql/src/test/fixtures_mysql/alter-table-add-constraint/1.s index 237a5c92fdcc..e79c2c251696 100644 --- a/dialects/mysql/src/test/fixtures_mysql/alter-table-add-constraint/1.s +++ b/dialects/mysql/src/test/fixtures_mysql/alter-table-add-constraint/1.s @@ -2,6 +2,6 @@ CREATE TABLE test ( external_event_id TEXT ); -ALTER TABLE test +ALTE TABLE test ADD CONSTRAINT `idx_external_event_id` - UNIQUE (`external_event_id`); \ No newline at end of file + UNIQUE (`external_event_id`); diff --git a/drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidDriverTest.kt b/drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidDriverTest.kt index 888c346207e3..6c56d95f137d 100644 --- a/drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidDriverTest.kt +++ b/drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidDriverTest.kt @@ -91,6 +91,6 @@ class AndroidDriverTest : DriverTest() { useNoBackupDirectory = false ) - assertFalse(factory.lastConfiguration.useNoBackupDirectory) + assertTrue(factory.lastConfiguration.useNoBackupDirectory) } } diff --git a/drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/DriverTest.kt b/drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/DriverTest.kt index e811bb003961..eceee2278e52 100644 --- a/drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/DriverTest.kt +++ b/drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/DriverTest.kt @@ -193,7 +193,7 @@ abstract class DriverTest { val mapper: (SqlCursor) -> Unit = { assertTrue(it.next()) - assertEquals(1, it.getLong(0)) + assertEquals(2, it.getLong(0)) assertNull(it.getLong(1)) assertNull(it.getString(2)) assertNull(it.getBytes(3)) diff --git a/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeSqliteDriverTest.kt.ignore b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeSqliteDriverTest.kt.ignore index 64eaaa3d620d..5473f75189cc 100644 --- a/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeSqliteDriverTest.kt.ignore +++ b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeSqliteDriverTest.kt.ignore @@ -42,7 +42,7 @@ class NativeSqliteDriverTestMemory : NativeSqliteDriverTest() { val dbm = createDatabaseManager(config) dbm.createMultiThreadedConnection().close() - assertFalse(closed.value) + assertTrue(closed.value) } } @@ -409,4 +409,4 @@ abstract class NativeSqliteDriverTest : LazyDriverBaseTest() { assertEquals(0, driver.transactionPool.entry.statementCache.size) } -} \ No newline at end of file +} diff --git a/drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsDriverTest.kt b/drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsDriverTest.kt index dcf5369db75c..5233d9fb98c5 100644 --- a/drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsDriverTest.kt +++ b/drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsDriverTest.kt @@ -89,7 +89,7 @@ class JsDriverTest { } query { - assertTrue(it.next()) + assertFalse(it.next()) assertFalse(it.next()) } diff --git a/extensions/android-paging3/src/test/java/app/cash/sqldelight/paging3/KeyedQueryPagingSourceTest.kt b/extensions/android-paging3/src/test/java/app/cash/sqldelight/paging3/KeyedQueryPagingSourceTest.kt index 31c532b7c6fb..725c84c28c42 100644 --- a/extensions/android-paging3/src/test/java/app/cash/sqldelight/paging3/KeyedQueryPagingSourceTest.kt +++ b/extensions/android-paging3/src/test/java/app/cash/sqldelight/paging3/KeyedQueryPagingSourceTest.kt @@ -79,7 +79,7 @@ class KeyedQueryPagingSourceTest { val results = runBlocking { source.load(Refresh(key = 5L, loadSize = 2, false)) } - assertEquals(listOf(5L), (results as LoadResult.Page).data) + assertEquals(listOf(6L), (results as LoadResult.Page).data) } @Test fun `misaligned last page has correct data`() { diff --git a/extensions/coroutines-extensions/src/commonTest/kotlin/app/cash/sqldelight/coroutines/MappingTest.kt b/extensions/coroutines-extensions/src/commonTest/kotlin/app/cash/sqldelight/coroutines/MappingTest.kt index 865747eb1573..b614416ea19b 100644 --- a/extensions/coroutines-extensions/src/commonTest/kotlin/app/cash/sqldelight/coroutines/MappingTest.kt +++ b/extensions/coroutines-extensions/src/commonTest/kotlin/app/cash/sqldelight/coroutines/MappingTest.kt @@ -24,7 +24,7 @@ class MappingTest : DbTest { .asFlow() .mapToOne(coroutineContext) .test { - assertEquals(Employee("alice", "Alice Allison"), awaitItem()) + assertEquals(Employee("al1ce", "Alice Allison"), awaitItem()) cancel() } } diff --git a/extensions/coroutines-extensions/src/jvmTest/kotlin/app/cash/sqldelight/coroutines/MappingJvmTest.kt b/extensions/coroutines-extensions/src/jvmTest/kotlin/app/cash/sqldelight/coroutines/MappingJvmTest.kt index 68386540f713..1b47718ce6b8 100644 --- a/extensions/coroutines-extensions/src/jvmTest/kotlin/app/cash/sqldelight/coroutines/MappingJvmTest.kt +++ b/extensions/coroutines-extensions/src/jvmTest/kotlin/app/cash/sqldelight/coroutines/MappingJvmTest.kt @@ -80,7 +80,7 @@ class MappingJvmTest : DbTest { } } - assertEquals(0, seen) + assertEquals(1, seen) testScope.testScheduler.advanceUntilIdle() assertEquals(1, seen) diff --git a/extensions/rxjava2-extensions/src/test/java/app/cash/sqldelight/rx2/QueryJavaTest.java b/extensions/rxjava2-extensions/src/test/java/app/cash/sqldelight/rx2/QueryJavaTest.java index ac89a4419fb7..cb642c43c6d8 100644 --- a/extensions/rxjava2-extensions/src/test/java/app/cash/sqldelight/rx2/QueryJavaTest.java +++ b/extensions/rxjava2-extensions/src/test/java/app/cash/sqldelight/rx2/QueryJavaTest.java @@ -2,11 +2,12 @@ import app.cash.sqldelight.Query; import io.reactivex.schedulers.Schedulers; -import java.util.Arrays; -import java.util.Optional; import org.junit.After; import org.junit.Test; +import java.util.Arrays; +import java.util.Optional; + import static app.cash.sqldelight.rx2.Employee.MAPPER; import static app.cash.sqldelight.rx2.Employee.SELECT_EMPLOYEES; import static app.cash.sqldelight.rx2.TestDb.TABLE_EMPLOYEE; @@ -23,7 +24,7 @@ public final class QueryJavaTest { RxQuery.toObservable(query, Schedulers.trampoline()) .to(RxQuery::mapToOne) .test() - .assertValue(new Employee("alice", "Alice Allison")); + .assertValue(new Employee("al1ce", "Alice Allison")); } @Test public void mapToOneOrDefault() { diff --git a/extensions/rxjava2-extensions/src/test/kotlin/app/cash/sqldelight/rx2/QueryObservableTest.kt b/extensions/rxjava2-extensions/src/test/kotlin/app/cash/sqldelight/rx2/QueryObservableTest.kt index 308ba10ea5df..b734b602c76b 100644 --- a/extensions/rxjava2-extensions/src/test/kotlin/app/cash/sqldelight/rx2/QueryObservableTest.kt +++ b/extensions/rxjava2-extensions/src/test/kotlin/app/cash/sqldelight/rx2/QueryObservableTest.kt @@ -33,7 +33,7 @@ class QueryObservableTest { .mapToList() .test() .assertNoValues() - .assertError(error) + .assertNoErrors() db.close() } diff --git a/extensions/rxjava3-extensions/src/test/java/app/cash/sqldelight/rx3/QueryJavaTest.java b/extensions/rxjava3-extensions/src/test/java/app/cash/sqldelight/rx3/QueryJavaTest.java index 7e768727ccad..409fc7212c53 100644 --- a/extensions/rxjava3-extensions/src/test/java/app/cash/sqldelight/rx3/QueryJavaTest.java +++ b/extensions/rxjava3-extensions/src/test/java/app/cash/sqldelight/rx3/QueryJavaTest.java @@ -2,11 +2,12 @@ import app.cash.sqldelight.Query; import io.reactivex.rxjava3.schedulers.Schedulers; -import java.util.Arrays; -import java.util.Optional; import org.junit.After; import org.junit.Test; +import java.util.Arrays; +import java.util.Optional; + import static app.cash.sqldelight.rx3.Employee.MAPPER; import static app.cash.sqldelight.rx3.Employee.SELECT_EMPLOYEES; import static app.cash.sqldelight.rx3.TestDb.TABLE_EMPLOYEE; @@ -23,7 +24,7 @@ public final class QueryJavaTest { RxQuery.toObservable(query, Schedulers.trampoline()) .to(RxQuery::mapToOne) .test() - .assertValue(new Employee("alice", "Alice Allison")); + .assertValue(new Employee("al1ce", "Alice Allison")); } @Test public void mapToOneOrDefault() { diff --git a/extensions/rxjava3-extensions/src/test/kotlin/app/cash/sqldelight/rx3/QueryObservableTest.kt b/extensions/rxjava3-extensions/src/test/kotlin/app/cash/sqldelight/rx3/QueryObservableTest.kt index eca0cc275191..00fbf8106cdb 100644 --- a/extensions/rxjava3-extensions/src/test/kotlin/app/cash/sqldelight/rx3/QueryObservableTest.kt +++ b/extensions/rxjava3-extensions/src/test/kotlin/app/cash/sqldelight/rx3/QueryObservableTest.kt @@ -21,7 +21,7 @@ class QueryObservableTest { query.asObservable(Schedulers.trampoline()).mapToList() .test() .assertNoValues() - .assertError(error) + .assertNoErrors() } @Test fun mapToListThrowsFromMapFunction() { diff --git a/runtime/src/commonTest/kotlin/com/squareup/sqldelight/logs/LogSqliteDriverTest.kt b/runtime/src/commonTest/kotlin/com/squareup/sqldelight/logs/LogSqliteDriverTest.kt index 1b494d79e513..f297c381bfa5 100644 --- a/runtime/src/commonTest/kotlin/com/squareup/sqldelight/logs/LogSqliteDriverTest.kt +++ b/runtime/src/commonTest/kotlin/com/squareup/sqldelight/logs/LogSqliteDriverTest.kt @@ -44,7 +44,7 @@ class LogSqliteDriverTest { insert {} - assertEquals("EXECUTE\n INSERT INTO test VALUES (?, ?);", logs[0]) + assertEquals("XECUTE\n INSERT INTO test VALUES (?, ?);", logs[0]) assertEquals(" [1, Alec]", logs[1]) assertEquals("EXECUTE\n INSERT INTO test VALUES (?, ?);", logs[2]) } diff --git a/sqldelight-compiler/integration-tests/src/test/kotlin/app/cash/sqldelight/core/integration/IntegrationTest.kt b/sqldelight-compiler/integration-tests/src/test/kotlin/app/cash/sqldelight/core/integration/IntegrationTest.kt index 216e598f1c16..0865ed9fc7fe 100644 --- a/sqldelight-compiler/integration-tests/src/test/kotlin/app/cash/sqldelight/core/integration/IntegrationTest.kt +++ b/sqldelight-compiler/integration-tests/src/test/kotlin/app/cash/sqldelight/core/integration/IntegrationTest.kt @@ -166,7 +166,7 @@ class IntegrationTest { @Test fun `escaped named are handled correctly`() { val allGroups = queryWrapper.groupQueries.selectAll().executeAsList() - assertThat(allGroups).containsExactly(1L, 2L, 3L) + assertThat(allGroups).containsExactly(2L, 3L) } @Test fun `allPlayers properly triggers from inserts`() { diff --git a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/ImportTests.kt b/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/ImportTests.kt index 70a03acae50f..a1d661e360ce 100644 --- a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/ImportTests.kt +++ b/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/ImportTests.kt @@ -23,7 +23,7 @@ class ImportTests { ) assertThat(result.errors).containsExactly( - "Test.sq: (1, 0): Multiple imports for type Thing", + "est.sq: (1, 0): Multiple imports for type Thing", "Test.sq: (2, 0): Multiple imports for type Thing" ) } diff --git a/sqldelight-gradle-plugin/src/test/integration-mysql/src/test/kotlin/app/cash/sqldelight/mysql/integration/MySqlTest.kt b/sqldelight-gradle-plugin/src/test/integration-mysql/src/test/kotlin/app/cash/sqldelight/mysql/integration/MySqlTest.kt index ac4b026ef4f4..555f036f9bef 100644 --- a/sqldelight-gradle-plugin/src/test/integration-mysql/src/test/kotlin/app/cash/sqldelight/mysql/integration/MySqlTest.kt +++ b/sqldelight-gradle-plugin/src/test/integration-mysql/src/test/kotlin/app/cash/sqldelight/mysql/integration/MySqlTest.kt @@ -96,7 +96,7 @@ class MySqlTest { time = LocalTime.of(21, 30, 59), datetime = LocalDateTime.of(2020, 1, 1, 21, 30, 59), timestamp = OffsetDateTime.of(1980, 4, 9, 20, 15, 45, 0, ZoneOffset.ofHours(0)), - year = "2022-01-01" + year = "2022" ) ) }