Refactor account code and tests.

2025-10-12 15:35:15 +00:00 · 2018-07-14 11:45:05 +02:00
parent a95fdb903b
commit 9116796d90
10 changed files with 271 additions and 168 deletions
--- a/tests/Feature/Controllers/Account/DeleteControllerTest.php
+++ b/tests/Feature/Controllers/Account/DeleteControllerTest.php
@@ -31,13 +31,21 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Support\Collection;
 use Tests\TestCase;
-
+use Log;
 /**
 *
 * Class DeleteControllerTest
 */
 class DeleteControllerTest extends TestCase
 {
+    /**
+     *
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        Log::debug(sprintf('Now in %s.', \get_class($this)));
+    }
    /**
     * @covers \FireflyIII\Http\Controllers\Account\DeleteController
     * @covers \FireflyIII\Http\Controllers\Controller
--- a/tests/Feature/Controllers/Account/EditControllerTest.php
+++ b/tests/Feature/Controllers/Account/EditControllerTest.php
@@ -34,22 +34,26 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Support\Collection;
 use Mockery;
 use Tests\TestCase;
-
+use Log;
 /**
 *
 * Class EditControllerTest
 */
 class EditControllerTest extends TestCase
 {
-
+    /**
+     *
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        Log::debug(sprintf('Now in %s.', \get_class($this)));
+    }
    /**
     * @covers \FireflyIII\Http\Controllers\Account\EditController
     */
    public function testEdit(): void
    {
-        $note       = new Note();
-        $note->text = 'This is a test';
-        // mock stuff
        $journalRepos = $this->mock(JournalRepositoryInterface::class);
        $repository   = $this->mock(CurrencyRepositoryInterface::class);
        $accountRepos = $this->mock(AccountRepositoryInterface::class);
@@ -57,7 +61,7 @@ class EditControllerTest extends TestCase
        $repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1));
        $repository->shouldReceive('get')->andReturn(new Collection);
        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $accountRepos->shouldReceive('getNote')->andReturn($note)->once();
+        $accountRepos->shouldReceive('getNoteText')->andReturn('Some text')->once();
        $accountRepos->shouldReceive('getOpeningBalanceAmount')->andReturnNull();
        $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturnNull();
        $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1');
@@ -73,7 +77,7 @@ class EditControllerTest extends TestCase
        $response->assertStatus(200);
        // has bread crumb
        $response->assertSee('<ol class="breadcrumb">');
-        $response->assertSee($note->text);
+        $response->assertSee('Some text');
    }

    /**
@@ -81,8 +85,6 @@ class EditControllerTest extends TestCase
     */
    public function testEditNull(): void
    {
-        $note       = new Note();
-        $note->text = 'This is a test';
        // mock stuff
        $journalRepos = $this->mock(JournalRepositoryInterface::class);
        $repository   = $this->mock(CurrencyRepositoryInterface::class);
@@ -92,7 +94,7 @@ class EditControllerTest extends TestCase
        $repository->shouldReceive('findNull')->once()->andReturn(null);
        $repository->shouldReceive('get')->andReturn(new Collection);
        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $accountRepos->shouldReceive('getNote')->andReturn($note)->once();
+        $accountRepos->shouldReceive('getNoteText')->andReturn('Some text')->once();
        $accountRepos->shouldReceive('getOpeningBalanceAmount')->andReturnNull();
        $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturnNull();
        $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1');
@@ -108,7 +110,7 @@ class EditControllerTest extends TestCase
        $response->assertStatus(200);
        // has bread crumb
        $response->assertSee('<ol class="breadcrumb">');
-        $response->assertSee($note->text);
+        $response->assertSee('Some text');
    }


@@ -157,7 +159,7 @@ class EditControllerTest extends TestCase
        $this->be($this->user());
        $data = [
            'name'           => 'updated account ' . random_int(1000, 9999),
-            'active'         => 1,ss
+            'active'         => 1,
            'what'           => 'asset',
            'return_to_edit' => '1',
        ];
--- a/tests/Feature/Controllers/Account/IndexControllerTest.php
+++ b/tests/Feature/Controllers/Account/IndexControllerTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * IndexControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+declare(strict_types=1);
+
+namespace Tests\Feature\Controllers\Account;
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Support\Collection;
+use Log;
+use Mockery;
+use Steam;
+use Tests\TestCase;
+
+/**
+ * Class IndexControllerTest
+ *
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class IndexControllerTest extends TestCase
+{
+    /**
+     *
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        Log::debug(sprintf('Now in %s.', \get_class($this)));
+    }
+
+
+    /**
+     * @covers       \FireflyIII\Http\Controllers\Account\IndexController
+     * @dataProvider dateRangeProvider
+     *
+     * @param string $range
+     *
+     */
+    public function testIndex(string $range): void
+    {
+        // mock stuff
+        $account       = factory(Account::class)->make();
+        $repository    = $this->mock(AccountRepositoryInterface::class);
+        $journalRepos  = $this->mock(JournalRepositoryInterface::class);
+        $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
+        $repository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account]));
+        $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1');
+        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
+        $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1));
+        Steam::shouldReceive('balancesByAccounts')->andReturn([$account->id => '100']);
+        Steam::shouldReceive('getLastActivities')->andReturn([]);
+
+        $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123');
+
+        $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
+        $response = $this->get(route('accounts.index', ['asset']));
+        $response->assertStatus(200);
+        // has bread crumb
+        $response->assertSee('<ol class="breadcrumb">');
+    }
+}
--- a/tests/Feature/Controllers/Account/ReconcileControllerTest.php
+++ b/tests/Feature/Controllers/Account/ReconcileControllerTest.php
@@ -43,7 +43,7 @@ class ReconcileControllerTest extends TestCase
    /**
     *
     */
-    public function setUp()
+    public function setUp(): void
    {
        parent::setUp();
        Log::debug(sprintf('Now in %s.', \get_class($this)));
--- a/tests/Feature/Controllers/Account/ShowControllerTest.php
+++ b/tests/Feature/Controllers/Account/ShowControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * AccountControllerTest.php
- * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * ShowControllerTest.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
 *
 * This file is part of Firefly III.
 *
@@ -18,16 +18,13 @@
 * You should have received a copy of the GNU General Public License
 * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
 */
+
 declare(strict_types=1);

-namespace Tests\Feature\Controllers;
+namespace Tests\Feature\Controllers\Account;

-use Amount;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
-use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
@@ -38,67 +35,26 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Log;
-use Mockery;
-use Preferences;
-use Steam;
 use Tests\TestCase;

 /**
- * Class AccountControllerTest
 *
- * @SuppressWarnings(PHPMD.TooManyPublicMethods)
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * Class ShowControllerTest
 */
-class AccountControllerTest extends TestCase
+class ShowControllerTest extends TestCase
 {
    /**
     *
     */
-    public function setUp()
+    public function setUp(): void
    {
        parent::setUp();
        Log::debug(sprintf('Now in %s.', \get_class($this)));
    }


-
    /**
-     * @covers       \FireflyIII\Http\Controllers\AccountController::index
-     * @covers       \FireflyIII\Http\Controllers\AccountController::__construct
-     * @covers       \FireflyIII\Http\Controllers\AccountController::isInArray
-     * @dataProvider dateRangeProvider
-     *
-     * @param string $range
-     *
-     */
-    public function testIndex(string $range): void
-    {
-        // mock stuff
-        $account       = factory(Account::class)->make();
-        $repository    = $this->mock(AccountRepositoryInterface::class);
-        $journalRepos  = $this->mock(JournalRepositoryInterface::class);
-        $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
-        $repository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account]));
-        $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1');
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1));
-        Steam::shouldReceive('balancesByAccounts')->andReturn([$account->id => '100']);
-        Steam::shouldReceive('getLastActivities')->andReturn([]);
-
-        $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123');
-
-        $this->be($this->user());
-        $this->changeDateRange($this->user(), $range);
-        $response = $this->get(route('accounts.index', ['asset']));
-        $response->assertStatus(200);
-        // has bread crumb
-        $response->assertSee('<ol class="breadcrumb">');
-    }
-
-    /**
-     * @covers       \FireflyIII\Http\Controllers\AccountController::show
-     * @covers       \FireflyIII\Http\Controllers\AccountController::getPeriodOverview
+     * @covers       \FireflyIII\Http\Controllers\Account\ShowController
     * @dataProvider dateRangeProvider
     *
     * @param string $range
@@ -145,8 +101,7 @@ class AccountControllerTest extends TestCase


    /**
-     * @covers       \FireflyIII\Http\Controllers\AccountController
-     * @covers       \FireflyIII\Http\Controllers\AccountController
+     * @covers       \FireflyIII\Http\Controllers\Account\ShowController
     * @dataProvider dateRangeProvider
     *
     * @param string $range
@@ -192,7 +147,7 @@ class AccountControllerTest extends TestCase
    }

    /**
-     * @covers                   \FireflyIII\Http\Controllers\AccountController::show
+     * @covers       \FireflyIII\Http\Controllers\Account\ShowController
     * @expectedExceptionMessage End is after start!
     */
    public function testShowBrokenBadDates(): void
@@ -210,8 +165,7 @@ class AccountControllerTest extends TestCase
    }

    /**
-     * @covers                   \FireflyIII\Http\Controllers\AccountController::show
-     * @covers                   \FireflyIII\Http\Controllers\AccountController::redirectToOriginalAccount
+     * @covers       \FireflyIII\Http\Controllers\Account\ShowController
     * @expectedExceptionMessage Expected a transaction
     */
    public function testShowBrokenInitial(): void
@@ -230,7 +184,7 @@ class AccountControllerTest extends TestCase
    }

    /**
-     * @covers       \FireflyIII\Http\Controllers\AccountController::show
+     * @covers       \FireflyIII\Http\Controllers\Account\ShowController
     * @dataProvider dateRangeProvider
     *
     * @param string $range
@@ -267,8 +221,7 @@ class AccountControllerTest extends TestCase
    }

    /**
-     * @covers       \FireflyIII\Http\Controllers\AccountController::show
-     * @covers       \FireflyIII\Http\Controllers\AccountController::redirectToOriginalAccount
+     * @covers       \FireflyIII\Http\Controllers\Account\ShowController
     */
    public function testShowInitial(): void
    {
@@ -286,4 +239,4 @@ class AccountControllerTest extends TestCase
        $response->assertStatus(302);
    }

-}
+}