merge

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,41 +43,47 @@ 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")
+			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)
 
 	}
 

app/src/main/res/values/strings.xml

@@ -11,8 +11,11 @@
     <string name="initial_value">Initial Value</string>
     <string name="less_then_2_values_for_display">Can\'t show because there is less than two values to display!</string>
     <string name="invalid_object">The object you\'re trying to access is invalid</string>
+<<<<<<< HEAD
 
     <!--<string name="default_error_message">Sorry, something went wrong...please contact us!</string>-->
+=======
+>>>>>>> dev
 
     <string name="address">Address</string>
     <string name="suggestions">Naming suggestions</string>