X-Git-Url: https://git.ktnx.net/?p=mobile-ledger-staging.git;a=blobdiff_plain;f=app%2Fsrc%2Ftest%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfileTest.java;h=edbd5a7407123ee07aab9326cef0e96eaf33dd63;hp=8416c1015097a6225e4456f0e0903b3f46b830c1;hb=1aac3d8310057f17400cd194ffcd9352f3021c11;hpb=748544f53147c7e811f8b11c081ed162a3870cb3 diff --git a/app/src/test/java/net/ktnx/mobileledger/model/MobileLedgerProfileTest.java b/app/src/test/java/net/ktnx/mobileledger/model/MobileLedgerProfileTest.java index 8416c101..edbd5a74 100644 --- a/app/src/test/java/net/ktnx/mobileledger/model/MobileLedgerProfileTest.java +++ b/app/src/test/java/net/ktnx/mobileledger/model/MobileLedgerProfileTest.java @@ -37,14 +37,16 @@ public class MobileLedgerProfileTest { } private void aTest(LedgerAccount[] oldList, LedgerAccount[] newList, LedgerAccount[] expectedResult) { - List result = MobileLedgerProfile.mergeAccountLists(listFromArray(oldList), - listFromArray(newList)); + List result = + MobileLedgerProfile.mergeAccountListsFromWeb(listFromArray(oldList), + listFromArray(newList)); assertArrayEquals(expectedResult, result.toArray()); } private void negTest(LedgerAccount[] oldList, LedgerAccount[] newList, LedgerAccount[] expectedResult) { - List result = MobileLedgerProfile.mergeAccountLists(listFromArray(oldList), - listFromArray(newList)); + List result = + MobileLedgerProfile.mergeAccountListsFromWeb(listFromArray(oldList), + listFromArray(newList)); assertThrows(ArrayComparisonFailure.class, () -> assertArrayEquals(expectedResult, result.toArray())); } @@ -76,9 +78,9 @@ public class MobileLedgerProfileTest { LedgerAccount acc1b = new LedgerAccount(null, "Acc1", null); acc1b.setExpanded(true); acc1b.setAmountsExpanded(true); - List merged = - MobileLedgerProfile.mergeAccountLists(listFromArray(new LedgerAccount[]{acc1a}), - listFromArray(new LedgerAccount[]{acc1b})); + List merged = MobileLedgerProfile.mergeAccountListsFromWeb( + listFromArray(new LedgerAccount[]{acc1a}), + listFromArray(new LedgerAccount[]{acc1b})); assertArrayEquals(new LedgerAccount[]{acc1b}, merged.toArray()); assertSame(merged.get(0), acc1a); // restore original values, modified by the merge