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

Some code optimisations.

Browse Source
This commit is contained in:
James Cole
2019-04-09 15:42:25 +02:00
parent 97726c3822
commit 80896b7181
37 changed files with 153 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php
View File

@@ -35,9 +35,10 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler;
use Illuminate\Support\Collection;
use Log;
use Mockery;
use Tests\TestCase;
use Log;
/**
* Class ChooseAccountsHandlerTest
*/

3
tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php
View File

@@ -27,8 +27,8 @@ namespace Tests\Unit\Support\Import\JobConfiguration\Bunq;
use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class NewBunqJobHandlerTest
@@ -43,6 +43,7 @@ class NewBunqJobHandlerTest extends TestCase
parent::setUp();
Log::info(sprintf('Now in %s.', \get_class($this)));
}
/**
* @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler
*/

10
tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php
View File

@@ -59,7 +59,7 @@ class ConfigureMappingHandlerTest extends TestCase
*/
public function testApplySpecifics(): void
{
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$importRepos->shouldReceive('setUser')->once();
$job = new ImportJob;
$job->user_id = $this->user()->id;
@@ -161,7 +161,7 @@ class ConfigureMappingHandlerTest extends TestCase
*/
public function testDoColumnConfig(): void
{
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$importRepos->shouldReceive('setUser')->once();
$job = new ImportJob;
$job->user_id = $this->user()->id;
@@ -226,7 +226,7 @@ class ConfigureMappingHandlerTest extends TestCase
*/
public function testDoMapOfColumn(): void
{
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$importRepos->shouldReceive('setUser')->once();
$job = new ImportJob;
$job->user_id = $this->user()->id;
@@ -339,7 +339,7 @@ class ConfigureMappingHandlerTest extends TestCase
*/
public function testGetPreProcessorName(): void
{
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$importRepos->shouldReceive('setUser')->once();
$job = new ImportJob;
$job->user_id = $this->user()->id;
@@ -487,7 +487,7 @@ class ConfigureMappingHandlerTest extends TestCase
*/
public function testSanitizeColumnName(): void
{
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$importRepos->shouldReceive('setUser')->once();
$job = new ImportJob;
$job->user_id = $this->user()->id;

10
tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php
View File

@@ -34,9 +34,9 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler;
use Illuminate\Support\Collection;
use League\Csv\Reader;
use Log;
use Mockery;
use Tests\TestCase;
use Log;
/**
* Class ConfigureRolesHandlerTest
@@ -107,7 +107,7 @@ class ConfigureRolesHandlerTest extends TestCase
public function testConfigurationCompleteNoAmount(): void
{
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$config = [
$config = [
'column-count' => 5,
'column-roles' => [
0 => 'sepa-cc',
@@ -117,8 +117,8 @@ class ConfigureRolesHandlerTest extends TestCase
4 => 'amount_foreign',
],
];
$handler = new ConfigureRolesHandler();
$result = $handler->configurationComplete($config);
$handler = new ConfigureRolesHandler();
$result = $handler->configurationComplete($config);
$this->assertCount(1, $result);
$this->assertEquals(
'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
@@ -186,7 +186,7 @@ class ConfigureRolesHandlerTest extends TestCase
public function testGetExampleFromLine(): void
{
$importRepos = $this->mock(ImportJobRepositoryInterface::class);
$lines = [
$lines = [
['one', 'two', '', 'three'],
['four', 'five', '', 'six'],
];

3
tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php
View File

@@ -28,9 +28,10 @@ use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler;
use Log;
use Mockery;
use Tests\TestCase;
use Log;
/**
* Class ConfigureUploadHandlerTest
*/

3
tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php
View File

@@ -31,9 +31,10 @@ use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler;
use Illuminate\Support\Collection;
use Log;
use Mockery;
use Tests\TestCase;
use Log;
/**
* Class NewFileJobHandlerTest
*/

3
tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php
View File

@@ -38,9 +38,9 @@ use FireflyIII\Services\Spectre\Object\Holder;
use FireflyIII\Services\Spectre\Object\Login;
use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler;
use Illuminate\Support\Collection;
use Log;
use Mockery;
use Tests\TestCase;
use Log;
/**
* Class ChooseAccountsHandlerTest
@@ -55,6 +55,7 @@ class ChooseAccountsHandlerTest extends TestCase
parent::setUp();
Log::info(sprintf('Now in %s.', \get_class($this)));
}
/**
* @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler
*/

2
tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php
View File

@@ -35,10 +35,10 @@ use FireflyIII\Services\Spectre\Object\Login;
use FireflyIII\Services\Spectre\Object\Token;
use FireflyIII\Services\Spectre\Request\CreateTokenRequest;
use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler;
use Log;
use Mockery;
use Preferences;
use Tests\TestCase;
use Log;
/**
* Class ChooseLoginHandlerTest

3
tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php
View File

@@ -32,10 +32,11 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Services\Spectre\Object\Token;
use FireflyIII\Services\Spectre\Request\CreateTokenRequest;
use FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler;
use Log;
use Mockery;
use Preferences;
use Tests\TestCase;
use Log;
/**
* Class DoAuthenticateHandlerTest
*/

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

@@ -27,8 +27,9 @@ namespace Tests\Unit\Support\Import\Placeholder;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Support\Import\Placeholder\ColumnValue;
use FireflyIII\Support\Import\Placeholder\ImportTransaction;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class ImportTransactionTest
*/
@@ -474,38 +475,6 @@ class ImportTransactionTest extends TestCase
$this->assertTrue(false, $e->getMessage());
}
}
/**
* Basic amount info. Should return something like '1.0'.
*
* @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
*/
public function testCalculateAmountNegatedPositive(): void
{
$importTransaction = new ImportTransaction;
$importTransaction->amountNegated = '1.56';
try {
$this->assertEquals('-1.56', $importTransaction->calculateAmount());
} catch (FireflyException $e) {
$this->assertTrue(false, $e->getMessage());
}
}
/**
* Basic amount info. Should return something like '1.0'.
*
* @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
*/
public function testCalculateAmountNegatedNegative(): void
{
$importTransaction = new ImportTransaction;
$importTransaction->amountNegated = '-1.56';
try {
$this->assertEquals('1.56', $importTransaction->calculateAmount());
} catch (FireflyException $e) {
$this->assertTrue(false, $e->getMessage());
}
}
/**
* With no amount data, object should return ''
@@ -539,6 +508,38 @@ class ImportTransactionTest extends TestCase
}
}
/**
* Basic amount info. Should return something like '1.0'.
*
* @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
*/
public function testCalculateAmountNegatedNegative(): void
{
$importTransaction = new ImportTransaction;
$importTransaction->amountNegated = '-1.56';
try {
$this->assertEquals('1.56', $importTransaction->calculateAmount());
} catch (FireflyException $e) {
$this->assertTrue(false, $e->getMessage());
}
}
/**
* Basic amount info. Should return something like '1.0'.
*
* @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
*/
public function testCalculateAmountNegatedPositive(): void
{
$importTransaction = new ImportTransaction;
$importTransaction->amountNegated = '1.56';
try {
$this->assertEquals('-1.56', $importTransaction->calculateAmount());
} catch (FireflyException $e) {
$this->assertTrue(false, $e->getMessage());
}
}
/**
* Basic amount info with positive modifier (Rabobank C)
*

6
tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php
View File

@@ -40,11 +40,11 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Services\Bunq\ApiContext;
use FireflyIII\Services\Bunq\MonetaryAccount;
use FireflyIII\Support\Import\Routine\Bunq\StageNewHandler;
use Log;
use Mockery;
use Preferences;
use Tests\Object\FakeApiContext;
use Tests\TestCase;
use Log;
/**
* Class StageNewHandlerTest
@@ -211,7 +211,7 @@ class StageNewHandlerTest extends TestCase
'default_avatar_status' => null,
'restriction_chat' => null,
],
'iban' => 'SM72C9584723533916792029340'
'iban' => 'SM72C9584723533916792029340',
],
],
];
@@ -298,7 +298,7 @@ class StageNewHandlerTest extends TestCase
'default_avatar_status' => null,
'restriction_chat' => null,
],
'iban' => 'SM72C9584723533916792029340'
'iban' => 'SM72C9584723533916792029340',
],
],

2
tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php
View File

@@ -28,8 +28,8 @@ use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Import\Routine\File\AssetAccountMapper;
use Illuminate\Support\Collection;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class AssetAccountMapperTest

3
tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php
View File

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace Tests\Unit\Support\Import\Routine\File;
use Log;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\ImportJob;
use FireflyIII\Support\Import\Routine\File\CSVProcessor;
@@ -33,6 +32,7 @@ use FireflyIII\Support\Import\Routine\File\ImportableCreator;
use FireflyIII\Support\Import\Routine\File\LineReader;
use FireflyIII\Support\Import\Routine\File\MappedValuesValidator;
use FireflyIII\Support\Import\Routine\File\MappingConverger;
use Log;
use Tests\TestCase;
/**
@@ -50,6 +50,7 @@ class CSVProcessorTest extends TestCase
parent::setUp();
Log::info(sprintf('Now in %s.', \get_class($this)));
}
/**
* @covers \FireflyIII\Support\Import\Routine\File\CSVProcessor
*/

2
tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php
View File

@@ -145,7 +145,7 @@ class ImportableConverterTest extends TestCase
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('getMetaValue')
->withArgs([Mockery::any(), 'currency_id'])->atLeast()->once()->andReturn('1');
->withArgs([Mockery::any(), 'currency_id'])->atLeast()->once()->andReturn('1');
// get default currency
$euro = TransactionCurrency::whereCode('EUR')->first();

2
tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php
View File

@@ -27,8 +27,8 @@ namespace Tests\Unit\Support\Import\Routine\File;
use FireflyIII\Support\Import\Placeholder\ColumnValue;
use FireflyIII\Support\Import\Placeholder\ImportTransaction;
use FireflyIII\Support\Import\Routine\File\ImportableCreator;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class ImportableCreatorTest

2
tests/Unit/Support/Import/Routine/File/LineReaderTest.php
View File

@@ -31,8 +31,8 @@ use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Support\Import\Routine\File\LineReader;
use Illuminate\Support\Collection;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class LineReaderTest

2
tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php
View File

@@ -33,9 +33,9 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Support\Import\Routine\File\MappedValuesValidator;
use Illuminate\Support\Collection;
use Log;
use stdClass;
use Tests\TestCase;
use Log;
/**
* Class MappedValuesValidatorTest

3
tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php
View File

@@ -28,8 +28,9 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Support\Import\Routine\File\MappingConverger;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class MappingConvergerTest
*/

2
tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php
View File

@@ -28,8 +28,8 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper;
use Tests\TestCase;
use Log;
use Tests\TestCase;
/**
* Class OpposingAccountMapperTest

2
tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php
View File

@@ -35,10 +35,10 @@ use FireflyIII\Services\Spectre\Object\Login;
use FireflyIII\Services\Spectre\Request\ListAccountsRequest;
use FireflyIII\Services\Spectre\Request\ListLoginsRequest;
use FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler;
use Log;
use Mockery;
use Preferences;
use Tests\TestCase;
use Log;
/**
* Class StageAuthenticatedHandlerTest

2
tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php
View File

@@ -36,10 +36,10 @@ use FireflyIII\Services\Spectre\Request\ListCustomersRequest;
use FireflyIII\Services\Spectre\Request\ListLoginsRequest;
use FireflyIII\Services\Spectre\Request\NewCustomerRequest;
use FireflyIII\Support\Import\Routine\Spectre\StageNewHandler;
use Log;
use Mockery;
use Preferences;
use Tests\TestCase;
use Log;
/**
* Class StageNewHandlerTest