From ce84e7fc49cb46cd6f7b75e310f9f7d3aa5f4ea2 Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 29 Apr 2019 12:10:02 +0200 Subject: [PATCH 1/7] Refreshes timer when coming back from sleep + stops scrolling to top --- .../android/ui/fragment/SessionFragment.kt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt index 69f5115c..565bfc2c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt @@ -43,12 +43,21 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate { private val refreshTimer: Runnable = object : Runnable { override fun run() { // Refresh header each 30 seconds - currentSession.updateRowRepresentation() - sessionAdapter.notifyItemChanged(0) + refreshTimer() handler.postDelayed(this, 60000) } } + override fun onResume() { + super.onResume() + this.refreshTimer() + } + + private fun refreshTimer() { + currentSession.updateRowRepresentation() + sessionAdapter.notifyItemChanged(0) + } + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { return inflater.inflate(R.layout.fragment_session, container, false) } @@ -236,9 +245,9 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate { oldRows.clear() oldRows.addAll(it) - if (scrollToTop) { - recyclerView.smoothScrollToPosition(0) - } +// if (scrollToTop) { +// recyclerView.smoothScrollToPosition(0) +// } } } From 46ec8f55a101d11485d69ac3ea53be1d91d5da7a Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 29 Apr 2019 12:15:03 +0200 Subject: [PATCH 2/7] Improving labels --- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values/strings.xml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5fedd9a2..3e3b9d02 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -12,7 +12,7 @@ Adresse - Suggestions + Suggestions de noms %s effacés La date de fin doit être après la date de début Sauvegarder diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bd118771..9b5f049f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,11 +10,16 @@ Lines Initial Value Can\'t show because there is less than two values to display! +<<<<<<< HEAD +======= + The object you\'re trying to access is invalid + +>>>>>>> 94f412c... Improving labels Address - Suggestions + Naming suggestions %s deleted The end date should be after the start date Save From 54981f8170c2736fab8d01db29f1476b4fc02046 Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 29 Apr 2019 12:38:56 +0200 Subject: [PATCH 3/7] cleanup useless code --- .../android/ui/fragment/StatisticsFragment.kt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt index b1d7931b..42eb98ec 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt @@ -7,7 +7,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.async import kotlinx.coroutines.launch -import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.ComputableGroup import net.pokeranalytics.android.calculus.Report @@ -58,14 +57,6 @@ class StatisticsFragment : TableReportFragment() { this.statsAdapter?.notifyDataSetChanged() } - override fun initData() { - super.initData() - - this.stringAll = getString(R.string.all) - this.stringCashGame = getString(R.string.cash_game) - this.stringTournament = getString(R.string.tournament) - } - override fun convertReportIntoRepresentables(report: Report): ArrayList { val rows: ArrayList = ArrayList() report.results.forEach { result -> From ac442c29f4eb1b80dffc3113f6f6862ec493a9ee Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 29 Apr 2019 13:07:07 +0200 Subject: [PATCH 4/7] Fixing test build --- .../android/model/CriteriaTest.kt | 35 ++++++++------- .../PerfsInstrumentedUnitTest.kt | 3 +- .../unitTests/StatPerformanceUnitTest.kt | 6 ++- .../unitTests/StatsInstrumentedUnitTest.kt | 25 ++++++----- .../filter/BlindFilterInstrumentedTest.kt | 9 ++-- .../filter/DateFilterInstrumentedUnitTest.kt | 35 ++++++++------- .../SessionFilterInstrumentedUnitTest.kt | 45 ++++++++++--------- 7 files changed, 86 insertions(+), 72 deletions(-) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/model/CriteriaTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/model/CriteriaTest.kt index c0040e5c..1248af55 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/model/CriteriaTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/model/CriteriaTest.kt @@ -1,16 +1,10 @@ package net.pokeranalytics.android.model import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest -import net.pokeranalytics.android.components.RealmInstrumentedUnitTest import net.pokeranalytics.android.model.filter.QueryCondition -import net.pokeranalytics.android.model.realm.Filter -import net.pokeranalytics.android.model.realm.FilterCondition import net.pokeranalytics.android.model.realm.Session -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow -import org.junit.Assert +import org.junit.Assert.assertEquals import org.junit.Test - -import org.junit.Assert.* import java.util.* class CriteriaTest : BaseFilterInstrumentedUnitTest() { @@ -39,12 +33,23 @@ class CriteriaTest : BaseFilterInstrumentedUnitTest() { realm.commitTransaction() - val years = Criteria.Years.queryConditions as List - println("years = ${years.map { it.getDisplayName() }}") + val yearQueries = Criteria.Years.queryConditions + + assertEquals(16, yearQueries.size) + + val firstYearCondition = yearQueries.first().conditions.first() as QueryCondition.AnyYear + assertEquals(firstValue - 10, firstYearCondition.listOfValues.first()) + + val lastYearCondition = yearQueries.last().conditions.first() as QueryCondition.AnyYear + assertEquals(lastValue, lastYearCondition.listOfValues.first()) + - assertEquals(16, years.size) - assertEquals(firstValue-10, years.first().listOfValues.first()) - assertEquals(lastValue, years.last().listOfValues.first()) +// val years = Criteria.Years.queryConditions as List +// println("years = ${years.map { it.getDisplayName() }}") +// +// assertEquals(16, years.size) +// assertEquals(firstValue-10, years.first().listOfValues.first()) +// assertEquals(lastValue, years.last().listOfValues.first()) } @Test @@ -53,7 +58,7 @@ class CriteriaTest : BaseFilterInstrumentedUnitTest() { val criterias = listOf(Criteria.MonthsOfYear, Criteria.DaysOfWeek) val combined = criterias.combined() combined.forEach { - it.forEach {qc-> + it.conditions.forEach {qc-> println(qc.getDisplayName()) } } @@ -82,9 +87,9 @@ class CriteriaTest : BaseFilterInstrumentedUnitTest() { realm.commitTransaction() - val allMonths = Criteria.AllMonthsUpToNow.predicates + val allMonths = Criteria.AllMonthsUpToNow.queries allMonths.forEach { - it.forEach {qc-> + it.conditions.forEach { qc-> println("<<<<< ${qc.getDisplayName()}") } } diff --git a/app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt index 03d39f69..e37cdf53 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt @@ -8,6 +8,7 @@ import net.pokeranalytics.android.calculus.ComputableGroup import net.pokeranalytics.android.calculus.ComputedResults import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.components.RealmInstrumentedUnitTest +import net.pokeranalytics.android.model.filter.Query import net.pokeranalytics.android.model.realm.ComputableResult import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.model.realm.SessionSet @@ -54,7 +55,7 @@ class PerfsInstrumentedUnitTest : RealmInstrumentedUnitTest() { Timber.d("sets: ${sets.size}") val stats: List = listOf(Stat.NET_RESULT, Stat.AVERAGE) - val group = ComputableGroup("test", listOf(), stats) + val group = ComputableGroup(Query(), stats) val options = Calculator.Options() options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatPerformanceUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatPerformanceUnitTest.kt index e7b9773b..7b9f296e 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatPerformanceUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatPerformanceUnitTest.kt @@ -2,6 +2,7 @@ package net.pokeranalytics.android.unitTests import androidx.test.ext.junit.runners.AndroidJUnit4 import net.pokeranalytics.android.components.SessionInstrumentedUnitTest +import net.pokeranalytics.android.model.realm.Bankroll import net.pokeranalytics.android.model.realm.Result import net.pokeranalytics.android.model.realm.Session import org.junit.Test @@ -16,8 +17,11 @@ class StatPerformanceUnitTest : SessionInstrumentedUnitTest() { val realm = mockRealm realm.beginTransaction() + val bankroll = realm.createObject(Bankroll::class.java, "1") + bankroll.live = false + for (index in 0..100) { - Session.testInstance((-2000..2000).random().toDouble()) + Session.testInstance((-2000..2000).random().toDouble(), bankroll = bankroll) println("*** creating $index") } diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt index 6ae76539..6e56b746 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt @@ -7,6 +7,7 @@ import net.pokeranalytics.android.calculus.ComputableGroup import net.pokeranalytics.android.calculus.ComputedResults import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.components.SessionInstrumentedUnitTest +import net.pokeranalytics.android.model.filter.Query import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.realm.* import net.pokeranalytics.android.model.realm.Currency @@ -72,7 +73,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { println(">>>>>> rated net = ${it.ratedNet} ") } - val group = ComputableGroup("test") + val group = ComputableGroup(Query()) val options = Calculator.Options() options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION, @@ -251,7 +252,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { } val stats: List = listOf(Stat.NET_RESULT, Stat.AVERAGE) - val group = ComputableGroup("test", listOf(), stats) + val group = ComputableGroup(Query(), stats) val options = Calculator.Options() options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) @@ -318,7 +319,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { realm.commitTransaction() val stats: List = listOf(Stat.NET_RESULT, Stat.AVERAGE) - val group = ComputableGroup("test", listOf(), stats) + val group = ComputableGroup(Query(), stats) val options = Calculator.Options() options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) @@ -401,7 +402,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { realm.commitTransaction() val stats: List = listOf(Stat.NET_RESULT, Stat.AVERAGE) - val group = ComputableGroup("test", listOf(), stats) + val group = ComputableGroup(Query(), stats) val options = Calculator.Options() options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) @@ -421,7 +422,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { } val stats2: List = listOf(Stat.NET_RESULT, Stat.AVERAGE) - val group2 = ComputableGroup("test", listOf(), stats2) + val group2 = ComputableGroup(Query(), stats2) val results2: ComputedResults = Calculator.compute(realm, group2, options) @@ -546,7 +547,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { } val stats: List = listOf(Stat.NET_RESULT, Stat.AVERAGE) - val group = ComputableGroup("test", listOf(), stats) + val group = ComputableGroup(Query(), stats) val options = Calculator.Options() // options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) @@ -598,7 +599,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { } val stats: List = listOf(Stat.NET_RESULT) - val group = ComputableGroup("test", listOf(), stats) + val group = ComputableGroup(Query(), stats) val options = Calculator.Options() val results: ComputedResults = Calculator.compute(realm, group, options) @@ -634,7 +635,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { } val stats: List = listOf(Stat.NET_RESULT) - val group = ComputableGroup("test", listOf(), stats) + val group = ComputableGroup(Query(), stats) val options = Calculator.Options() val results: ComputedResults = Calculator.compute(realm, group, options) @@ -652,7 +653,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { } } - val updatedGroup = ComputableGroup("test", listOf(), stats) + val updatedGroup = ComputableGroup(Query(), stats) val updatedResults: ComputedResults = Calculator.compute(realm, updatedGroup, options) val updatedNetResult = updatedResults.computedStat(Stat.NET_RESULT) assertEquals(650.0, updatedNetResult?.value) @@ -683,7 +684,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { s2.endDate = ed2 } - val group = ComputableGroup("", listOf(), listOf()) + val group = ComputableGroup(Query(), listOf()) val options = Calculator.Options(stats = listOf(Stat.DAYS_PLAYED)) val report = Calculator.computeGroups(realm, listOf(group), options) @@ -724,7 +725,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { } - val group = ComputableGroup("test", listOf(QueryCondition.IsCash)) + val group = ComputableGroup(Query(QueryCondition.IsCash)) val options = Calculator.Options() options.displayedStats = listOf(Stat.HOURLY_DURATION) @@ -769,7 +770,7 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() { } - val group = ComputableGroup("test", listOf(QueryCondition.IsCash)) + val group = ComputableGroup(Query(QueryCondition.IsCash)) val options = Calculator.Options() options.displayedStats = listOf(Stat.HOURLY_DURATION) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt index 93cbaac2..f1a85431 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt @@ -1,6 +1,7 @@ package net.pokeranalytics.android.unitTests.filter import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest +import net.pokeranalytics.android.model.filter.Query import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.realm.Bankroll import net.pokeranalytics.android.model.realm.Filter @@ -51,7 +52,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { val filterElement = FilterCondition(filterElementRows = arrayListOf(blind)) filter.updateValueBy(filterElement) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(2, sessions.size) sessions.map { @@ -102,7 +103,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { val filterElements = FilterCondition(filterElementRows = arrayListOf(blind1, blind2)) filter.updateValueBy(filterElements) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(2, sessions.size) sessions.map { @@ -150,7 +151,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { val filterElement = FilterCondition(filterElementRows = arrayListOf(blind)) filter.updateValueBy(filterElement) println("<<<< ${filter.listOfValues}") - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) sessions.map { @@ -202,7 +203,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { val filterElement = FilterCondition(filterElementRows = arrayListOf(blind1, blind2)) filter.updateValueBy(filterElement) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(2, sessions.size) sessions.map { diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt index 79ab6ab6..a09ba699 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt @@ -2,6 +2,7 @@ package net.pokeranalytics.android.unitTests.filter import androidx.test.ext.junit.runners.AndroidJUnit4 import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest +import net.pokeranalytics.android.model.filter.Query import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.realm.Filter import net.pokeranalytics.android.model.realm.FilterCondition @@ -37,7 +38,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElement = FilterCondition(arrayListOf(filterElementRow)) filter.updateValueBy(filterElement) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -66,7 +67,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElement = FilterCondition(arrayListOf(filterElementRow)) filter.updateValueBy(filterElement) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -94,7 +95,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElement = FilterCondition(arrayListOf(filterElementRow)) filter.updateValueBy(filterElement) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -117,7 +118,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Session.testInstance(100.0, true, cal.time) realm.commitTransaction() - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.IsWeekEnd)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.IsWeekEnd)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -142,7 +143,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { realm.commitTransaction() - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.IsWeekDay)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.IsWeekDay)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -167,7 +168,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Assert.assertTrue(realm.where(Session::class.java).findAll().count() == 2) - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.IsToday)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.IsToday)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -192,7 +193,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Assert.assertTrue(realm.where(Session::class.java).findAll().count() == 2) - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.IsToday)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.IsToday)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -220,7 +221,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Assert.assertTrue(realm.where(Session::class.java).findAll().count() == 3) - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.WasYesterday)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.WasYesterday)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -247,7 +248,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Assert.assertTrue(realm.where(Session::class.java).findAll().count() == 3) - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.WasYesterday)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.WasYesterday)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -274,7 +275,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Assert.assertTrue(realm.where(Session::class.java).findAll().count() == 3) - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.WasTodayAndYesterday)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.WasTodayAndYesterday)) Assert.assertEquals(2, sessions.size) Assert.assertTrue(sessions.containsAll(arrayListOf(s1,s2))) @@ -305,7 +306,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Assert.assertTrue(realm.where(Session::class.java).findAll().count() == 5) - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.DuringThisYear)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.DuringThisYear)) Assert.assertEquals(3, sessions.size) Assert.assertTrue(sessions.containsAll(arrayListOf(s1,s2, s3))) @@ -337,7 +338,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Assert.assertTrue(realm.where(Session::class.java).findAll().count() == 5) - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.DuringThisMonth)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.DuringThisMonth)) Assert.assertEquals(2, sessions.size) Assert.assertTrue(sessions.containsAll(arrayListOf(s1,s2))) @@ -361,7 +362,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Assert.assertTrue(realm.where(Session::class.java).findAll().count() == 2) - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.DuringThisWeek)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.DuringThisWeek)) Assert.assertEquals(1, sessions.size) Assert.assertTrue(sessions.containsAll(arrayListOf(s1))) @@ -387,7 +388,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -415,7 +416,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -444,7 +445,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -473,7 +474,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt index 96a74496..0b1de7a0 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt @@ -3,6 +3,7 @@ package net.pokeranalytics.android.unitTests.filter import androidx.test.ext.junit.runners.AndroidJUnit4 import io.realm.RealmList import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest +import net.pokeranalytics.android.model.filter.Query import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.realm.* import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow @@ -24,7 +25,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Session.testInstance(100.0, true, Date(), 1) realm.commitTransaction() - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.IsCash)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.IsCash)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -42,7 +43,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Session.testInstance(100.0, true, Date(), 1) realm.commitTransaction() - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.IsTournament)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.IsTournament)) Assert.assertEquals(1, sessions.size) sessions[0]?.run { @@ -65,7 +66,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Session.testInstance(100.0, true, Date(), 1, b2) realm.commitTransaction() - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.IsLive)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.IsLive)) Assert.assertEquals(1, sessions.size) (sessions[0] as Session).bankroll?.run { @@ -87,7 +88,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { Session.testInstance(100.0, true, Date(), 1, b2) realm.commitTransaction() - val sessions = Filter.queryOn(realm, arrayListOf(QueryCondition.IsOnline)) + val sessions = Filter.queryOn(realm, Query(QueryCondition.IsOnline)) Assert.assertEquals(1, sessions.size) (sessions[0] as Session).bankroll?.run { @@ -112,7 +113,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.BANKROLL filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) (sessions[0] as Session).bankroll?.run { @@ -146,7 +147,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow2.filterSectionRow = FilterSectionRow.BANKROLL filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(6, sessions.size) @@ -169,7 +170,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val anyGame = QueryCondition.AnyGame(g2) val fc = FilterCondition(filterElementRows = arrayListOf(anyGame)) - val sessions = Filter.queryOn(realm, arrayListOf(fc.queryCondition)) + val sessions = Filter.queryOn(realm, Query(fc.queryCondition)) Assert.assertEquals(1, sessions.size) (sessions[0] as Session).game?.run { @@ -201,7 +202,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow2.filterSectionRow = FilterSectionRow.GAME val filterCondition = FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)) val queryCondition = filterCondition.queryCondition - val sessions = Filter.queryOn(realm, arrayListOf(queryCondition)) + val sessions = Filter.queryOn(realm, Query(queryCondition)) Assert.assertEquals(6, sessions.size) @@ -227,7 +228,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.LOCATION filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) (sessions[0] as Session).location?.run { @@ -262,7 +263,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(6, sessions.size) @@ -289,7 +290,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) (sessions[0] as Session).tournamentName?.run { @@ -322,7 +323,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(6, sessions.size) @@ -360,7 +361,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow3.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(1, sessions.size) (sessions[0] as Session).run { @@ -397,7 +398,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow4.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3, filterElementRow4))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(8, sessions.size) } @@ -425,7 +426,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) val result = arrayListOf(s1.id, s2.id, s3.id, s4.id) @@ -452,7 +453,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.TABLE_SIZE filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(2, sessions.size) @@ -477,7 +478,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.VALUE filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) - val sessions = Filter.queryOn(realm, arrayListOf(filterElementRow)) + val sessions = Filter.queryOn(realm, Query(filterElementRow)) Assert.assertEquals(2, sessions.size) @@ -502,7 +503,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.VALUE filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) - val sessions = Filter.queryOn(realm, arrayListOf(filter)) + val sessions = Filter.queryOn(realm, Query(filter)) Assert.assertEquals(3, sessions.size) @@ -532,7 +533,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow2.filterSectionRow = FilterSectionRow.VALUE filterLess.updateValueBy(FilterCondition(arrayListOf(filterElementRow2))) - val sessions = Filter.queryOn(realm, arrayListOf(filterMore, filterLess)) + val sessions = Filter.queryOn(realm, Query(filterMore, filterLess)) Assert.assertEquals(1, sessions.size) @@ -564,7 +565,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { realm.commitTransaction() val filterMore = QueryCondition.NumberOfRebuy(QueryCondition.Operator.MORE, 5.0) - val sessions = Filter.queryOn(realm, arrayListOf(filterMore)) + val sessions = Filter.queryOn(realm, Query(filterMore)) Assert.assertEquals(2, sessions.size) @@ -592,7 +593,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { realm.commitTransaction() val filterLess = QueryCondition.TournamentFinalPosition(QueryCondition.Operator.LESS, finalPosition = 1) - var sessions = Filter.queryOn(realm, arrayListOf(filterLess)) + var sessions = Filter.queryOn(realm, Query(filterLess)) Assert.assertEquals(1, sessions.size) @@ -603,7 +604,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterMore = QueryCondition.TournamentFinalPosition(QueryCondition.Operator.MORE, finalPosition = 10) - sessions = Filter.queryOn(realm, arrayListOf(filterMore)) + sessions = Filter.queryOn(realm, Query(filterMore)) Assert.assertEquals(1, sessions.size) From 90819d50e6ee08b75ce10f7f2445c3a58bcb356a Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 29 Apr 2019 14:09:50 +0200 Subject: [PATCH 5/7] warning removal --- .../android/unitTests/BankrollInstrumentedUnitTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt index bc4792f4..2a492a8e 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt @@ -27,7 +27,7 @@ class BankrollInstrumentedUnitTest : SessionInstrumentedUnitTest() { // convenience extension fun Session.Companion.testInstance(netResult: Double, startDate: Date, endDate: Date?): Session { - val session: Session = Session.newInstance(super.mockRealm, false) + val session: Session = newInstance(super.mockRealm, false) session.result?.netResult = netResult session.startDate = startDate session.endDate = endDate @@ -43,8 +43,8 @@ class BankrollInstrumentedUnitTest : SessionInstrumentedUnitTest() { this.createDefaultTransactionTypes(realm) - var br1 = realm.createObject(Bankroll::class.java, "1") - var br2 = realm.createObject(Bankroll::class.java, "2") + val br1 = realm.createObject(Bankroll::class.java, "1") + val br2 = realm.createObject(Bankroll::class.java, "2") br1.initialValue = 100.0 br2.initialValue = 1000.0 From 037c73ba7f7cddf3041960a6ce451af170cb8b7a Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 29 Apr 2019 14:17:51 +0200 Subject: [PATCH 6/7] Fixing strings conflicts --- app/src/main/res/values/strings.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9b5f049f..73666f07 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,14 +10,8 @@ Lines Initial Value Can\'t show because there is less than two values to display! -<<<<<<< HEAD - -======= The object you\'re trying to access is invalid ->>>>>>> 94f412c... Improving labels - - Address Naming suggestions %s deleted From 5dfc99ba9ca9f91252cac4b0d6dca98042ac1a7e Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 29 Apr 2019 14:32:16 +0200 Subject: [PATCH 7/7] Fixing bankroll test --- .../unitTests/BankrollInstrumentedUnitTest.kt | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt index 2a492a8e..c97752b1 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt @@ -44,40 +44,46 @@ class BankrollInstrumentedUnitTest : SessionInstrumentedUnitTest() { this.createDefaultTransactionTypes(realm) val br1 = realm.createObject(Bankroll::class.java, "1") + br1.name = "br1" val br2 = realm.createObject(Bankroll::class.java, "2") + br2.name = "br2" br1.initialValue = 100.0 br2.initialValue = 1000.0 val t1 = realm.createObject(Transaction::class.java, UUID.randomUUID().toString()) t1.amount = 100.0 - t1.bankroll = br1 t1.type = TransactionType.getByValue(TransactionType.Value.BONUS, realm) + br1.transactions.add(t1) + val t2 = realm.createObject(Transaction::class.java, UUID.randomUUID().toString()) t2.amount = 500.0 - t2.bankroll = br2 t2.type = TransactionType.getByValue(TransactionType.Value.BONUS, realm) + br2.transactions.add(t2) val s1 = newSessionInstance(realm) s1.bankroll = br1 s1.result?.cashout = 200.0 + val s2 = newSessionInstance(realm) s2.bankroll = br2 s2.result?.cashout = 500.0 - val brSetup1 = BankrollReportSetup(br1) - val report1 = BankrollCalculator.computeReport(brSetup1) - Assert.assertEquals(400.0, report1.total, EPSILON) + } - val brSetup2 = BankrollReportSetup(br2) - val report2 = BankrollCalculator.computeReport(brSetup2) - Assert.assertEquals(2000.0, report2.total, EPSILON) + val br1 = realm.where(Bankroll::class.java).equalTo("name", "br1").findFirst() + val brSetup1 = BankrollReportSetup(br1) + val report1 = BankrollCalculator.computeReport(brSetup1) + Assert.assertEquals(400.0, report1.total, EPSILON) - val brSetupAll = BankrollReportSetup() - val reportAll = BankrollCalculator.computeReport(brSetupAll) - Assert.assertEquals(2400.0, reportAll.total, EPSILON) + val br2 = realm.where(Bankroll::class.java).equalTo("name", "br2").findFirst() + val brSetup2 = BankrollReportSetup(br2) + val report2 = BankrollCalculator.computeReport(brSetup2) + Assert.assertEquals(2000.0, report2.total, EPSILON) - } + val brSetupAll = BankrollReportSetup() + val reportAll = BankrollCalculator.computeReport(brSetupAll) + Assert.assertEquals(2400.0, reportAll.total, EPSILON) }