Skip to content

Commit 1ac8d22

Browse files
m3m0r7m3m0r7
committed
Test simplify
1 parent e0a8277 commit 1ac8d22

5 files changed

Lines changed: 48 additions & 76 deletions

File tree

‎tests/AccessStaticFieldTest.php‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,17 @@ class AccessStaticFieldTest extends Base
99
'AccessStaticFieldTest',
1010
];
1111

12-
/**
13-
* @var \PHPJava\Core\JavaClass
14-
*/
15-
private $javaClass;
16-
17-
public function setUp(): void
18-
{
19-
parent::setUp();
20-
21-
$this->javaClass = new \PHPJava\Core\JavaClass(
22-
new \PHPJava\Core\JavaClassReader($this->getClassName('AccessStaticFieldTest'))
23-
);
24-
}
25-
2612
public function testGetPuttedField()
2713
{
28-
$this->assertEquals(5, $this->javaClass->getInvoker()->getStaticFields()->get('number'));
29-
$this->assertEquals('Hello World', $this->javaClass->getInvoker()->getStaticFields()->get('string'));
14+
$this->assertEquals(5, $this->initiatedJavaClasses['AccessStaticFieldTest']->getInvoker()->getStaticFields()->get('number'));
15+
$this->assertEquals('Hello World', $this->initiatedJavaClasses['AccessStaticFieldTest']->getInvoker()->getStaticFields()->get('string'));
3016
}
3117

3218
public function testOverwriteField()
3319
{
3420
$this->javaClass->getInvoker()->getStaticFields()->set('number', 1000);
3521
$this->javaClass->getInvoker()->getStaticFields()->set('string', 'New String!');
36-
$this->assertEquals(1000, $this->javaClass->getInvoker()->getStaticFields()->get('number'));
37-
$this->assertEquals('New String!', $this->javaClass->getInvoker()->getStaticFields()->get('string'));
22+
$this->assertEquals(1000, $this->initiatedJavaClasses['AccessStaticFieldTest']->getInvoker()->getStaticFields()->get('number'));
23+
$this->assertEquals('New String!', $this->initiatedJavaClasses['AccessStaticFieldTest']->getInvoker()->getStaticFields()->get('string'));
3824
}
3925
}

‎tests/AccessStaticMethodTest.php‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,17 @@ class AccessStaticMethodTest extends Base
99
'AccessStaticMethodTest',
1010
];
1111

12-
/**
13-
* @var \PHPJava\Core\JavaClass
14-
*/
15-
private $javaClass;
16-
17-
public function setUp(): void
18-
{
19-
parent::setUp();
20-
21-
$this->javaClass = new \PHPJava\Core\JavaClass(
22-
new \PHPJava\Core\JavaClassReader($this->getClassName('AccessStaticMethodTest'))
23-
);
24-
}
25-
2612
public function testCallMainHavingStringArguments()
2713
{
2814
ob_start();
2915
// call main
30-
$this->javaClass->getInvoker()->getStaticMethods()->call(
31-
'main',
32-
["Hello", "World"]
33-
);
16+
$this->initiatedJavaClasses['AccessStaticMethodTest']
17+
->getInvoker()
18+
->getStaticMethods()
19+
->call(
20+
'main',
21+
["Hello", "World"]
22+
);
3423
$result = ob_get_clean();
3524

3625
$this->assertEquals("HelloWorld", $result);
@@ -40,10 +29,13 @@ public function testCallMainHavingIntegerArguments()
4029
{
4130
ob_start();
4231
// call main
43-
$this->javaClass->getInvoker()->getStaticMethods()->call(
44-
'main',
45-
[1234, 5678]
46-
);
32+
$this->initiatedJavaClasses['AccessStaticMethodTest']
33+
->getInvoker()
34+
->getStaticMethods()
35+
->call(
36+
'main',
37+
[1234, 5678]
38+
);
4739
$result = ob_get_clean();
4840

4941
$this->assertEquals(246811356, $result);

‎tests/Base.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
class Base extends TestCase
77
{
88
protected $fixtures = [];
9+
protected $initiatedJavaClasses = [];
910

1011
public function setUp(): void
1112
{
@@ -14,6 +15,11 @@ public function setUp(): void
1415

1516
foreach ($this->fixtures as $fixture) {
1617
exec('javac -encoding UTF8 ' . __DIR__ . '/fixtures/java/' . str_replace(['../', './'], '', $fixture) . '.java -d ' . __DIR__ . '/caches');
18+
$this->initiatedJavaClasses[$fixture] = new \PHPJava\Core\JavaClass(
19+
new \PHPJava\Core\JavaClassReader(
20+
$this->getClassName($fixture)
21+
)
22+
);
1723
}
1824
}
1925

‎tests/LoopTest.php‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,21 @@ class LoopTest extends Base
99
'LoopTest',
1010
];
1111

12-
/**
13-
* @var \PHPJava\Core\JavaClass
14-
*/
15-
private $javaClass;
16-
17-
public function setUp(): void
18-
{
19-
parent::setUp();
20-
21-
$this->javaClass = new \PHPJava\Core\JavaClass(
22-
new \PHPJava\Core\JavaClassReader($this->getClassName('LoopTest'))
23-
);
24-
}
25-
2612
public function testCallCalculateByFor()
2713
{
28-
$calculatedValue = $this->javaClass->getInvoker()->getStaticMethods()->call('calculateByFor', 10);
14+
$calculatedValue = $this->initiatedJavaClasses['LoopTest']
15+
->getInvoker()
16+
->getStaticMethods()
17+
->call('calculateByFor', 10);
2918
$this->assertEquals(
3019
"45",
3120
(string) $calculatedValue
3221
);
3322

34-
$calculatedValue = $this->javaClass->getInvoker()->getStaticMethods()->call('calculateByFor', 20);
23+
$calculatedValue = $this->initiatedJavaClasses['LoopTest']
24+
->getInvoker()
25+
->getStaticMethods()
26+
->call('calculateByFor', 20);
3527
$this->assertEquals(
3628
"190",
3729
(string) $calculatedValue
@@ -40,13 +32,19 @@ public function testCallCalculateByFor()
4032

4133
public function testCallCalculateByWhile()
4234
{
43-
$calculatedValue = $this->javaClass->getInvoker()->getStaticMethods()->call('calculateByWhile', 10);
35+
$calculatedValue = $this->initiatedJavaClasses['LoopTest']
36+
->getInvoker()
37+
->getStaticMethods()
38+
->call('calculateByWhile', 10);
4439
$this->assertEquals(
4540
"45",
4641
(string) $calculatedValue
4742
);
4843

49-
$calculatedValue = $this->javaClass->getInvoker()->getStaticMethods()->call('calculateByWhile', 20);
44+
$calculatedValue = $this->initiatedJavaClasses['LoopTest']
45+
->getInvoker()
46+
->getStaticMethods()
47+
->call('calculateByWhile', 20);
5048
$this->assertEquals(
5149
"190",
5250
(string) $calculatedValue

‎tests/OutputDebugTraceTest.php‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,17 @@ class OutputDebugTraceTest extends Base
99
'OutputDebugTraceTest',
1010
];
1111

12-
/**
13-
* @var \PHPJava\Core\JavaClass
14-
*/
15-
private $javaClass;
16-
17-
public function setUp(): void
18-
{
19-
parent::setUp();
20-
21-
$this->javaClass = new \PHPJava\Core\JavaClass(
22-
new \PHPJava\Core\JavaClassReader($this->getClassName('OutputDebugTraceTest'))
23-
);
24-
}
25-
2612
public function testCallMain()
2713
{
2814
ob_start();
29-
$this->javaClass->getInvoker()->getStaticMethods()->call(
30-
'main',
31-
["Hello", " ", "World"]
32-
);
15+
16+
$calculatedValue = $this->initiatedJavaClasses['OutputDebugTraceTest']
17+
->getInvoker()
18+
->getStaticMethods()
19+
->call(
20+
'main',
21+
["Hello", " ", "World"]
22+
);
3323
ob_end_clean();
3424

3525
ob_start();

0 commit comments

Comments
 (0)