Fix println to be callable without parameters

y-uti · y-uti · commit e7e96673c7c3 · 2019-06-08T09:20:40.000+09:00
diff --git a/src/Packages/java/io/PrintStream.php b/src/Packages/java/io/PrintStream.php
@@ -11,8 +11,22 @@ class PrintStream
 {
     private $sequence = '';
 
-    public function println($arg)
+    public function println(...$arguments)
     {
+        $length = count($arguments);
+        if ($length > 1) {
+            throw new \InvalidArgumentException(
+                "The argument array should have 0 or 1 element, but has {$length} elements."
+            );
+        }
+
+        if ($length === 0) {
+            echo "\n";
+            return;
+        }
+
+        $arg = $arguments[0];
+
         if ($arg instanceof Utf8Info) {
             echo $arg->getString() . "\n";
             return;
diff --git a/tests/Packages/JavaIoPrintStreamClassTest.php b/tests/Packages/JavaIoPrintStreamClassTest.php
@@ -23,6 +23,12 @@ private function call($method, ...$arguments)
         return ob_get_clean();
     }
 
+    public function testPrintlnWithoutParams()
+    {
+        $result = $this->call(explode('::', __METHOD__)[1]);
+        $this->assertEquals("\n", $result);
+    }
+
     public function testPrintlnWithStringParams()
     {
         $result = $this->call(explode('::', __METHOD__)[1]);
diff --git a/tests/fixtures/java/JavaIoPrintStreamClassTest.java b/tests/fixtures/java/JavaIoPrintStreamClassTest.java
@@ -1,5 +1,10 @@
 class JavaIoPrintStreamClassTest
 {
+    public static void testPrintlnWithoutParams()
+    {
+	System.out.println();
+    }
+
     public static void testPrintlnWithStringParams()
     {
         String x = "Hello World";
@@ -83,4 +88,4 @@ public static void testPrintWithBooleanParams_false()
         boolean x = false;
         System.out.print(x);
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,12 @@ private function call($method, ...$arguments)`
`23`	`23`	`return ob_get_clean();`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ public function testPrintlnWithoutParams()`
	`27`	`+ {`
	`28`	`+ $result = $this->call(explode('::', __METHOD__)[1]);`
	`29`	`+ $this->assertEquals("\n", $result);`
	`30`	`+ }`
	`31`	`+`
`26`	`32`	`public function testPrintlnWithStringParams()`
`27`	`33`	`{`
`28`	`34`	`$result = $this->call(explode('::', __METHOD__)[1]);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`class JavaIoPrintStreamClassTest`
`2`	`2`	`{`
	`3`	`+ public static void testPrintlnWithoutParams()`
	`4`	`+ {`
	`5`	`+ System.out.println();`
	`6`	`+ }`
	`7`	`+`
`3`	`8`	`public static void testPrintlnWithStringParams()`
`4`	`9`	`{`
`5`	`10`	`String x = "Hello World";`
`@@ -83,4 +88,4 @@ public static void testPrintWithBooleanParams_false()`
`83`	`88`	`boolean x = false;`
`84`	`89`	`System.out.print(x);`
`85`	`90`	`}`
`86`		`-}`
	`91`	`+}`