kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Optimise test code.

Browse Source
This commit is contained in:
James Cole
2019-06-13 18:07:49 +02:00
parent 162c8af6ca
commit 5d1cfc661f
29 changed files with 110 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Unit/Console/Commands/Correction/DeleteEmptyJournalsTest.php
View File

@@ -104,7 +104,7 @@ class DeleteEmptyJournalsTest extends TestCase
$this->artisan('firefly-iii:delete-empty-journals')
->expectsOutput(sprintf('Deleted transaction journal #%d because it had an uneven number of transactions.', $journal->id))
->expectsOutput('No empty transaction journals.')
->expectsOutput('No empty transaction journals.')
->assertExitCode(0);
// verify both are gone

2
tests/Unit/Console/Commands/Correction/EnableCurrenciesTest.php
View File

@@ -50,7 +50,7 @@ class EnableCurrenciesTest extends TestCase
$count = TransactionCurrency::where('enabled', 1)->count();
$this->artisan('firefly-iii:enable-currencies')
->expectsOutput('All currencies are correctly enabled or disabled.')
->expectsOutput('All currencies are correctly enabled or disabled.')
->assertExitCode(0);

4
tests/Unit/Console/Commands/Correction/RenameMetaFieldsTest.php
View File

@@ -46,7 +46,7 @@ class RenameMetaFieldsTest extends TestCase
public function testHandle(): void
{
$this->artisan('firefly-iii:rename-meta-fields')
->expectsOutput('All meta fields are correct.')
->expectsOutput('All meta fields are correct.')
->assertExitCode(0);
}
@@ -66,7 +66,7 @@ class RenameMetaFieldsTest extends TestCase
);
$this->artisan('firefly-iii:rename-meta-fields')
->expectsOutput('Renamed 1 meta field(s).')
->expectsOutput('Renamed 1 meta field(s).')
->assertExitCode(0);
// verify update

7
tests/Unit/Console/Commands/DecryptDatabaseTest.php
View File

@@ -61,7 +61,6 @@ class DecryptDatabaseTest extends TestCase
]);
FireflyConfig::shouldReceive('get')->withArgs([Mockery::any(), false])->atLeast()->once()->andReturn(null);
FireflyConfig::shouldReceive('set')->withArgs([Mockery::any(), true])->atLeast()->once();
@@ -113,9 +112,9 @@ class DecryptDatabaseTest extends TestCase
public function testHandleNotEncrypted(): void
{
// create encrypted account:
$name = 'Encrypted name';
$iban = 'HR1723600001101234565';
$account = Account::create(
$name = 'Encrypted name';
$iban = 'HR1723600001101234565';
$account = Account::create(
[
'user_id' => 1,
'account_type_id' => 1,

21
tests/Unit/Console/Commands/Tools/ApplyRulesTest.php
View File

@@ -27,6 +27,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\TransactionRules\Engine\RuleEngine;
use Illuminate\Support\Collection;
use Log;
@@ -59,6 +60,7 @@ class ApplyRulesTest extends TestCase
$collector = $this->mock(GroupCollectorInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$ruleEngine = $this->mock(RuleEngine::class);
$userRepos = $this->mock(UserRepositoryInterface::class);
// data
$asset = $this->getRandomAsset();
@@ -69,6 +71,7 @@ class ApplyRulesTest extends TestCase
$rules = new Collection([$rule]);
// expected calls:
$userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
$ruleRepos->shouldReceive('setUser')->atLeast()->once();
$ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
$accountRepos->shouldReceive('setUser')->atLeast()->once();
@@ -109,7 +112,7 @@ class ApplyRulesTest extends TestCase
*
* @covers \FireflyIII\Console\Commands\Tools\ApplyRules
*/
public function testHandEmptye(): void
public function testHandEmpty(): void
{
$ruleRepos = $this->mock(RuleRepositoryInterface::class);
$ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
@@ -117,6 +120,7 @@ class ApplyRulesTest extends TestCase
$collector = $this->mock(GroupCollectorInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$ruleEngine = $this->mock(RuleEngine::class);
$userRepos = $this->mock(UserRepositoryInterface::class);
// data
$asset = $this->getRandomAsset();
@@ -125,6 +129,7 @@ class ApplyRulesTest extends TestCase
$groups = new Collection([$group]);
// expected calls:
$userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
$ruleRepos->shouldReceive('setUser')->atLeast()->once();
$ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
$accountRepos->shouldReceive('setUser')->atLeast()->once();
@@ -172,6 +177,7 @@ class ApplyRulesTest extends TestCase
$collector = $this->mock(GroupCollectorInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$ruleEngine = $this->mock(RuleEngine::class);
$userRepos = $this->mock(UserRepositoryInterface::class);
// data
$asset = $this->getRandomAsset();
@@ -181,6 +187,7 @@ class ApplyRulesTest extends TestCase
$rules = new Collection([$rule]);
// expected calls:
$userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
$ruleRepos->shouldReceive('setUser')->atLeast()->once();
$ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
$accountRepos->shouldReceive('setUser')->atLeast()->once();
@@ -227,6 +234,7 @@ class ApplyRulesTest extends TestCase
$collector = $this->mock(GroupCollectorInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$ruleEngine = $this->mock(RuleEngine::class);
$userRepos = $this->mock(UserRepositoryInterface::class);
// data
$asset = $this->getRandomAsset();
@@ -238,6 +246,7 @@ class ApplyRulesTest extends TestCase
$rules = new Collection([$activeRule]);
// expected calls:
$userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
$ruleRepos->shouldReceive('setUser')->atLeast()->once();
$ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
$accountRepos->shouldReceive('setUser')->atLeast()->once();
@@ -287,6 +296,7 @@ class ApplyRulesTest extends TestCase
$collector = $this->mock(GroupCollectorInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$ruleEngine = $this->mock(RuleEngine::class);
$userRepos = $this->mock(UserRepositoryInterface::class);
$activeGroup = $this->user()->ruleGroups()->where('active', 1)->inRandomOrder()->first();
$inactiveGroup = $this->user()->ruleGroups()->where('active', 0)->inRandomOrder()->first();
@@ -299,6 +309,7 @@ class ApplyRulesTest extends TestCase
$rules = new Collection([$rule]);
// expected calls:
$userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
$ruleRepos->shouldReceive('setUser')->atLeast()->once();
$ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
$accountRepos->shouldReceive('setUser')->atLeast()->once();
@@ -348,8 +359,10 @@ class ApplyRulesTest extends TestCase
$this->mock(GroupCollectorInterface::class);
$this->mock(AccountRepositoryInterface::class);
$this->mock(RuleEngine::class);
$userRepos = $this->mock(UserRepositoryInterface::class);
// expected calls:
$userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
$ruleRepos->shouldReceive('setUser')->atLeast()->once();
$ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
@@ -374,15 +387,17 @@ class ApplyRulesTest extends TestCase
{
$ruleRepos = $this->mock(RuleRepositoryInterface::class);
$ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$userRepos = $this->mock(UserRepositoryInterface::class);
$this->mock(RuleEngine::class);
$this->mock(JournalRepositoryInterface::class);
$this->mock(GroupCollectorInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$this->mock(RuleEngine::class);
// data
$expense = $this->getRandomExpense();
// expected calls:
$userRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($this->user());
$ruleRepos->shouldReceive('setUser')->atLeast()->once();
$ruleGroupRepos->shouldReceive('setUser')->atLeast()->once();
$accountRepos->shouldReceive('setUser')->atLeast()->once();

2
tests/Unit/Console/Commands/Upgrade/BudgetLimitCurrencyTest.php
View File

@@ -50,7 +50,7 @@ class BudgetLimitCurrencyTest extends TestCase
BudgetLimit::whereNull('transaction_currency_id')->forceDelete();
$this->artisan('firefly-iii:bl-currency')
->expectsOutput('All budget limits are correct.')
->expectsOutput('All budget limits are correct.')
->assertExitCode(0);
}

17
tests/Unit/Console/Commands/Upgrade/MigrateToGroupsTest.php
View File

@@ -57,6 +57,8 @@ class MigrateToGroupsTest extends TestCase
public function testHandle(): void
{
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$service = $this->mock(JournalDestroyService::class);
$groupFactory = $this->mock(TransactionGroupFactory::class);
// mock calls:
$journalRepos->shouldReceive('getSplitJournals')
@@ -85,9 +87,12 @@ class MigrateToGroupsTest extends TestCase
public function testHandleNoGroup(): void
{
$journalRepos = $this->mock(JournalRepositoryInterface::class);
$asset = $this->getRandomAsset();
$expense = $this->getRandomExpense();
$journal = TransactionJournal::create(
$service = $this->mock(JournalDestroyService::class);
$groupFactory = $this->mock(TransactionGroupFactory::class);
$asset = $this->getRandomAsset();
$expense = $this->getRandomExpense();
$journal = TransactionJournal::create(
[
'user_id' => 1,
'transaction_currency_id' => 1,
@@ -97,7 +102,7 @@ class MigrateToGroupsTest extends TestCase
'date' => '2019-01-01',
]
);
$one = Transaction::create(
$one = Transaction::create(
[
'transaction_journal_id' => $journal->id,
'account_id' => $asset->id,
@@ -105,7 +110,7 @@ class MigrateToGroupsTest extends TestCase
'identifier' => 1,
]
);
$two = Transaction::create(
$two = Transaction::create(
[
'transaction_journal_id' => $journal->id,
'account_id' => $expense->id,
@@ -113,7 +118,7 @@ class MigrateToGroupsTest extends TestCase
'identifier' => 1,
]
);
$array = $journal->toArray();
$array = $journal->toArray();
// mock calls:
$journalRepos->shouldReceive('getSplitJournals')

2
tests/Unit/Console/Commands/Upgrade/TransactionIdentifierTest.php
View File

@@ -140,7 +140,7 @@ class TransactionIdentifierTest extends TestCase
// assume all is well.
$this->artisan('firefly-iii:transaction-identifiers')
->expectsOutput('Fixed 2 split journal transaction identifier(s).')
->expectsOutput('Fixed 2 split journal transaction identifier(s).')
->assertExitCode(0);
// see results:

12
tests/Unit/Factory/PiggyBankEventFactoryTest.php
View File

@@ -75,7 +75,8 @@ class PiggyBankEventFactoryTest extends TestCase
* @covers \FireflyIII\Factory\PiggyBankEventFactory
*/
public function testCreateNoPiggy(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
/** @var TransactionJournal $transfer */
@@ -93,7 +94,8 @@ class PiggyBankEventFactoryTest extends TestCase
* @covers \FireflyIII\Factory\PiggyBankEventFactory
*/
public function testCreateNoRep(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
/** @var TransactionJournal $transfer */
@@ -115,7 +117,8 @@ class PiggyBankEventFactoryTest extends TestCase
* @covers \FireflyIII\Factory\PiggyBankEventFactory
*/
public function testCreateNotTransfer(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
/** @var TransactionJournal $deposit */
@@ -131,7 +134,8 @@ class PiggyBankEventFactoryTest extends TestCase
* @covers \FireflyIII\Factory\PiggyBankEventFactory
*/
public function testCreateSuccess(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
/** @var TransactionJournal $transfer */

15
tests/Unit/Factory/TransactionJournalMetaFactoryTest.php
View File

@@ -49,7 +49,8 @@ class TransactionJournalMetaFactoryTest extends TestCase
* @covers \FireflyIII\Factory\TransactionJournalMetaFactory
*/
public function testUpdateOrCreateBasic(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
/** @var TransactionJournal $journal */
@@ -72,7 +73,8 @@ class TransactionJournalMetaFactoryTest extends TestCase
* @covers \FireflyIII\Factory\TransactionJournalMetaFactory
*/
public function testUpdateOrCreateDate(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
/** @var TransactionJournal $journal */
@@ -95,7 +97,8 @@ class TransactionJournalMetaFactoryTest extends TestCase
* @covers \FireflyIII\Factory\TransactionJournalMetaFactory
*/
public function testUpdateOrCreateDeleteExisting(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
/** @var TransactionJournal $journal */
@@ -125,7 +128,8 @@ class TransactionJournalMetaFactoryTest extends TestCase
* @covers \FireflyIII\Factory\TransactionJournalMetaFactory
*/
public function testUpdateOrCreateEmpty(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
/** @var TransactionJournal $journal */
@@ -148,7 +152,8 @@ class TransactionJournalMetaFactoryTest extends TestCase
* @covers \FireflyIII\Factory\TransactionJournalMetaFactory
*/
public function testUpdateOrCreateExistingEmpty(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
/** @var TransactionJournal $journal */

5
tests/Unit/Import/Storage/ImportArrayStorageTest.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace Tests\Unit\Import\Storage;
use Carbon\Carbon;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\TransactionCollector;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
@@ -620,7 +621,7 @@ class ImportArrayStorageTest extends TestCase
/**
* @return array
* @throws \Exception
* @throws Exception
*/
private function singleTransfer(): array
{
@@ -669,7 +670,7 @@ class ImportArrayStorageTest extends TestCase
/**
* @return array
* @throws \Exception
* @throws Exception
*/
private function singleWithdrawal(): array
{

6
tests/Unit/Middleware/BinderTest.php
View File

@@ -835,7 +835,8 @@ class BinderTest extends TestCase
* @covers \FireflyIII\Support\Binder\JournalList
*/
public function testJournalList(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
Route::middleware(Binder::class)->any(
@@ -854,7 +855,8 @@ class BinderTest extends TestCase
* @covers \FireflyIII\Support\Binder\JournalList
*/
public function testJournalListEmpty(): void
{ $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
Route::middleware(Binder::class)->any(

12
tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php
View File

@@ -498,8 +498,8 @@ class ImportTransactionTest extends TestCase
*/
public function testCalculateAmountNeg(): void
{
$importTransaction = new ImportTransaction;
$importTransaction->amount = '2.99';
$importTransaction = new ImportTransaction;
$importTransaction->amount = '2.99';
$importTransaction->modifiers['generic-debit-credit'] = 'D';
try {
$this->assertEquals('-2.99', $importTransaction->calculateAmount());
@@ -635,8 +635,8 @@ class ImportTransactionTest extends TestCase
*/
public function testForeignAmountModNeg(): void
{
$importTransaction = new ImportTransaction;
$importTransaction->foreignAmount = '6.77';
$importTransaction = new ImportTransaction;
$importTransaction->foreignAmount = '6.77';
$importTransaction->modifiers['generic-debit-credit'] = 'D';
$this->assertEquals('-6.77', $importTransaction->calculateForeignAmount());
}
@@ -648,8 +648,8 @@ class ImportTransactionTest extends TestCase
*/
public function testForeignAmountModPos(): void
{
$importTransaction = new ImportTransaction;
$importTransaction->foreignAmount = '-5.77';
$importTransaction = new ImportTransaction;
$importTransaction->foreignAmount = '-5.77';
$importTransaction->modifiers['generic-debit-credit'] = 'C';
$this->assertEquals('5.77', $importTransaction->calculateForeignAmount());
}

3
tests/Unit/TransactionRules/Actions/ConvertToDepositTest.php
View File

@@ -93,7 +93,8 @@ class ConvertToDepositTest extends TestCase
* @covers \FireflyIII\TransactionRules\Actions\ConvertToDeposit
*/
public function testActWithdrawal()
{$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$revenue = $this->getRandomRevenue();

3
tests/Unit/TransactionRules/Actions/ConvertToTransferTest.php
View File

@@ -55,7 +55,8 @@ class ConvertToTransferTest extends TestCase
* @covers \FireflyIII\TransactionRules\Actions\ConvertToTransfer
*/
public function testActDeposit(): void
{$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$deposit = $this->getRandomDeposit();

3
tests/Unit/TransactionRules/Actions/ConvertToWithdrawalTest.php
View File

@@ -54,7 +54,8 @@ class ConvertToWithdrawalTest extends TestCase
* @covers \FireflyIII\TransactionRules\Actions\ConvertToWithdrawal
*/
public function testActDeposit()
{$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
$expense = $this->getRandomExpense();