nutomic/ensichat
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Moved unused method into tests.

Browse source
This commit is contained in:
Felix Ableitner 2015-09-14 03:10:03 +02:00
parent 284a4ceb02
commit 1c48484358
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/src/androidTest/scala/com/nutomic/ensichat/util/DatabaseTest.scala
View file

@ -9,11 +9,14 @@ import android.support.v4.content.LocalBroadcastManager
import android.test.AndroidTestCase
import com.nutomic.ensichat.protocol.MessageTest._
import com.nutomic.ensichat.protocol.body.CryptoData
import com.nutomic.ensichat.protocol.header.{ContentHeader, ContentHeaderTest}
import com.nutomic.ensichat.protocol.header.ContentHeader
import com.nutomic.ensichat.protocol.header.ContentHeaderTest._
import com.nutomic.ensichat.protocol.{MessageTest, UserTest}
import com.nutomic.ensichat.protocol.{Address, Message, UserTest}
import junit.framework.Assert._
import scala.collection.SortedSet
import scala.collection.immutable.TreeSet
object DatabaseTest {
/**
@ -49,27 +52,40 @@ class DatabaseTest extends AndroidTestCase {
context.deleteDbFile()
}
/**
* Calls [[Database.getMessagesCursor]] with parameters and converts the result to sorted set.
*/
private def getMessages(address: Address, count: Int): SortedSet[Message] = {
val c = database.getMessagesCursor(address, Option(count))
var messages = new TreeSet[Message]()(Message.Ordering)
while (c.moveToNext()) {
messages += Database.messageFromCursor(c)
}
c.close()
messages
}
def testMessageCount(): Unit = {
val msg1 = database.getMessages(m1.header.origin, 1)
val msg1 = getMessages(m1.header.origin, 1)
assertEquals(1, msg1.size)
val msg2 = database.getMessages(m1.header.origin, 3)
val msg2 = getMessages(m1.header.origin, 3)
assertEquals(2, msg2.size)
}
def testMessageOrder(): Unit = {
val msg = database.getMessages(m1.header.target, 1)
val msg = getMessages(m1.header.target, 1)
assertTrue(msg.contains(m1))
}
def testMessageSelect(): Unit = {
val msg = database.getMessages(m1.header.target, 2)
val msg = getMessages(m1.header.target, 2)
assertTrue(msg.contains(m1))
assertTrue(msg.contains(m3))
}
def testMessageFields(): Unit = {
val msg = database.getMessages(m2.header.target, 1).firstKey
val msg = getMessages(m2.header.target, 1).firstKey
val header = msg.header.asInstanceOf[ContentHeader]
assertEquals(h2.origin, header.origin)

13
app/src/main/scala/com/nutomic/ensichat/util/Database.scala
View file

@ -70,19 +70,6 @@ class Database(context: Context)
null, null, "date ASC", count.map(_.toString).orNull)
}
/**
* Returns the count last messages for device.
*/
def getMessages(address: Address, count: Int): SortedSet[Message] = {
val c = getMessagesCursor(address, Option(count))
var messages = new TreeSet[Message]()(Message.Ordering)
while (c.moveToNext()) {
messages += Database.messageFromCursor(c)
}
c.close()
messages
}
/**
* Inserts the given new message into the database.
*/