Skip to content

Commit 475f478

Browse files
Merge pull request #1236 from nextcloud/dependabot/gradle/com.github.spotbugs.snom-spotbugs-gradle-plugin-5.2.2
Bump com.github.spotbugs.snom:spotbugs-gradle-plugin from 5.2.1 to 5.2.2
2 parents 3e3cb3a + 6b5636a commit 475f478

57 files changed

Lines changed: 586 additions & 477 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:8.1.2'
9-
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.2.1'
9+
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.2.2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.3"
1212
classpath "org.jacoco:org.jacoco.core:$jacoco_version"

library/src/androidTest/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperationIT.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import org.junit.Assert.assertTrue
3939
import org.junit.Test
4040

4141
class ToggleFileLockRemoteOperationIT : AbstractIT() {
42-
4342
@Test
4443
fun lockUnlockFile() {
4544
// only on >= NC24

library/src/androidTest/java/com/nextcloud/android/lib/resources/profile/GetHoverCardRemoteOperationIT.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ class GetHoverCardRemoteOperationIT : AbstractIT() {
4141

4242
@Test
4343
fun testHoverCard() {
44-
val result = GetHoverCardRemoteOperation(nextcloudClient.userId)
45-
.execute(nextcloudClient)
44+
val result =
45+
GetHoverCardRemoteOperation(nextcloudClient.userId)
46+
.execute(nextcloudClient)
4647
assertTrue(result.logMessage, result.isSuccess)
4748
val hoverCard = result.resultData
4849
assertEquals(nextcloudClient.userId, hoverCard?.userId)

library/src/androidTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ class SearchProvidersRemoteOperationIT : AbstractIT() {
5353
@Test
5454
fun getSearchProvidersOnOldServer() {
5555
// only on < NC20
56-
val ocCapability = GetCapabilitiesRemoteOperation()
57-
.execute(nextcloudClient).singleData as OCCapability
56+
val ocCapability =
57+
GetCapabilitiesRemoteOperation()
58+
.execute(nextcloudClient).singleData as OCCapability
5859
assumeTrue(
5960
ocCapability.version.isOlderThan(OwnCloudVersion.nextcloud_20)
6061
)

library/src/androidTest/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperationIT.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ class UnifiedSearchRemoteOperationIT : AbstractIT() {
6060
fun filesSearch() {
6161
val remotePath = "/testFolder"
6262
assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(client).isSuccess)
63-
val remoteFile = ReadFileRemoteOperation(remotePath)
64-
.execute(client).data[0] as RemoteFile
63+
val remoteFile =
64+
ReadFileRemoteOperation(remotePath)
65+
.execute(client).data[0] as RemoteFile
6566
val fileId = remoteFile.localId
6667

6768
val result = UnifiedSearchRemoteOperation("files", "test").execute(nextcloudClient)

library/src/androidTest/java/com/nextcloud/common/NextcloudUriDelegateIT.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import org.junit.Before
66
import org.junit.Test
77

88
class NextcloudUriDelegateIT {
9-
109
lateinit var sut: NextcloudUriDelegate
1110

1211
@Before

library/src/androidTest/java/com/owncloud/android/RetryTestRule.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,20 @@ import org.junit.runners.model.Statement
3131
* C&p from https://stackoverflow.com/questions/45635833/how-can-i-use-flakytest-annotation-now on 18.03.2020
3232
*/
3333
class RetryTestRule(val retryCount: Int = 1) : TestRule {
34-
3534
companion object {
3635
private val TAG = RetryTestRule::class.java.simpleName
3736
}
3837

39-
override fun apply(base: Statement, description: Description): Statement {
38+
override fun apply(
39+
base: Statement,
40+
description: Description
41+
): Statement {
4042
return statement(base, description)
4143
}
4244

4345
@Suppress("TooGenericExceptionCaught") // and this exactly what we want here
4446
private fun statement(base: Statement, description: Description): Statement {
4547
return object : Statement() {
46-
4748
override fun evaluate() {
4849
Log.e(TAG, "Evaluating ${description.methodName}")
4950

library/src/androidTest/java/com/owncloud/android/lib/common/OwnCloudClientTest.kt

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ import org.junit.Test
3636
class OwnCloudClientTest : AbstractIT() {
3737
@Test
3838
fun testUri() {
39-
val client = OwnCloudClientFactory.createOwnCloudClient(
40-
Uri.parse("https://10.0.2.2/nc"),
41-
context,
42-
false
43-
)
39+
val client =
40+
OwnCloudClientFactory.createOwnCloudClient(
41+
Uri.parse("https://10.0.2.2/nc"),
42+
context,
43+
false
44+
)
4445
client.userId = "test"
4546

4647
assertEquals(
@@ -57,24 +58,26 @@ class OwnCloudClientTest : AbstractIT() {
5758

5859
@Test
5960
fun testUserId() {
60-
val client = OwnCloudClientFactory.createOwnCloudClient(
61-
Uri.parse("https://10.0.2.2/nc"),
62-
context,
63-
false
64-
)
61+
val client =
62+
OwnCloudClientFactory.createOwnCloudClient(
63+
Uri.parse("https://10.0.2.2/nc"),
64+
context,
65+
false
66+
)
6567

6668
val credentials = basic("user", "password")
6769
val nextcloudClient = NextcloudClient(url, "user", credentials, context)
6870

69-
val testList = listOf(
70-
Pair("test@test.de", "test@test.de"),
71-
Pair("Test User", "Test%20User"),
72-
Pair("test", "test"),
73-
Pair("test+test@test.localhost", "test+test@test.localhost"),
74-
Pair("test - ab4c", "test%20-%20ab4c"),
75-
Pair("test.-&51_+-?@test.localhost", "test.-%2651_+-%3F@test.localhost"),
76-
Pair("test'ab4c", "test%27ab4c")
77-
)
71+
val testList =
72+
listOf(
73+
Pair("test@test.de", "test@test.de"),
74+
Pair("Test User", "Test%20User"),
75+
Pair("test", "test"),
76+
Pair("test+test@test.localhost", "test+test@test.localhost"),
77+
Pair("test - ab4c", "test%20-%20ab4c"),
78+
Pair("test.-&51_+-?@test.localhost", "test.-%2651_+-%3F@test.localhost"),
79+
Pair("test'ab4c", "test%27ab4c")
80+
)
7881

7982
testList.forEach { pair ->
8083
client.userId = pair.first

library/src/androidTest/java/com/owncloud/android/lib/common/SearchResultEntryTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import org.junit.Assert.assertEquals
2626
import org.junit.Test
2727

2828
class SearchResultEntryTest {
29-
3029
@Test
3130
fun testFilePath() {
3231
val sut = SearchResultEntry()
@@ -73,7 +72,10 @@ class SearchResultEntryTest {
7372
)
7473
}
7574

76-
private fun setPath(path: String, entry: SearchResultEntry): String? {
75+
private fun setPath(
76+
path: String,
77+
entry: SearchResultEntry
78+
): String? {
7779
entry.resourceUrl = path
7880

7981
return entry.remotePath()

library/src/androidTest/java/com/owncloud/android/lib/common/UsernameVariationsIT.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@ class UsernameVariationsIT(private val username: String) : AbstractIT() {
3939
companion object {
4040
@Parameterized.Parameters(name = "{0}")
4141
@JvmStatic
42-
fun data(): Collection<Array<Any>> = listOf(
43-
arrayOf("test"),
44-
arrayOf("test test"),
45-
arrayOf("test@test")
46-
)
42+
fun data(): Collection<Array<Any>> =
43+
listOf(
44+
arrayOf("test"),
45+
arrayOf("test test"),
46+
arrayOf("test@test")
47+
)
4748
}
4849

4950
@Test

0 commit comments

Comments
 (0)