-
-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Make Localization.relativeTime testable #5358
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
2 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,16 +6,26 @@ | |
| import android.content.SharedPreferences; | ||
| import android.os.Build; | ||
| import android.util.Log; | ||
|
|
||
| import androidx.annotation.NonNull; | ||
| import androidx.annotation.Nullable; | ||
| import androidx.multidex.MultiDexApplication; | ||
| import androidx.preference.PreferenceManager; | ||
|
|
||
| import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache; | ||
| import com.nostra13.universalimageloader.core.ImageLoader; | ||
| import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; | ||
|
|
||
| import io.reactivex.rxjava3.disposables.Disposable; | ||
| import io.reactivex.rxjava3.exceptions.CompositeException; | ||
| import io.reactivex.rxjava3.exceptions.MissingBackpressureException; | ||
| import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException; | ||
| import io.reactivex.rxjava3.exceptions.UndeliverableException; | ||
| import io.reactivex.rxjava3.functions.Consumer; | ||
| import io.reactivex.rxjava3.plugins.RxJavaPlugins; | ||
| import java.io.IOException; | ||
| import java.io.InterruptedIOException; | ||
| import java.net.SocketException; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import org.acra.ACRA; | ||
| import org.acra.config.ACRAConfigurationException; | ||
| import org.acra.config.CoreConfiguration; | ||
|
|
@@ -31,21 +41,6 @@ | |
| import org.schabi.newpipe.util.ServiceHelper; | ||
| import org.schabi.newpipe.util.StateSaver; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InterruptedIOException; | ||
| import java.net.SocketException; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import io.reactivex.rxjava3.disposables.Disposable; | ||
| import io.reactivex.rxjava3.exceptions.CompositeException; | ||
| import io.reactivex.rxjava3.exceptions.MissingBackpressureException; | ||
| import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException; | ||
| import io.reactivex.rxjava3.exceptions.UndeliverableException; | ||
| import io.reactivex.rxjava3.functions.Consumer; | ||
| import io.reactivex.rxjava3.plugins.RxJavaPlugins; | ||
|
|
||
| /* | ||
| * Copyright (C) Hans-Christoph Steiner 2016 <[email protected]> | ||
| * App.java is part of NewPipe. | ||
|
|
@@ -93,9 +88,9 @@ public void onCreate() { | |
| SettingsActivity.initSettings(this); | ||
|
|
||
| NewPipe.init(getDownloader(), | ||
| Localization.getPreferredLocalization(this), | ||
| Localization.getPreferredContentCountry(this)); | ||
| Localization.init(getApplicationContext()); | ||
| Localization.getPreferredLocalization(this), | ||
| Localization.getPreferredContentCountry(this)); | ||
| Localization.initPrettyTime(Localization.resolvePrettyTime(getApplicationContext())); | ||
|
|
||
| StateSaver.init(this); | ||
| initNotificationChannels(); | ||
|
|
||
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
40 changes: 40 additions & 0 deletions
40
app/src/test/java/org/schabi/newpipe/util/LocalizationTest.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,40 @@ | ||
| package org.schabi.newpipe.util | ||
|
|
||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Test | ||
| import org.ocpsoft.prettytime.PrettyTime | ||
| import java.text.SimpleDateFormat | ||
| import java.time.OffsetDateTime | ||
| import java.time.ZoneOffset | ||
| import java.util.GregorianCalendar | ||
| import java.util.Locale | ||
|
|
||
| class LocalizationTest { | ||
|
|
||
| @Test | ||
| fun `After initializing pretty time relativeTime() with a Calendar must work`() { | ||
| val reference = SimpleDateFormat("yyyy/MM/dd").parse("2021/1/1") | ||
| Localization.initPrettyTime(PrettyTime(reference, Locale.ENGLISH)) | ||
|
|
||
| val actual = Localization.relativeTime(GregorianCalendar(2021, 1, 6)) | ||
|
|
||
| // yes this assertion is true, even if it should be 5 days, it works as it is. Future research required. | ||
| assertEquals("1 month from now", actual) | ||
| } | ||
|
|
||
| @Test(expected = NullPointerException::class) | ||
| fun `relativeTime() must fail without initializing pretty time`() { | ||
| Localization.relativeTime(GregorianCalendar(2021, 1, 6)) | ||
| } | ||
|
|
||
| @Test | ||
| fun `relativeTime() with a OffsetDateTime must work`() { | ||
| val reference = SimpleDateFormat("yyyy/MM/dd").parse("2021/1/1") | ||
| Localization.initPrettyTime(PrettyTime(reference, Locale.ENGLISH)) | ||
|
|
||
| val offset = OffsetDateTime.of(2021, 1, 6, 0, 0, 0, 0, ZoneOffset.UTC) | ||
| val actual = Localization.relativeTime(offset) | ||
|
|
||
| assertEquals("5 days from now", actual) | ||
| } | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe I am just unable to understand Kotlin, in this case please enlighten me. But this assertion will never be true because both times are just 5 days apart from each other - especially when I compare it with the last test? So shouldn't it be
assertEquals("5 days from now", actual)here as well?Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are absolutly correct, but this is actually what pretty time returns. I would guess it's either a bug in
PrettyTimeor a limitation when comparing withGregorianCalendar.For these tests i went with the assumption that the current state is correct. So i just added assertions with what is returned, so future regressions are covered.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay, can you add this explanation as an inline comment so that no one stumbles upon this later?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you mean the first paragraph of the second (or both)?
I would add the first with the note that further research is required
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just add anything meaningful like
// yes this assertion is true, even if it should be 5 days, it works as it is. Future research requiredMaybe it has to do something with timezone shift. Could it be that Locale.ENGLISH is defaulting to the global standard locale US in Android? This would explain why 2021, 1, 1 is in fact 2020,12,12 normalized to UTC and could explain "1 month from now"