Jtx Board synchronization (#56) (16311708) · Commits · e / os / AccountManager

.github/workflows/test-dev.yml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,7 @@ jobs:
	- name: Start emulator		- name: Start emulator
	run: start-emulator.sh		run: start-emulator.sh
	- name: Run connected tests		- name: Run connected tests
	run: ./gradlew app:connectedCheck		run: ./gradlew app:connectedCheck -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.FlakyTest
	- name: Archive results		- name: Archive results
	if: always()		if: always()
	uses: actions/upload-artifact@v2		uses: actions/upload-artifact@v2

app/build.gradle

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ android {
	buildConfigField "String", "userAgent", "\"DAVx5\""		buildConfigField "String", "userAgent", "\"DAVx5\""

	testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
			//testInstrumentationRunnerArgument "notAnnotation", "androidx.test.filters.FlakyTest"

	kapt {		kapt {
	arguments {		arguments {

app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.kt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,7 @@ import android.content.ContentValues
	import android.provider.CalendarContract		import android.provider.CalendarContract
	import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL		import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
	import android.provider.CalendarContract.Events		import android.provider.CalendarContract.Events
			import androidx.test.filters.FlakyTest
	import androidx.test.platform.app.InstrumentationRegistry		import androidx.test.platform.app.InstrumentationRegistry
	import androidx.test.rule.GrantPermissionRule		import androidx.test.rule.GrantPermissionRule
	import at.bitfire.ical4android.AndroidCalendar		import at.bitfire.ical4android.AndroidCalendar
	@@ -113,6 +114,7 @@ class LocalCalendarTest {
	}		}

	@Test		@Test
			@FlakyTest(detail = "Fails when calendar storage is accessed the first time; probably some initialization thread")
	fun testDeleteDirtyEventsWithoutInstances_Recurring_Instances() {		fun testDeleteDirtyEventsWithoutInstances_Recurring_Instances() {
	val event = Event().apply {		val event = Event().apply {
	dtStart = DtStart("20220120T010203Z")		dtStart = DtStart("20220120T010203Z")

app/src/androidTest/java/at/bitfire/davdroid/resource/LocalEventTest.kt

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,7 @@ import android.os.Build
	import android.provider.CalendarContract		import android.provider.CalendarContract
	import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL		import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
	import android.provider.CalendarContract.Events		import android.provider.CalendarContract.Events
			import androidx.test.filters.FlakyTest
	import androidx.test.platform.app.InstrumentationRegistry		import androidx.test.platform.app.InstrumentationRegistry
	import androidx.test.rule.GrantPermissionRule		import androidx.test.rule.GrantPermissionRule
	import at.bitfire.ical4android.AndroidCalendar		import at.bitfire.ical4android.AndroidCalendar
	@@ -66,6 +67,7 @@ class LocalEventTest {


	@Test		@Test
			@FlakyTest(detail = "Fails when calendar storage is accessed the first time; probably some initialization thread")
	fun testNumDirectInstances_SingleInstance() {		fun testNumDirectInstances_SingleInstance() {
	val event = Event().apply {		val event = Event().apply {
	dtStart = DtStart("20220120T010203Z")		dtStart = DtStart("20220120T010203Z")
	@@ -306,7 +308,7 @@ class LocalEventTest {

	@Test		@Test
	fun testDeleteDirtyEventsWithoutInstances_NoInstances_Exdate() {		fun testDeleteDirtyEventsWithoutInstances_NoInstances_Exdate() {
			// TODO
	}		}

	@Test		@Test
	@@ -358,6 +360,7 @@ class LocalEventTest {
	}		}

	@Test		@Test
			@FlakyTest(detail = "Fails when calendar storage is accessed the first time; probably some initialization thread")
	fun testDeleteDirtyEventsWithoutInstances_Recurring_Instances() {		fun testDeleteDirtyEventsWithoutInstances_Recurring_Instances() {
	val event = Event().apply {		val event = Event().apply {
	dtStart = DtStart("20220120T010203Z")		dtStart = DtStart("20220120T010203Z")

app/src/main/AndroidManifest.xml

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -162,6 +162,17 @@
	android:name="android.content.SyncAdapter"		android:name="android.content.SyncAdapter"
	android:resource="@xml/sync_calendars"/>		android:resource="@xml/sync_calendars"/>
	</service>		</service>
			<service
			android:name=".syncadapter.JtxSyncAdapterService"
			android:exported="true"
			tools:ignore="ExportedService">
			<intent-filter>
			<action android:name="android.content.SyncAdapter"/>
			</intent-filter>
			<meta-data
			android:name="android.content.SyncAdapter"
			android:resource="@xml/sync_notes"/>
			</service>
	<service		<service
	android:name=".syncadapter.OpenTasksSyncAdapterService"		android:name=".syncadapter.OpenTasksSyncAdapterService"
	android:exported="true"		android:exported="true"
	@@ -265,6 +276,7 @@
	<!-- package visiblity – which apps do we need to see? -->		<!-- package visiblity – which apps do we need to see? -->
	<queries>		<queries>
	<!-- task providers -->		<!-- task providers -->
			<package android:name="at.techbee.jtx" />
	<package android:name="org.dmfs.tasks" />		<package android:name="org.dmfs.tasks" />
	<package android:name="org.tasks" />		<package android:name="org.tasks" />