Fix tests and mutlanewarray problem

m3m0r7 · m3m0r7 · commit edfcd7bfb0ad · 2019-05-16T23:46:32.000+09:00
diff --git a/src/Kernel/Mnemonics/_getstatic.php b/src/Kernel/Mnemonics/_getstatic.php
@@ -1,6 +1,7 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
+use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Kernel\Structures\_Fieldref;
 use PHPJava\Utilities\ClassResolver;
 use PHPJava\Utilities\Formatter;
@@ -36,6 +37,9 @@ public function execute(): void
                 /**
                  * @var \PHPJava\Core\JavaClass $className
                  */
+                throw new NotImplementedException(
+                    'Not implemented operation.'
+                );
                 return;
             }
             $this->pushToOperandStack(new $classObject());
diff --git a/src/Kernel/Types/_Array/Collection.php b/src/Kernel/Types/_Array/Collection.php
@@ -62,7 +62,7 @@ public function offsetUnset($offset)
 
     public function offsetSet($offset, $value)
     {
-        if (empty($offset)) {
+        if ($offset === null) {
             $this->data[] = $value;
             return;
         }
diff --git a/tests/ArrayTest.php b/tests/ArrayTest.php
@@ -105,7 +105,9 @@ public function testMultiDimensionArrayWithConstants()
     public function testMultiDimensionArrayWithDynamic()
     {
         $actual = $this->call('multiDimensionArrayWithDynamic');
-        var_dump($actual);
-        $this->assertEquals('Hello World!', $actual);
+        $this->assertCount(3, $actual);
+        $this->assertEquals('Hello', (string) $actual[0]);
+        $this->assertEquals(' ', (string) $actual[1]);
+        $this->assertEquals('World!', (string) $actual[2]);
     }
 }
diff --git a/tests/fixtures/java/ArrayTest.java b/tests/fixtures/java/ArrayTest.java
@@ -49,7 +49,7 @@ public static String multiDimensionArrayWithConstants()
         return a[0][0] + "" + a[0][1] + "" + a[0][2];
     }
 
-    public static String[] testMultiDimensionArrayWithDynamic()
+    public static String[] multiDimensionArrayWithDynamic()
     {
         String[][] a = new String[1][3];
         a[0][0] = "Hello";

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function offsetUnset($offset)`
`62`	`62`
`63`	`63`	`public function offsetSet($offset, $value)`
`64`	`64`	`{`
`65`		`- if (empty($offset)) {`
	`65`	`+ if ($offset === null) {`
`66`	`66`	`$this->data[] = $value;`
`67`	`67`	`return;`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,9 @@ public function testMultiDimensionArrayWithConstants()`
`105`	`105`	`public function testMultiDimensionArrayWithDynamic()`
`106`	`106`	`{`
`107`	`107`	`$actual = $this->call('multiDimensionArrayWithDynamic');`
`108`		`- var_dump($actual);`
`109`		`- $this->assertEquals('Hello World!', $actual);`
	`108`	`+ $this->assertCount(3, $actual);`
	`109`	`+ $this->assertEquals('Hello', (string) $actual[0]);`
	`110`	`+ $this->assertEquals(' ', (string) $actual[1]);`
	`111`	`+ $this->assertEquals('World!', (string) $actual[2]);`
`110`	`112`	`}`
`111`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static String multiDimensionArrayWithConstants()`
`49`	`49`	`return a[0][0] + "" + a[0][1] + "" + a[0][2];`
`50`	`50`	`}`
`51`	`51`
`52`		`- public static String[] testMultiDimensionArrayWithDynamic()`
	`52`	`+ public static String[] multiDimensionArrayWithDynamic()`
`53`	`53`	`{`
`54`	`54`	`String[][] a = new String[1][3];`
`55`	`55`	`a[0][0] = "Hello";`