-
Notifications
You must be signed in to change notification settings - Fork 4
Extract status field builders from DmfsTaskBuilder #364
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/ClassificationBuilder.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * This file is part of bitfireAT/synctools which is released under GPLv3. | ||
| * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details. | ||
| * SPDX-License-Identifier: GPL-3.0-or-later | ||
| */ | ||
|
|
||
| package at.bitfire.synctools.mapping.tasks.builder | ||
|
|
||
| import android.content.Entity | ||
| import at.bitfire.ical4android.Task | ||
| import net.fortuna.ical4j.model.property.immutable.ImmutableClazz | ||
| import org.dmfs.tasks.contract.TaskContract.Tasks | ||
|
|
||
| class ClassificationBuilder : DmfsTaskFieldBuilder { | ||
|
|
||
| override fun build(from: Task, to: Entity) { | ||
| to.entityValues.put(Tasks.CLASSIFICATION, when (from.classification?.value?.uppercase()) { | ||
| ImmutableClazz.VALUE_PUBLIC -> Tasks.CLASSIFICATION_PUBLIC | ||
| ImmutableClazz.VALUE_CONFIDENTIAL -> Tasks.CLASSIFICATION_CONFIDENTIAL | ||
| null -> Tasks.CLASSIFICATION_DEFAULT | ||
| else -> Tasks.CLASSIFICATION_PRIVATE // all unknown classifications MUST be treated as PRIVATE | ||
| }) | ||
| } | ||
|
|
||
| } | ||
21 changes: 21 additions & 0 deletions
21
lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/CompletedBuilder.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * This file is part of bitfireAT/synctools which is released under GPLv3. | ||
| * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details. | ||
| * SPDX-License-Identifier: GPL-3.0-or-later | ||
| */ | ||
|
|
||
| package at.bitfire.synctools.mapping.tasks.builder | ||
|
|
||
| import android.content.Entity | ||
| import at.bitfire.ical4android.Task | ||
| import org.dmfs.tasks.contract.TaskContract.Tasks | ||
|
|
||
| class CompletedBuilder : DmfsTaskFieldBuilder { | ||
|
|
||
| override fun build(from: Task, to: Entity) { | ||
| // COMPLETED must always be a DATE-TIME | ||
| to.entityValues.put(Tasks.COMPLETED, from.completedAt?.date?.toEpochMilli()) | ||
| to.entityValues.put(Tasks.COMPLETED_IS_ALLDAY, 0) | ||
| } | ||
|
|
||
| } |
19 changes: 19 additions & 0 deletions
19
lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/PercentCompleteBuilder.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| /* | ||
| * This file is part of bitfireAT/synctools which is released under GPLv3. | ||
| * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details. | ||
| * SPDX-License-Identifier: GPL-3.0-or-later | ||
| */ | ||
|
|
||
| package at.bitfire.synctools.mapping.tasks.builder | ||
|
|
||
| import android.content.Entity | ||
| import at.bitfire.ical4android.Task | ||
| import org.dmfs.tasks.contract.TaskContract.Tasks | ||
|
|
||
| class PercentCompleteBuilder : DmfsTaskFieldBuilder { | ||
|
|
||
| override fun build(from: Task, to: Entity) { | ||
| to.entityValues.put(Tasks.PERCENT_COMPLETE, from.percentComplete) | ||
| } | ||
|
|
||
| } |
19 changes: 19 additions & 0 deletions
19
lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/PriorityBuilder.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| /* | ||
| * This file is part of bitfireAT/synctools which is released under GPLv3. | ||
| * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details. | ||
| * SPDX-License-Identifier: GPL-3.0-or-later | ||
| */ | ||
|
|
||
| package at.bitfire.synctools.mapping.tasks.builder | ||
|
|
||
| import android.content.Entity | ||
| import at.bitfire.ical4android.Task | ||
| import org.dmfs.tasks.contract.TaskContract.Tasks | ||
|
|
||
| class PriorityBuilder : DmfsTaskFieldBuilder { | ||
|
|
||
| override fun build(from: Task, to: Entity) { | ||
| to.entityValues.put(Tasks.PRIORITY, from.priority) | ||
| } | ||
|
|
||
| } |
25 changes: 25 additions & 0 deletions
25
lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/StatusBuilder.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * This file is part of bitfireAT/synctools which is released under GPLv3. | ||
| * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details. | ||
| * SPDX-License-Identifier: GPL-3.0-or-later | ||
| */ | ||
|
|
||
| package at.bitfire.synctools.mapping.tasks.builder | ||
|
|
||
| import android.content.Entity | ||
| import at.bitfire.ical4android.Task | ||
| import net.fortuna.ical4j.model.property.immutable.ImmutableStatus | ||
| import org.dmfs.tasks.contract.TaskContract.Tasks | ||
|
|
||
| class StatusBuilder : DmfsTaskFieldBuilder { | ||
|
|
||
| override fun build(from: Task, to: Entity) { | ||
| to.entityValues.put(Tasks.STATUS, when (from.status?.value) { | ||
| ImmutableStatus.VALUE_IN_PROCESS -> Tasks.STATUS_IN_PROCESS | ||
| ImmutableStatus.VALUE_COMPLETED -> Tasks.STATUS_COMPLETED | ||
| ImmutableStatus.VALUE_CANCELLED -> Tasks.STATUS_CANCELLED | ||
| else -> Tasks.STATUS_DEFAULT // == Tasks.STATUS_NEEDS_ACTION | ||
| }) | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
lib/src/test/kotlin/at/bitfire/synctools/mapping/tasks/builder/ClassificationBuilderTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * This file is part of bitfireAT/synctools which is released under GPLv3. | ||
| * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details. | ||
| * SPDX-License-Identifier: GPL-3.0-or-later | ||
| */ | ||
|
|
||
| package at.bitfire.synctools.mapping.tasks.builder | ||
|
|
||
| import android.content.ContentValues | ||
| import android.content.Entity | ||
| import androidx.core.content.contentValuesOf | ||
| import at.bitfire.ical4android.Task | ||
| import at.bitfire.synctools.test.assertContentValuesEqual | ||
| import net.fortuna.ical4j.model.property.Clazz | ||
| import net.fortuna.ical4j.model.property.immutable.ImmutableClazz | ||
| import org.dmfs.tasks.contract.TaskContract.Tasks | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.robolectric.RobolectricTestRunner | ||
|
|
||
| @RunWith(RobolectricTestRunner::class) | ||
| class ClassificationBuilderTest { | ||
|
|
||
| private val builder = ClassificationBuilder() | ||
|
|
||
| @Test | ||
| fun `No CLASS defaults to DEFAULT`() { | ||
| val result = Entity(ContentValues()) | ||
| builder.build( | ||
| from = Task(), | ||
| to = result | ||
| ) | ||
| assertContentValuesEqual(contentValuesOf( | ||
| Tasks.CLASSIFICATION to Tasks.CLASSIFICATION_DEFAULT | ||
| ), result.entityValues) | ||
| } | ||
|
|
||
| @Test | ||
| fun `CLASS is PUBLIC`() { | ||
| val result = Entity(ContentValues()) | ||
| builder.build( | ||
| from = Task(classification = Clazz(ImmutableClazz.VALUE_PUBLIC)), | ||
| to = result | ||
| ) | ||
| assertContentValuesEqual(contentValuesOf( | ||
| Tasks.CLASSIFICATION to Tasks.CLASSIFICATION_PUBLIC | ||
| ), result.entityValues) | ||
| } | ||
|
|
||
| @Test | ||
| fun `CLASS is PRIVATE`() { | ||
| val result = Entity(ContentValues()) | ||
| builder.build( | ||
| from = Task(classification = Clazz(ImmutableClazz.VALUE_PRIVATE)), | ||
| to = result | ||
| ) | ||
| assertContentValuesEqual(contentValuesOf( | ||
| Tasks.CLASSIFICATION to Tasks.CLASSIFICATION_PRIVATE | ||
| ), result.entityValues) | ||
| } | ||
|
|
||
| @Test | ||
| fun `CLASS is CONFIDENTIAL`() { | ||
| val result = Entity(ContentValues()) | ||
| builder.build( | ||
| from = Task(classification = Clazz(ImmutableClazz.VALUE_CONFIDENTIAL)), | ||
| to = result | ||
| ) | ||
| assertContentValuesEqual(contentValuesOf( | ||
| Tasks.CLASSIFICATION to Tasks.CLASSIFICATION_CONFIDENTIAL | ||
| ), result.entityValues) | ||
| } | ||
|
|
||
| @Test | ||
| fun `Unknown CLASS maps to PRIVATE`() { | ||
| val result = Entity(ContentValues()) | ||
| builder.build( | ||
| from = Task(classification = Clazz("X-CUSTOM")), | ||
| to = result | ||
| ) | ||
| assertContentValuesEqual(contentValuesOf( | ||
| Tasks.CLASSIFICATION to Tasks.CLASSIFICATION_PRIVATE | ||
| ), result.entityValues) | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.