arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-01-23 14:10:54 +00:00
Code Issues Releases Wiki Activity

Fix tests following kotlin migration.

Browse Source
This commit is contained in:
Tom Hacohen 2019-01-12 00:14:34 +00:00
parent 5c894e001f
commit 4795bd40ef
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/etesync/syncadapter/App.kt
View File

@ -377,8 +377,7 @@ class App : Application() {
val DEFAULT_LANGUAGE = "default"
var sDefaultLocacle = Locale.getDefault()
lateinit var appName: String
private set
var appName: String = "EteSync"
var sslSocketFactoryCompat: SSLSocketFactoryCompat? = null
private set

4
app/src/main/java/com/etesync/syncadapter/HttpClient.kt
View File

@ -34,7 +34,7 @@ object HttpClient {
init {
val date = SimpleDateFormat("yyyy/MM/dd", Locale.US).format(Date(BuildConfig.buildTime))
userAgent = App.appName + "/" + BuildConfig.VERSION_NAME + " (" + date + "; okhttp3) Android/" + Build.VERSION.RELEASE
userAgent = "${App.appName}/${BuildConfig.VERSION_NAME} (${date}; okhttp3) Android/${Build.VERSION.RELEASE}"
}
fun create(context: Context?, logger: Logger, host: String?, token: String): OkHttpClient {
@ -52,7 +52,7 @@ object HttpClient {
}
@JvmOverloads
fun create(context: Context, logger: Logger = App.log): OkHttpClient {
fun create(context: Context?, logger: Logger = App.log): OkHttpClient {
return defaultBuilder(context, logger).build()
}

18
app/src/test/java/com/etesync/syncadapter/journalmanager/ServiceTest.kt
View File

@ -68,8 +68,8 @@ class ServiceTest {
val info = CollectionInfo.defaultForServiceType(CollectionInfo.Type.ADDRESS_BOOK)
info.uid = JournalManager.Journal.genUid()
info.displayName = "Test"
val crypto = Crypto.CryptoManager(info.version, Helpers.keyBase64, info.uid)
var journal = JournalManager.Journal(crypto, info.toJson(), info.uid)
val crypto = Crypto.CryptoManager(info.version, Helpers.keyBase64, info.uid!!)
var journal = JournalManager.Journal(crypto, info.toJson(), info.uid!!)
journalManager.create(journal)
// Try pushing the same journal (uid clash)
@ -89,7 +89,7 @@ class ServiceTest {
// Update journal
info.displayName = "Test 2"
journal = JournalManager.Journal(crypto, info.toJson(), info.uid)
journal = JournalManager.Journal(crypto, info.toJson(), info.uid!!)
journalManager.update(journal)
journals = journalManager.list()
@ -105,7 +105,7 @@ class ServiceTest {
// Bad HMAC
info.uid = JournalManager.Journal.genUid()
journal = JournalManager.Journal(crypto, info.toJson(), info.uid)
journal = JournalManager.Journal(crypto, info.toJson(), info.uid!!)
info.displayName = "Test 3"
//// We assume this doesn't update the hmac.
journal.setContent(crypto, info.toJson())
@ -133,11 +133,11 @@ class ServiceTest {
val info = CollectionInfo.defaultForServiceType(CollectionInfo.Type.ADDRESS_BOOK)
info.uid = JournalManager.Journal.genUid()
info.displayName = "Test"
val crypto = Crypto.CryptoManager(info.version, Helpers.keyBase64, info.uid)
val journal = JournalManager.Journal(crypto, info.toJson(), info.uid)
val crypto = Crypto.CryptoManager(info.version, Helpers.keyBase64, info.uid!!)
val journal = JournalManager.Journal(crypto, info.toJson(), info.uid!!)
journalManager.create(journal)
val journalEntryManager = JournalEntryManager(httpClient!!, remote!!, info.uid)
val journalEntryManager = JournalEntryManager(httpClient!!, remote!!, info.uid!!)
var previousEntry: JournalEntryManager.Entry? = null
val entry = JournalEntryManager.Entry()
entry.update(crypto, "Content", previousEntry)
@ -240,8 +240,8 @@ class ServiceTest {
val info = CollectionInfo.defaultForServiceType(CollectionInfo.Type.ADDRESS_BOOK)
info.uid = JournalManager.Journal.genUid()
info.displayName = "Test"
val crypto = Crypto.CryptoManager(info.version, Helpers.keyBase64, info.uid)
val journal = JournalManager.Journal(crypto, info.toJson(), info.uid)
val crypto = Crypto.CryptoManager(info.version, Helpers.keyBase64, info.uid!!)
val journal = JournalManager.Journal(crypto, info.toJson(), info.uid!!)
journalManager.create(journal)
assertEquals(journalManager.listMembers(journal).size.toLong(), 0)