Merge pull request #107 from JetBrains/xd-969-1

Valid tests were enabled.

dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/TransientEntityImpl.kt

@@ -22,6 +22,7 @@ import jetbrains.exodus.entitystore.iterate.EntityIterableBase
 import jetbrains.exodus.entitystore.iterate.EntityIteratorWithPropId
 import jetbrains.exodus.entitystore.orientdb.OEntity
 import jetbrains.exodus.entitystore.orientdb.OReadonlyVertexEntity
+import jetbrains.exodus.entitystore.orientdb.iterate.OQueryEntityIterator
 import java.io.File
 import java.io.InputStream
 

dnq/src/main/kotlin/kotlinx/dnq/query/NodeBaseOperations.kt

@@ -17,6 +17,7 @@ package kotlinx.dnq.query
 
 import jetbrains.exodus.entitystore.Entity
 import jetbrains.exodus.entitystore.iterate.EntityIterableBase
+import jetbrains.exodus.entitystore.util.unsupported
 import jetbrains.exodus.query.*
 import jetbrains.exodus.query.metadata.ModelMetaData
 import kotlinx.dnq.XdEntity
@@ -396,15 +397,6 @@ inline infix fun <reified R : XdEntity, T : Comparable<T>> KProperty1<R, Set<T>>
     return eq(this.getDBName(R::class), value)
 }
 
-/**
- * Returns new [NodeBase] representing filter:
- *
- * value of `this` Set<String> property contains element that starts with the given [value].
- */
-inline infix fun <reified R : XdEntity> KProperty1<R, Set<String>>.anyStartsWith(value: String?): NodeBase {
-    return startsWith(getDBName(R::class), value)
-}
-
 /**
  * Returns new [NodeBase] representing filter:
  *

dnq/src/test/kotlin/kotlinx/dnq/MutableSetPropertyTest.kt

@@ -19,13 +19,11 @@ import com.google.common.truth.IterableSubject
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.Truth.assertWithMessage
 import jetbrains.exodus.entitystore.Entity
-import kotlinx.dnq.query.anyStartsWith
 import kotlinx.dnq.query.contains
 import kotlinx.dnq.query.query
 import kotlinx.dnq.query.toList
 import kotlinx.dnq.util.hasChanges
 import kotlinx.dnq.util.isDefined
-import org.junit.Ignore
 import org.junit.Test
 
 class MutableSetPropertyTest : DBTest() {
@@ -102,22 +100,6 @@ class MutableSetPropertyTest : DBTest() {
         }
     }
 
-    @Test
-    @Ignore
-    fun `anyStartsWith query`() {
-        val employee = store.transactional {
-            Employee.new { skills.addAll(listOf("Java", "Kotlin", "Xodus-DNQ")) }
-        }
-
-        store.transactional {
-            assertThat(Employee.query(Employee::skills anyStartsWith "Kot").toList())
-                    .containsExactly(employee)
-
-            assertThat(Employee.query(Employee::skills anyStartsWith "Sc").toList())
-                    .isEmpty()
-        }
-    }
-
     private fun createEmployee(vararg skills: String): Employee {
         return transactional {
             Employee.new { this.skills.addAll(skills) }

dnq/src/test/kotlin/kotlinx/dnq/SetPropertyTest.kt

@@ -17,12 +17,10 @@ package kotlinx.dnq
 
 import com.google.common.truth.Truth.assertThat
 import jetbrains.exodus.entitystore.Entity
-import kotlinx.dnq.query.anyStartsWith
 import kotlinx.dnq.query.contains
 import kotlinx.dnq.query.query
 import kotlinx.dnq.query.toList
 import kotlinx.dnq.util.isDefined
-import org.junit.Ignore
 import org.junit.Test
 
 class SetPropertyTest : DBTest() {
@@ -58,7 +56,7 @@ class SetPropertyTest : DBTest() {
 
         store.transactional {
             assertThat(employee.skills)
-                    .containsExactly("Java", "Kotlin", "Xodus-DNQ")
+                .containsExactly("Java", "Kotlin", "Xodus-DNQ")
         }
     }
 
@@ -108,26 +106,10 @@ class SetPropertyTest : DBTest() {
 
         store.transactional {
             assertThat(Employee.query(Employee::skills contains "Kotlin").toList())
-                    .containsExactly(employee)
+                .containsExactly(employee)
 
             assertThat(Employee.query(Employee::skills contains "Scala").toList())
-                    .isEmpty()
-        }
-    }
-
-    @Test
-    @Ignore
-    fun `anyStartsWith query`() {
-        val employee = store.transactional {
-            Employee.new { skills = setOf("Java", "Kotlin", "Xodus-DNQ") }
-        }
-
-        store.transactional {
-            assertThat(Employee.query(Employee::skills anyStartsWith "Kot").toList())
-                    .containsExactly(employee)
-
-            assertThat(Employee.query(Employee::skills anyStartsWith "Sc").toList())
-                    .isEmpty()
+                .isEmpty()
         }
     }
 }

dnq/src/test/kotlin/kotlinx/dnq/concurrent/ConcurrentAggregationTest.kt

@@ -47,7 +47,6 @@ class ConcurrentAggregationTest : DBTest() {
     }
 
     @Test
-    @Ignore
     fun setOneToOne() {
         val focus = transactional { Car.new() }
         val c4 = transactional { Car.new() }
@@ -72,7 +71,6 @@ class ConcurrentAggregationTest : DBTest() {
     }
 
     @Test
-    @Ignore
     fun setManyToOne() {
         val focus = transactional { Car.new() }
         val c4 = transactional { Car.new() }
@@ -96,7 +94,6 @@ class ConcurrentAggregationTest : DBTest() {
     }
 
     @Test
-    @Ignore
     fun setManyToOne2() {
         val focus = transactional { txn ->
             val focus = Car.new()

dnq/src/test/kotlin/kotlinx/dnq/concurrent/DirectedAssociationTest.kt

@@ -69,7 +69,6 @@ class DirectedAssociationTest : DBTest() {
     }
 
     @Test
-    @Ignore
     fun createToMany() {
         val phone = transactional { txn ->
             val phone = Phone.new()

dnq/src/test/kotlin/kotlinx/dnq/query/FilterQueryPropertiesTest.kt

@@ -181,7 +181,6 @@ class FilterQueryPropertiesTest : DBTest() {
     }
 
     @Test
-    @Ignore
     fun `should search by contains`(){
         val (user1, user2, user3) = store.transactional {
             Triple(User.new {