Skip to content

unify empty string compare - #3916

Merged
AndyScherzinger merged 4 commits into
nextcloud:masterfrom
jmue:cleanup/string_compare
Apr 30, 2019
Merged

unify empty string compare#3916
AndyScherzinger merged 4 commits into
nextcloud:masterfrom
jmue:cleanup/string_compare

Conversation

@jmue

@jmuejmue commented Apr 17, 2019

Copy link
Copy Markdown
Contributor

Unify string test on emptyness, use string Textutils.isEmpty(). This shortens written code and improves readability.

@tobiasKaminsky

tobiasKaminsky commented Apr 17, 2019

Copy link
Copy Markdown
Member

This change led our unit tests fail: https://www.kaminsky.me/nc-dev/android-integrationTests/8869/

As unit test run without Android SDK there is no TextUtils.
So ErrorMessageAdapterUnitTest and TestSorting needs to be moved within /src/androidTest

@jmue

jmue commented Apr 17, 2019

Copy link
Copy Markdown
ContributorAuthor

This change led our unit tests fail: https://www.kaminsky.me/nc-dev/android-integrationTests/8869/

As unit test run without Android SDK there is no TextUtils.
So ErrorMessageAdapterUnitTest and TestSorting needs to be moved within /src/androidTest

Thank you for helping out with that.

@nextcloudnextcloud deleted a comment Apr 17, 2019
@nextcloudnextcloud deleted a comment Apr 17, 2019
@jmue
jmueforce-pushed the cleanup/string_compare branch from 0820eaa to afdb865CompareApril 17, 2019 19:24
@nextcloudnextcloud deleted a comment Apr 17, 2019
@nextcloudnextcloud deleted a comment Apr 17, 2019
jmue added 3 commits April 18, 2019 08:42
@jmue
unify empty string compare
d8b9d10
Signed-off-by: Jens Mueller <tschenser@gmx.de>
@jmue
fix test & review comments
8bb654b
Signed-off-by: Jens Mueller <tschenser@gmx.de>
@jmue
unify empty string compare
b69169f
Signed-off-by: Jens Mueller <tschenser@gmx.de>
@jmue
jmueforce-pushed the cleanup/string_compare branch from 4af5273 to b69169fCompareApril 18, 2019 06:51
@nextcloudnextcloud deleted a comment Apr 18, 2019
@tobiasKaminsky
- fix IT tests
7d01ff7
- re-organized build.gradle a bit
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@nextcloudnextcloud deleted a comment Apr 29, 2019
@nextcloud-android-bot

nextcloud-android-bot commented Apr 29, 2019

Copy link
Copy Markdown
Collaborator

IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/8929

@nextcloud-android-bot

nextcloud-android-bot commented Apr 29, 2019

Copy link
Copy Markdown
Collaborator

Codacy

276

Lint

TypemasterPR
Warnings5858
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings25
Correctness Warnings79
Internationalization Warnings15
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings122
Security Warnings47
Dodgy code Warnings132
Total433

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings25
Correctness Warnings79
Internationalization Warnings15
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings123
Security Warnings47
Dodgy code Warnings132
Total434

@codecov

codecovBot commented Apr 29, 2019

Copy link
Copy Markdown

Codecov Report

Merging #3916 into master will not change coverage.
The diff coverage is 0%.

@@ Coverage Diff @@## master #3916 +/- ##
========================================
Coverage 6.58% 6.58% Complexity 1 1 ========================================
Files 320 320 Lines 30806 30806 Branches 4393 4390 -3 ========================================
Hits 2030 2030 + Misses 28480 28479 -1 - Partials 296 297 +1
Impacted FilesCoverage ΔComplexity Δ
.../dialog/SyncedFolderPreferencesDialogFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...owncloud/android/ui/activity/PassCodeActivity.java0% <0%> (ø)0 <0> (ø)⬇️
.../android/ui/dialog/CreateFolderDialogFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...cloud/android/ui/helpers/FileOperationsHelper.java0% <0%> (ø)0 <0> (ø)⬇️
...om/owncloud/android/ui/activity/ShareActivity.java0% <0%> (ø)0 <0> (ø)⬇️
...cloud/android/ui/activity/FileDisplayActivity.java0% <0%> (ø)0 <0> (ø)⬇️
...loud/android/operations/DownloadFileOperation.java0% <0%> (ø)0 <0> (ø)⬇️
...ud/android/ui/dialog/RenameFileDialogFragment.java0% <0%> (ø)0 <0> (ø)⬇️
.../android/authentication/AuthenticatorUrlUtils.java0% <0%> (ø)0 <0> (ø)⬇️
...java/com/owncloud/android/utils/ClipboardUtil.java0% <0%> (ø)0 <0> (ø)⬇️
... and 16 more

1 similar comment
@codecov

codecovBot commented Apr 29, 2019•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #3916 into master will not change coverage.
The diff coverage is 0%.

@@ Coverage Diff @@## master #3916 +/- ##
========================================
Coverage 6.58% 6.58% Complexity 1 1 ========================================
Files 320 320 Lines 30806 30806 Branches 4393 4390 -3 ========================================
Hits 2030 2030 + Misses 28480 28479 -1 - Partials 296 297 +1
Impacted FilesCoverage ΔComplexity Δ
.../dialog/SyncedFolderPreferencesDialogFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...owncloud/android/ui/activity/PassCodeActivity.java0% <0%> (ø)0 <0> (ø)⬇️
.../android/ui/dialog/CreateFolderDialogFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...cloud/android/ui/helpers/FileOperationsHelper.java0% <0%> (ø)0 <0> (ø)⬇️
...om/owncloud/android/ui/activity/ShareActivity.java0% <0%> (ø)0 <0> (ø)⬇️
...cloud/android/ui/activity/FileDisplayActivity.java0% <0%> (ø)0 <0> (ø)⬇️
...loud/android/operations/DownloadFileOperation.java0% <0%> (ø)0 <0> (ø)⬇️
...ud/android/ui/dialog/RenameFileDialogFragment.java0% <0%> (ø)0 <0> (ø)⬇️
.../android/authentication/AuthenticatorUrlUtils.java0% <0%> (ø)0 <0> (ø)⬇️
...java/com/owncloud/android/utils/ClipboardUtil.java0% <0%> (ø)0 <0> (ø)⬇️
... and 16 more

@AndyScherzinger

AndyScherzinger commented Apr 29, 2019

Copy link
Copy Markdown
Member

One question: Why the change / rearrangement in the gradle build file?

Anything else looks good to me 👍

@tobiasKaminsky

tobiasKaminsky commented Apr 30, 2019

Copy link
Copy Markdown
Member

One question: Why the change / rearrangement in the gradle build file?

With this PR Mockito was added, but on a different place and thus dependancies for instrumentationTests and unit tests were mixed.

So now everything should be in its own area and if we add new dependencies we should obey these categories :-)

@AndyScherzinger
AndyScherzinger merged commit 0f50088 into nextcloud:masterApr 30, 2019
@AndyScherzinger

AndyScherzinger commented Apr 30, 2019

Copy link
Copy Markdown
Member

well, merging then :)

❤️ @jmue thanks a lot for this PR 🎉

nextcloud-android-bot pushed a commit that referenced this pull request May 2, 2019
@tobiasKaminsky
daily dev 20190502
3c51355
71f3370 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
0f50088 Merge pull request #3916 from jmue/cleanup/string_compare
7bb07a0 Update wording for store text (#3903)
4c72f3f Merge pull request #3923 from nextcloud/editOnShareLink
81ed32f allow edit on link share on a file
7d01ff7 - fix IT tests - re-organized build.gradle a bit
a9afff7 Merge pull request #3929 from nextcloud/dependabot/gradle/org.powermock-powermock-core-2.0.2
71c6d99 bump all other powermock parts to 2.0.2
0421d26 Bump powermock-core from 2.0.0 to 2.0.2
1d28d1b Update with new wording from frontpage
de3d3de Merge pull request #3924 from nextcloud/warnOnStable
69dd243 warn for wrong library branch on stable
2379b49 Merge pull request #3921 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-3.4.0
c2730e8 Bump gradle from 3.3.2 to 3.4.0
b69169f unify empty string compare
8bb654b fix test & review comments
d8b9d10 unify empty string compare
2f23a30 remove unused variable (#3920)
92df32e Merge pull request #3918 from nextcloud/codacyCleanup
091c003 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
15ec487 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
da3c497 Merge commit '334155e707975e740a0a13b33d9b7bbedf40e9bc'
b22f517 Merge pull request #3915 from jmue/cleanup/ocfile
c7c6a98 use constant
e6604c8 use constant
caa2a91 Merge pull request #3912 from nextcloud/libraryUsage
334155e some cleanups
28f80cd Merge pull request #3907 from nextcloud/ezaquarii/initialize-main-app-context-before-content-providers-start
2afb934 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
8be1157 Merge pull request #3899 from jmue/cleanup/uriutils
52020a9 direct usage of library project
4062d40 Merge pull request #3908 from nextcloud/missingInjectable
2a08cb4 Initialize global context before MainApp.onCreate()
f02f482 Missing Injectable lead to half-stored account
02cbafe Merge pull request #3765 from nextcloud/showSharees
dc7a2c0 show sharees
03e04e5 Merge pull request #3889 from nextcloud/checkUserId
d65e94b Update wording for store text
585a3d0 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
533debf - removed useNextcloudUserAgent -> we now use this everytime - removed any oAuth and saml stuff, as we rely on weblogin flow
d544fa5 Merge pull request #3897 from nextcloud/ezaquarii/move-current-account-getter-to-user-account-manager
5b4ffba Merge pull request #3900 from nextcloud/codacyOnMaster
2757244 remove unused code
428a8bb show codacy count only on master
6b44074 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
c62e89b Merge commit '442394f949ff2de86bcccae172d2e9d997ab2ef8'
442394f Migrate current account getter from AccountUtils to UserAccountManager
182b65e daily dev 20190414
@jmue
jmue deleted the cleanup/string_compare branch May 6, 2019 20:28
@tobiasKaminskytobiasKaminsky mentioned this pull request Nov 22, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jmue@tobiasKaminsky@nextcloud-android-bot@AndyScherzinger