Add tests and support outer class

m3m0r7 · m3m0r7 · commit df0589c890b0 · 2019-02-28T01:41:18.000+09:00
diff --git a/src/Core/JavaClassReader.php b/src/Core/JavaClassReader.php
@@ -15,8 +15,10 @@ public function __construct(string $file)
 
         // Add resolving path
         ClassResolver::add(
-            ClassResolver::RESOURCE_TYPE_FILE,
-            dirname($file)
+            [
+                [ClassResolver::RESOURCE_TYPE_FILE, dirname($file)],
+                [ClassResolver::RESOURCE_TYPE_FILE, getcwd()],
+            ]
         );
     }
 
diff --git a/src/Utilities/TypeResolver.php b/src/Utilities/TypeResolver.php
@@ -57,7 +57,7 @@ public static function convertPHPtoJava($arguments, $defaultJavaArgumentType = '
             }
             if (empty($getNestedValues)) {
                 $flipped = array_flip(static::PHP_TYPE_MAP);
-                $resolveType = static::SIGNATURE_MAP[static::resolve($defaultJavaArgumentType)];
+                $resolveType = static::SIGNATURE_MAP[static::resolve($defaultJavaArgumentType)[0]];
                 if ($resolveType === 'class') {
                     return [
                         'type' => $resolveType,
diff --git a/tests/Base.php b/tests/Base.php
@@ -13,8 +13,10 @@ public function setUp(): void
         parent::setUp();
         // build fixtures
 
+        $pathRoot = __DIR__ . '/fixtures/java/';
+
         foreach ($this->fixtures as $fixture) {
-            exec('javac -encoding UTF8 ' . __DIR__ . '/fixtures/java/' . str_replace(['../', './'], '', $fixture) . '.java -d ' . __DIR__ . '/caches');
+            exec('javac -classpath ' . $pathRoot . ':' . $pathRoot . 'caches -encoding UTF8 ' . $pathRoot . str_replace(['../', './'], '', $fixture) . '.java -d ' . __DIR__ . '/caches');
             $this->initiatedJavaClasses[$fixture] = new \PHPJava\Core\JavaClass(
                 new \PHPJava\Core\JavaClassReader(
                     $this->getClassName($fixture)
diff --git a/tests/OuterClassTest.php b/tests/OuterClassTest.php
@@ -0,0 +1,31 @@
+<?php
+namespace PHPJava\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+class OuterClassTest extends Base
+{
+    protected $fixtures = [
+        'OuterClassTestOuterClass',
+        'OuterClassTest',
+    ];
+
+    public function testCallMain()
+    {
+        ob_start();
+        $calculatedValue = $this->initiatedJavaClasses['OuterClassTest']
+            ->getInvoker()
+            ->getStatic()
+            ->getMethods()
+            ->call(
+                'main',
+                []
+            );
+        $result = ob_get_clean();
+
+        $this->assertEquals(
+            'Called Static Method AND Called Dynamic Method',
+            $result
+        );
+    }
+}
diff --git a/tests/fixtures/java/OuterClassTest.java b/tests/fixtures/java/OuterClassTest.java
@@ -0,0 +1,9 @@
+class OuterClassTest
+{
+    public static void main(String[] args)
+    {
+        System.out.print(OuterClassTestOuterClass.staticHelloWorld());
+        System.out.print(" AND ");
+        System.out.print((new OuterClassTestOuterClass()).dynamicHelloWorld());
+    }
+}
diff --git a/tests/fixtures/java/OuterClassTestOuterClass.java b/tests/fixtures/java/OuterClassTestOuterClass.java
@@ -0,0 +1,12 @@
+class OuterClassTestOuterClass
+{
+    public static String staticHelloWorld()
+    {
+        return "Called Static Method";
+    }
+
+    public String dynamicHelloWorld()
+    {
+        return "Called Dynamic Method";
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static function convertPHPtoJava($arguments, $defaultJavaArgumentType = '`
`57`	`57`	`}`
`58`	`58`	`if (empty($getNestedValues)) {`
`59`	`59`	`$flipped = array_flip(static::PHP_TYPE_MAP);`
`60`		`- $resolveType = static::SIGNATURE_MAP[static::resolve($defaultJavaArgumentType)];`
	`60`	`+ $resolveType = static::SIGNATURE_MAP[static::resolve($defaultJavaArgumentType)[0]];`
`61`	`61`	`if ($resolveType === 'class') {`
`62`	`62`	`return [`
`63`	`63`	`'type' => $resolveType,`