Expand tests.

This commit is contained in:
James Cole 2017-03-17 16:34:57 +01:00
parent fd1f06c2cb
commit e2f3788ff5
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
9 changed files with 63 additions and 5 deletions

View File

@ -438,8 +438,9 @@ class CategoryController extends Controller
return $cache->get(); // @codeCoverageIgnore return $cache->get(); // @codeCoverageIgnore
} }
Log::debug('Going to get period expenses and incomes.'); Log::debug(sprintf('Going to get period expenses and incomes between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d')));
while ($end >= $start) { while ($end >= $start) {
Log::debug('Loop!');
$end = Navigation::startOfPeriod($end, $range); $end = Navigation::startOfPeriod($end, $range);
$currentEnd = Navigation::endOfPeriod($end, $range); $currentEnd = Navigation::endOfPeriod($end, $range);
@ -483,6 +484,7 @@ class CategoryController extends Controller
); );
$end = Navigation::subtractPeriod($end, $range, 1); $end = Navigation::subtractPeriod($end, $range, 1);
} }
Log::debug('End of loops');
$cache->store($entries); $cache->store($entries);
return $entries; return $entries;

View File

@ -229,7 +229,8 @@ class PiggyBankController extends Controller
'sumOfTargets' => $piggyBank->targetamount, 'sumOfTargets' => $piggyBank->targetamount,
'leftToSave' => $piggyBank->leftToSave, 'leftToSave' => $piggyBank->leftToSave,
]; ];
} else { }
if (isset($accounts[$account->id])) {
$accounts[$account->id]['sumOfSaved'] = bcadd($accounts[$account->id]['sumOfSaved'], strval($piggyBank->savedSoFar)); $accounts[$account->id]['sumOfSaved'] = bcadd($accounts[$account->id]['sumOfSaved'], strval($piggyBank->savedSoFar));
$accounts[$account->id]['sumOfTargets'] = bcadd($accounts[$account->id]['sumOfTargets'], $piggyBank->targetamount); $accounts[$account->id]['sumOfTargets'] = bcadd($accounts[$account->id]['sumOfTargets'], $piggyBank->targetamount);
$accounts[$account->id]['leftToSave'] = bcadd($accounts[$account->id]['leftToSave'], $piggyBank->leftToSave); $accounts[$account->id]['leftToSave'] = bcadd($accounts[$account->id]['leftToSave'], $piggyBank->leftToSave);

View File

@ -215,8 +215,9 @@ class TransactionController extends Controller
return $cache->get(); // @codeCoverageIgnore return $cache->get(); // @codeCoverageIgnore
} }
Log::debug('Going to get period expenses and incomes.'); Log::debug(sprintf('Going to get period expenses and incomes between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d')));
while ($end >= $start) { while ($end >= $start) {
Log::debug('Loop start!');
$end = Navigation::startOfPeriod($end, $range); $end = Navigation::startOfPeriod($end, $range);
$currentEnd = Navigation::endOfPeriod($end, $range); $currentEnd = Navigation::endOfPeriod($end, $range);
@ -238,6 +239,7 @@ class TransactionController extends Controller
'transferred' => 0, 'transferred' => 0,
'date' => clone $end, 'date' => clone $end,
]; ];
Log::debug(sprintf('What is %s', $what));
switch ($what) { switch ($what) {
default: default:
throw new FireflyException(sprintf('Cannot handle "%s"', $what)); throw new FireflyException(sprintf('Cannot handle "%s"', $what));
@ -249,6 +251,7 @@ class TransactionController extends Controller
break; break;
case 'transfers': case 'transfers':
case 'transfer': case 'transfer':
Log::debug('HERE');
$array['transferred'] = Steam::positive($sum); $array['transferred'] = Steam::positive($sum);
break; break;
@ -256,6 +259,7 @@ class TransactionController extends Controller
$entries->push($array); $entries->push($array);
$end = Navigation::subtractPeriod($end, $range, 1); $end = Navigation::subtractPeriod($end, $range, 1);
} }
Log::debug('End of loop');
$cache->store($entries); $cache->store($entries);
return $entries; return $entries;

View File

@ -33,6 +33,21 @@ $factory->define(
} }
); );
$factory->define(
FireflyIII\Models\PiggyBank::class, function (Faker\Generator $faker) {
return [
'id' => $faker->numberBetween(1, 10),
'account_id' => $faker->numberBetween(1, 10),
'name' => $faker->words(3, true),
'target_amount' => '1000.00',
'startdate' => '2017-01-01',
'order' => 1,
'active' => 1,
'encrypted' => 0,
];
}
);
$factory->define( $factory->define(
FireflyIII\Models\Tag::class, function (Faker\Generator $faker) { FireflyIII\Models\Tag::class, function (Faker\Generator $faker) {
return [ return [

View File

@ -20,6 +20,7 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Steam;
use Tests\TestCase; use Tests\TestCase;
class CategoryControllerTest extends TestCase class CategoryControllerTest extends TestCase
@ -114,6 +115,7 @@ class CategoryControllerTest extends TestCase
/** /**
* @covers \FireflyIII\Http\Controllers\CategoryController::noCategory * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory
* @covers \FireflyIII\Http\Controllers\CategoryController::noCategoryPeriodEntries
* @dataProvider dateRangeProvider * @dataProvider dateRangeProvider
* *
* @param string $range * @param string $range
@ -137,6 +139,7 @@ class CategoryControllerTest extends TestCase
$collector->shouldReceive('disableInternalFilter')->andReturnSelf(); $collector->shouldReceive('disableInternalFilter')->andReturnSelf();
$collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf();
Steam::shouldReceive('positive')->once()->andReturn('1');
$this->be($this->user()); $this->be($this->user());
$this->changeDateRange($this->user(), $range); $this->changeDateRange($this->user(), $range);
@ -148,6 +151,7 @@ class CategoryControllerTest extends TestCase
/** /**
* @covers \FireflyIII\Http\Controllers\CategoryController::noCategory * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory
* @covers \FireflyIII\Http\Controllers\CategoryController::noCategoryPeriodEntries
* @dataProvider dateRangeProvider * @dataProvider dateRangeProvider
* *
* @param string $range * @param string $range
@ -181,6 +185,7 @@ class CategoryControllerTest extends TestCase
/** /**
* @covers \FireflyIII\Http\Controllers\CategoryController::noCategory * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory
* @covers \FireflyIII\Http\Controllers\CategoryController::noCategoryPeriodEntries
* @dataProvider dateRangeProvider * @dataProvider dateRangeProvider
* *
* @param string $range * @param string $range
@ -204,6 +209,8 @@ class CategoryControllerTest extends TestCase
$collector->shouldReceive('disableInternalFilter')->andReturnSelf(); $collector->shouldReceive('disableInternalFilter')->andReturnSelf();
$collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf();
Steam::shouldReceive('positive')->once()->andReturn('1');
$this->be($this->user()); $this->be($this->user());
$this->changeDateRange($this->user(), $range); $this->changeDateRange($this->user(), $range);
$response = $this->get(route('categories.no-category', ['2016-01-01'])); $response = $this->get(route('categories.no-category', ['2016-01-01']));

View File

@ -31,6 +31,24 @@ use Tests\TestCase;
*/ */
class AccountControllerTest extends TestCase class AccountControllerTest extends TestCase
{ {
/**
* @covers \FireflyIII\Http\Controllers\Chart\AccountController::all
*/
public function testAll()
{
$generator = $this->mock(GeneratorInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$accountRepos->shouldReceive('oldestJournalDate')->once()->andReturn(Carbon::now()->subMonth());
Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']);
$generator->shouldReceive('singleSet')->andReturn([]);
$this->be($this->user());
$response = $this->get(route('chart.account.all', [1]));
$response->assertStatus(200);
}
/** /**
* @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseAccounts * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseAccounts
* @covers \FireflyIII\Generator\Chart\Basic\GeneratorInterface::singleSet * @covers \FireflyIII\Generator\Chart\Basic\GeneratorInterface::singleSet
@ -188,6 +206,7 @@ class AccountControllerTest extends TestCase
{ {
$generator = $this->mock(GeneratorInterface::class); $generator = $this->mock(GeneratorInterface::class);
$generator->shouldReceive('multiSet')->andreturn([]); $generator->shouldReceive('multiSet')->andreturn([]);
Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']);
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('chart.account.report', ['1', '20120101', '20120131'])); $response = $this->get(route('chart.account.report', ['1', '20120101', '20120131']));

View File

@ -19,6 +19,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Steam;
use Tests\TestCase; use Tests\TestCase;
/** /**
@ -141,8 +142,11 @@ class PiggyBankControllerTest extends TestCase
// mock stuff // mock stuff
$repository = $this->mock(PiggyBankRepositoryInterface::class); $repository = $this->mock(PiggyBankRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class);
$piggyBank = factory(PiggyBank::class)->make();
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
$repository->shouldReceive('getPiggyBanks')->andReturn(new Collection); $repository->shouldReceive('getPiggyBanks')->andReturn(new Collection([$piggyBank]));
Steam::shouldReceive('balanceIgnoreVirtual')->twice()->andReturn('1');
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('piggy-banks.index')); $response = $this->get(route('piggy-banks.index'));

View File

@ -26,6 +26,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag; use Illuminate\Support\MessageBag;
use Steam;
use Tests\TestCase; use Tests\TestCase;
/** /**
@ -53,6 +54,7 @@ class SingleControllerTest extends TestCase
*/ */
public function testCreate() public function testCreate()
{ {
Steam::shouldReceive('phpBytes')->andReturn(2048);
$repository = $this->mock(AccountRepositoryInterface::class); $repository = $this->mock(AccountRepositoryInterface::class);
$repository->shouldReceive('getActiveAccountsByType')->once()->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection); $repository->shouldReceive('getActiveAccountsByType')->once()->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection);
$budgetRepos = $this->mock(BudgetRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class);

View File

@ -17,6 +17,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalTaskerInterface; use FireflyIII\Repositories\Journal\JournalTaskerInterface;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Steam;
use Tests\TestCase; use Tests\TestCase;
class TransactionControllerTest extends TestCase class TransactionControllerTest extends TestCase
@ -45,6 +46,8 @@ class TransactionControllerTest extends TestCase
$collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10));
$collector->shouldReceive('getJournals')->andReturn(new Collection); $collector->shouldReceive('getJournals')->andReturn(new Collection);
Steam::shouldReceive('positive')->once()->andReturn('1');
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('transactions.index', ['transfer'])); $response = $this->get(route('transactions.index', ['transfer']));
$response->assertStatus(200); $response->assertStatus(200);
@ -103,6 +106,7 @@ class TransactionControllerTest extends TestCase
$collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10));
$collector->shouldReceive('getJournals')->andReturn(new Collection); $collector->shouldReceive('getJournals')->andReturn(new Collection);
Steam::shouldReceive('positive')->once()->andReturn('1');
$this->be($this->user()); $this->be($this->user());
$response = $this->get(route('transactions.index', ['transfer', '2016-01-01'])); $response = $this->get(route('transactions.index', ['transfer', '2016-01-01']));