Skip to content

Commit 419fe2e

Browse files
authored
CASL-792 tests cleanup (#404)
1 parent 7afcca4 commit 419fe2e

File tree

17 files changed

+54
-2882
lines changed

17 files changed

+54
-2882
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package naksha.model
2+
3+
import kotlin.test.Test
4+
import kotlin.test.assertEquals
5+
6+
class PlatformTest {
7+
8+
@Test
9+
fun testPartitionNumber() {
10+
// expect
11+
val collectionPartitions = 128
12+
assertEquals(44, Naksha.partitionNumber("foo") % collectionPartitions)
13+
assertEquals(127, Naksha.partitionNumber("fooA") % collectionPartitions)
14+
assertEquals(19, Naksha.partitionNumber("fooB") % collectionPartitions)
15+
assertEquals(39, Naksha.partitionNumber("fooC") % collectionPartitions)
16+
assertEquals(70, Naksha.partitionNumber("fooD") % collectionPartitions)
17+
}
18+
19+
}

here-naksha-lib-psql/src/commonTest/kotlin/naksha/psql/CollectionTests.kt

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import naksha.model.NakshaError
88
import naksha.model.objects.NakshaCollection
99
import naksha.model.objects.NakshaFeature
1010
import naksha.model.objects.StoreMode
11+
import naksha.model.request.ErrorResponse
1112
import naksha.model.request.ReadFeatures
1213
import naksha.model.request.Write
1314
import naksha.model.request.WriteRequest
@@ -112,7 +113,7 @@ class CollectionTests : PgTestBase(collection = null) {
112113
indices.add(cursor["indexname"])
113114
}
114115
assertTrue(PgIndex.DEFAULT_INDICES.size <= indices.size)
115-
assertTrue(PgIndex.DEFAULT_INDICES.all { index -> indices.any { addedIndex -> addedIndex.contains(index)}})
116+
assertTrue(PgIndex.DEFAULT_INDICES.all { index -> indices.any { addedIndex -> addedIndex.contains(index) } })
116117
cursor.close()
117118
}
118119

@@ -147,22 +148,22 @@ class CollectionTests : PgTestBase(collection = null) {
147148
readFeature.featureIds.add(feature.id)
148149
executeWrite(
149150
WriteRequest().add(
150-
Write().createFeature(null, collectionName,feature)
151+
Write().createFeature(null, collectionName, feature)
151152
)
152153
)
153154
val insertedFeatureResponse = executeRead(readFeature)
154-
assertEquals(1,insertedFeatureResponse.features.size)
155+
assertEquals(1, insertedFeatureResponse.features.size)
155156
feature.properties["foo"] = "bar"
156157
executeWrite(
157158
WriteRequest().add(
158-
Write().updateFeature(null, collectionName,feature)
159+
Write().updateFeature(null, collectionName, feature)
159160
)
160161
)
161162
val updatedFeatureResponse = executeRead(readFeature)
162163
assertEquals("bar", updatedFeatureResponse.features[0]?.properties!!["foo"])
163164
executeWrite(
164165
WriteRequest().add(
165-
Write().deleteFeatureById(null, collectionName,feature.id)
166+
Write().deleteFeatureById(null, collectionName, feature.id)
166167
)
167168
)
168169
val deletedFeatureResponse = executeRead(readFeature)
@@ -175,7 +176,7 @@ class CollectionTests : PgTestBase(collection = null) {
175176
val collection = NakshaCollection(
176177
id = collectionName,
177178
storeDeleted = StoreMode.OFF
178-
)
179+
)
179180
executeWrite(
180181
WriteRequest().add(
181182
Write().createCollection(null, collection)
@@ -200,22 +201,22 @@ class CollectionTests : PgTestBase(collection = null) {
200201
readFeature.featureIds.add(feature.id)
201202
executeWrite(
202203
WriteRequest().add(
203-
Write().createFeature(null, collectionName,feature)
204+
Write().createFeature(null, collectionName, feature)
204205
)
205206
)
206207
val insertedFeatureResponse = executeRead(readFeature)
207-
assertEquals(1,insertedFeatureResponse.features.size)
208+
assertEquals(1, insertedFeatureResponse.features.size)
208209
feature.properties["foo"] = "bar"
209210
executeWrite(
210211
WriteRequest().add(
211-
Write().updateFeature(null, collectionName,feature)
212+
Write().updateFeature(null, collectionName, feature)
212213
)
213214
)
214215
val updatedFeatureResponse = executeRead(readFeature)
215216
assertEquals("bar", updatedFeatureResponse.features[0]?.properties!!["foo"])
216217
executeWrite(
217218
WriteRequest().add(
218-
Write().deleteFeatureById(null, collectionName,feature.id)
219+
Write().deleteFeatureById(null, collectionName, feature.id)
219220
)
220221
)
221222
val deletedFeatureResponse = executeRead(readFeature)
@@ -301,4 +302,28 @@ class CollectionTests : PgTestBase(collection = null) {
301302
// then
302303
assertNull(response.resultSet?.result?.get(0))
303304
}
305+
306+
@Test
307+
fun testCreateExistingCollection() {
308+
// Given: collection in db
309+
val collectionId = "test_create_existing_collection"
310+
executeWrite(
311+
WriteRequest().add(
312+
Write().createCollection(null, NakshaCollection(collectionId))
313+
)
314+
)
315+
316+
// When: create same collection once again
317+
val response = env.storage.newWriteSession().use { session ->
318+
session.execute(
319+
WriteRequest().add(
320+
Write().createCollection(null, NakshaCollection(collectionId))
321+
)
322+
)
323+
}
324+
325+
// Then
326+
assertIs<ErrorResponse>(response)
327+
assertEquals(NakshaError.CONFLICT, response.error.code)
328+
}
304329
}

here-naksha-lib-psql/src/jvmTest/java_to_fix/com/here/naksha/lib/psql/JsonUtil.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

here-naksha-lib-psql/src/jvmTest/java_to_fix/com/here/naksha/lib/psql/PostgresStorageTest.java

Lines changed: 0 additions & 88 deletions
This file was deleted.

here-naksha-lib-psql/src/jvmTest/java_to_fix/com/here/naksha/lib/psql/PostgresWriteFeaturesToPartitionTest.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)