Skip to content

refactor(abstract-it): kotlin #17949

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.

Sign up for GitHub

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
alperozturk96 merged 4 commits into from
Nov 4, 2026
+645 −822
Merged

refactor(abstract-it): kotlin #17949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98faff1
Rename .java to .kt
alperozturk96 Nov 4, 2026
a72dc25
convert to kotlin
alperozturk96 Nov 4, 2026
8d88042
simplify
alperozturk96 Nov 4, 2026
29f20c1
simplify
alperozturk96 Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/nextcloud/client/ActivitiesFragmentIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class ActivitiesFragmentIT : AbstractIT() {
fun showActivities() {
val capability = OCCapability()
capability.versionMayor = 20
fileDataStorageManager.saveCapabilities(capability)
storageManager.saveCapabilities(capability)

val date = GregorianCalendar()
date.set(2005, 4, 17, 10, 35, 30)
Expand Down
6 changes: 0 additions & 6 deletions app/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,19 @@ import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.isRoot
import com.nextcloud.test.GrantStoragePermissionRule.Companion.grant
import com.owncloud.android.AbstractIT
import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
import com.owncloud.android.ui.activity.RequestCredentialsActivity
import com.owncloud.android.ui.activity.SettingsActivity
import com.owncloud.android.utils.EncryptionUtils
import com.owncloud.android.utils.ScreenshotTest
import org.junit.Assert
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TestRule

@Suppress("FunctionNaming")
class SettingsActivityIT : AbstractIT() {
private val testClassName = "com.nextcloud.client.SettingsActivityIT"

@get:Rule
var storagePermissionRule: TestRule = grant()

@Test
@ScreenshotTest
fun open() {
Expand Down
10 changes: 5 additions & 5 deletions app/src/androidTest/java/com/nextcloud/client/assistant/AssistantRepositoryTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ class AssistantRepositoryTests : AbstractOnServerIT() {

@Before
fun setup() {
sut = AssistantRemoteRepositoryImpl(nextcloudClient, capability)
sut = AssistantRemoteRepositoryImpl(nextcloudClient, getCapability())
}

@Test
fun testGetTaskTypes() {
testOnlyOnServer(NextcloudVersion.nextcloud_28)

if (capability.assistant.isFalse) {
if (getCapability().assistant.isFalse) {
return
}

Expand All @@ -46,7 +46,7 @@ class AssistantRepositoryTests : AbstractOnServerIT() {
fun testGetTaskList() {
testOnlyOnServer(NextcloudVersion.nextcloud_28)

if (capability.assistant.isFalse) {
if (getCapability().assistant.isFalse) {
return
}

Expand All @@ -60,7 +60,7 @@ class AssistantRepositoryTests : AbstractOnServerIT() {
fun testCreateTask() {
testOnlyOnServer(NextcloudVersion.nextcloud_28)

if (capability.assistant.isFalse) {
if (getCapability().assistant.isFalse) {
return
}

Expand All @@ -83,7 +83,7 @@ class AssistantRepositoryTests : AbstractOnServerIT() {
fun testDeleteTask() {
testOnlyOnServer(NextcloudVersion.nextcloud_28)

if (capability.assistant.isFalse) {
if (getCapability().assistant.isFalse) {
return
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/nextcloud/client/jobs/ContactsBackupIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class ContactsBackupIT : AbstractOnServerIT() {
fail("folderPath cannot be empty")
}

val folder = fileDataStorageManager.getFileByDecryptedRemotePath(folderPath)
val folder = storageManager.getFileByDecryptedRemotePath(folderPath)
if (folder == null) {
fail("folder cannot be null")
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/nextcloud/utils/AutoRenameTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import org.junit.Test
@SinceServer(majorVersion = 30)
class AutoRenameTests : AbstractOnServerIT() {

private var capability: OCCapability = fileDataStorageManager.getCapability(account.name)
private var capability: OCCapability = storageManager.getCapability(account.name)
private val forbiddenFilenameExtension = "."
private val forbiddenFilenameCharacter = ">"

Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/nextcloud/utils/FileNameValidatorTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
private const val MAX_FILENAME_SIZE = 250
}

private var capability: OCCapability = fileDataStorageManager.getCapability(account.name)
private var capability: OCCapability = storageManager.getCapability(account.name)

@Before
fun setup() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/nextcloud/utils/OCCapabilityJsonToListTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import org.junit.Test

@Suppress("MagicNumber")
class OCCapabilityJsonToListTests : AbstractIT() {
private var capability: OCCapability = fileDataStorageManager.getCapability(account.name)
private var capability: OCCapability = storageManager.getCapability(account.name)

// region Valid Input
@Test
Expand Down
Loading
Loading