Skip to content
This repository was archived by the owner on Jun 9, 2025. It is now read-only.

Commit 9b21834

Browse files
sunkuprfc2822
andauthored
Remove whitespace values from content providers (#109)
* Extend removeEmptyStrings to remove blank strings as well * Apply removeEmptyAndBlankStrings to populateTask() * Move removeBlankStrings() to extension method; minor changes * Minor MiscUtils restructurizing --------- Co-authored-by: Ricki Hirner <[email protected]>
1 parent aaf607c commit 9b21834

File tree

18 files changed

+148
-282
lines changed

18 files changed

+148
-282
lines changed

lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidCalendarTest.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,13 @@ import androidx.test.platform.app.InstrumentationRegistry
1616
import androidx.test.rule.GrantPermissionRule
1717
import at.bitfire.ical4android.impl.TestCalendar
1818
import at.bitfire.ical4android.impl.TestEvent
19-
import at.bitfire.ical4android.util.MiscUtils.ContentProviderClientHelper.closeCompat
20-
import at.bitfire.ical4android.util.MiscUtils.UriHelper.asSyncAdapter
19+
import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
20+
import at.bitfire.ical4android.util.MiscUtils.closeCompat
2121
import net.fortuna.ical4j.model.property.DtEnd
2222
import net.fortuna.ical4j.model.property.DtStart
23-
import org.junit.AfterClass
23+
import org.junit.*
2424
import org.junit.Assert.assertEquals
2525
import org.junit.Assert.assertNotNull
26-
import org.junit.Before
27-
import org.junit.BeforeClass
28-
import org.junit.ClassRule
29-
import org.junit.Test
3026

3127
class AndroidCalendarTest {
3228

@@ -121,7 +117,7 @@ class AndroidCalendarTest {
121117
}
122118

123119
private fun countColors(account: Account): Int {
124-
val uri = Colors.CONTENT_URI.asSyncAdapter(testAccount)
120+
val uri = Colors.CONTENT_URI.asSyncAdapter(account)
125121
provider.query(uri, null, null, null, null)!!.use { cursor ->
126122
cursor.moveToNext()
127123
return cursor.count

lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidEventTest.kt

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,51 +10,22 @@ import android.content.ContentUris
1010
import android.content.ContentValues
1111
import android.database.DatabaseUtils
1212
import android.net.Uri
13-
import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
14-
import android.provider.CalendarContract.AUTHORITY
15-
import android.provider.CalendarContract.Attendees
16-
import android.provider.CalendarContract.Calendars
17-
import android.provider.CalendarContract.Events
18-
import android.provider.CalendarContract.ExtendedProperties
19-
import android.provider.CalendarContract.Reminders
13+
import android.provider.CalendarContract.*
2014
import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
2115
import androidx.test.rule.GrantPermissionRule
2216
import at.bitfire.ical4android.impl.TestCalendar
2317
import at.bitfire.ical4android.impl.TestEvent
2418
import at.bitfire.ical4android.util.AndroidTimeUtils
2519
import at.bitfire.ical4android.util.DateUtils
26-
import at.bitfire.ical4android.util.MiscUtils.ContentProviderClientHelper.closeCompat
27-
import at.bitfire.ical4android.util.MiscUtils.UriHelper.asSyncAdapter
28-
import net.fortuna.ical4j.model.Date
29-
import net.fortuna.ical4j.model.DateList
30-
import net.fortuna.ical4j.model.DateTime
31-
import net.fortuna.ical4j.model.Parameter
32-
import net.fortuna.ical4j.model.ParameterList
33-
import net.fortuna.ical4j.model.Property
20+
import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
21+
import at.bitfire.ical4android.util.MiscUtils.closeCompat
22+
import net.fortuna.ical4j.model.*
3423
import net.fortuna.ical4j.model.component.VAlarm
35-
import net.fortuna.ical4j.model.parameter.Cn
36-
import net.fortuna.ical4j.model.parameter.CuType
37-
import net.fortuna.ical4j.model.parameter.Email
38-
import net.fortuna.ical4j.model.parameter.Language
39-
import net.fortuna.ical4j.model.parameter.PartStat
40-
import net.fortuna.ical4j.model.parameter.Related
41-
import net.fortuna.ical4j.model.parameter.Role
42-
import net.fortuna.ical4j.model.parameter.Rsvp
43-
import net.fortuna.ical4j.model.parameter.Value
24+
import net.fortuna.ical4j.model.parameter.*
4425
import net.fortuna.ical4j.model.property.*
4526
import net.fortuna.ical4j.util.TimeZones
46-
import org.junit.After
47-
import org.junit.AfterClass
48-
import org.junit.Assert.assertEquals
49-
import org.junit.Assert.assertFalse
50-
import org.junit.Assert.assertNotEquals
51-
import org.junit.Assert.assertNotNull
52-
import org.junit.Assert.assertNull
53-
import org.junit.Assert.assertTrue
54-
import org.junit.Before
55-
import org.junit.BeforeClass
56-
import org.junit.ClassRule
57-
import org.junit.Test
27+
import org.junit.*
28+
import org.junit.Assert.*
5829
import java.net.URI
5930
import java.time.Duration
6031
import java.time.Period

0 commit comments

Comments
 (0)