Skip to content

Commit 189782c

Browse files
committed
[update] combine union test in single class
1 parent 7083cf5 commit 189782c

7 files changed

Lines changed: 158 additions & 323 deletions

File tree

tests/Model/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class Client extends User
88
{
99
public $table = 'client';
10-
10+
1111
public function init(): void
1212
{
1313
parent::init();

tests/Model/Payment.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace atk4\data\tests\Model;
66

77
use atk4\data\Model;
8-
use atk4\data\tests\Model\Client;
98

109
class Payment extends Model
1110
{

tests/Model/Transaction.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ class Transaction extends Union
1010
{
1111
public $nestedInvoice;
1212
public $nestedPayment;
13-
13+
14+
public $subtractInvoice;
15+
1416
public function init(): void
1517
{
1618
parent::init();
1719

1820
// first lets define nested models
19-
$this->nestedInvoice = $this->addNestedModel(new Invoice());
21+
$this->nestedInvoice = $this->addNestedModel(new Invoice(), $this->subtractInvoice ? ['amount' => '-[]'] : []);
2022
$this->nestedPayment = $this->addNestedModel(new Payment());
2123

2224
// next, define common fields

tests/Model/Transaction2.php

Lines changed: 0 additions & 30 deletions
This file was deleted.

tests/ModelAggregateTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ protected function setUp(): void
3434
parent::setUp();
3535
$this->setDB($this->init_db);
3636

37-
$m_invoice = new Model\Invoice($this->db);
38-
$m_invoice->getRef('client_id')->addTitle();
37+
$invoice = new Model\Invoice($this->db);
38+
$invoice->getRef('client_id')->addTitle();
3939

40-
$this->aggregate = new Aggregate($m_invoice);
40+
$this->aggregate = new Aggregate($invoice);
4141
$this->aggregate->addField('client');
4242
}
4343

tests/ModelUnionExprTest.php

Lines changed: 0 additions & 276 deletions
This file was deleted.

0 commit comments

Comments
 (0)