Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 4da88ddd authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

disable google test tracking 


fix get activities test on fresh user

Signed-off-by: default avatartobiasKaminsky <tobias@kaminsky.me>
parent 842b066d

.drone.yml

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ services: 
      - /initnc.sh

      - su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1"

      - su www-data -c "OC_PASS=user2 php /var/www/html/occ user:add --password-from-env --display-name='User Two' user2"

      - su www-data -c "OC_PASS=user3 php /var/www/html/occ user:add --password-from-env --display-name='User Three' user3"

      - su www-data -c "php /var/www/html/occ user:setting user2 files quota 1G"

      - su www-data -c "php /var/www/html/occ group:add users"

      - su www-data -c "php /var/www/html/occ group:adduser users user1"

build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ android { 
        testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}"

        testInstrumentationRunnerArgument "TEST_SERVER_USERNAME", "${NC_TEST_SERVER_USERNAME}"

        testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD", "${NC_TEST_SERVER_PASSWORD}"

        testInstrumentationRunnerArguments disableAnalytics: 'true'

    }



    tasks.register("spotbugs", SpotBugsTask) {

src/androidTest/kotlin/com/nextcloud/lib/resources/users/GetActivitiesRemoteOperationTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ package com.nextcloud.lib.resources.users 
import com.owncloud.android.AbstractIT

import com.owncloud.android.lib.resources.activities.GetActivitiesRemoteOperation

import com.owncloud.android.lib.resources.activities.model.Activity

import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation

import org.junit.Assert.assertTrue

import org.junit.Test

import java.util.*
@@ -32,6 +33,9 @@ import java.util.* 
class GetActivitiesRemoteOperationTest : AbstractIT() {

    @Test

    fun getActivities() {

        // set-up, create a folder so there is an activity

        assertTrue(CreateFolderRemoteOperation("/test/123/1", true).execute(client).isSuccess)



        val result = nextcloudClient.execute(GetActivitiesRemoteOperation())

        assertTrue(result.isSuccess)

src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java

+1 −1
Original line number Diff line number Diff line
@@ -272,6 +272,6 @@ public class GetActivitiesRemoteOperation extends RemoteOperation { 
    }



    private boolean isSuccess(int status) {

        return (status == HttpStatus.SC_OK || status == HttpStatus.SC_NOT_MODIFIED);

        return (status == HttpStatus.SC_OK || status == HttpStatus.SC_NOT_MODIFIED || status == HttpStatus.SC_NOT_FOUND);

    }

}