Merge pull request #194 from PHPJasper/develop

minor updates, printOutput() method
PHPJasper · Dec 10, 2019 · ac11aa1 · ac11aa1
2 parents 0dea327 + e2b3664
commit ac11aa1
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 25 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,8 @@
-Release Notes - PHPJasper - Version 3.0.1
+Release Notes - PHPJasper - Version 3.1.0
 ========================================================
 * Improvement
+    * added printOutput() method
+* Refactoring
     * output() method
 ________________________________________________________
 Release Notes - PHPJasper - Version 3.0.0

diff --git a/src/PHPJasper.php b/src/PHPJasper.php
@@ -41,7 +41,21 @@ class PHPJasper
     /**
      * @var array
      */
-    protected $formats = ['pdf', 'rtf', 'xls', 'xlsx', 'docx', 'odt', 'ods', 'pptx', 'csv', 'html', 'xhtml', 'xml', 'jrprint'];
+    protected $formats = [
+        'pdf',
+        'rtf',
+        'xls',
+        'xlsx',
+        'docx',
+        'odt',
+        'ods',
+        'pptx',
+        'csv',
+        'html',
+        'xhtml',
+        'xml',
+        'jrprint'
+    ];
 
     /**
      * PHPJasper constructor
@@ -239,7 +253,7 @@ public function output()
      */
     public function printOutput()
     {
-        print $this->output() . "\n";
+        print $this->command . "\n";
     }
 
     /**

diff --git a/tests/PHPJasperTest.php b/tests/PHPJasperTest.php
@@ -30,11 +30,6 @@ public function setUp()
         $this->instance = new PHPJasper();
     }
 
-    public function tearDown()
-    {
-        unset($this->instance);
-    }
-
     /** @test */
     public function constructor()
     {
@@ -44,22 +39,19 @@ public function constructor()
     /** @test */
     public function compile()
     {
-        $result = $this->instance->compile('examples/hello_world.jrxml', '{output_file}');
-
-        $expected = '.*jasperstarter compile ".*hello_world.jrxml" -o "{output_file}"';
+        $result = $this->instance->compile('examples/hello_world.jrxml');
 
-        $this->expectOutputRegex('/' . $expected . '/', $result->output());
+        $this->expectOutputRegex('/.*jasperstarter compile ".*hello_world.jrxml"/', $result->printOutput());
     }
 
-
     /** @test */
     public function process()
     {
         $result = $this->instance->process('examples/hello_world.jrxml', '{output_file}');
 
         $expected = '.*jasperstarter process ".*hello_world.jrxml" -o "{output_file}"';
 
-        $this->expectOutputRegex('/' . $expected . '/', $result->output());
+        $this->expectOutputRegex('/' . $expected . '/', $result->printOutput());
     }
 
     /** @test */
@@ -85,15 +77,15 @@ public function processWithOptions()
         $expected = '.*jasperstarter --locale en_US process ".*hello_world.jrxml" -o "{output_file}" ';
         $expected .= '-f pdf -P  param_1="value_1"   param_2="value_2"   -t driver -u user -p 12345678 -n db -r foo';
 
-        $this->expectOutputRegex('/' . $expected . '/', $result->output());
+        $this->expectOutputRegex('/' . $expected . '/', $result->printOutput());
     }
 
     /** @test */
     public function listParameters()
     {
         $result = $this->instance->listParameters('examples/hello_world.jrxml');
 
-        $this->expectOutputRegex('/.*jasperstarter list_parameters ".*hello_world.jrxml"/', $result->output());
+        $this->expectOutputRegex('/.*jasperstarter list_parameters ".*hello_world.jrxml"/', $result->printOutput());
     }
 
     /** @test */
@@ -104,14 +96,6 @@ public function compileWithWrongInput()
         $this->instance->compile('');
     }
 
-    /** @test */
-    public function compileHelloWorld()
-    {
-        $result = $this->instance->compile('examples/hello_world.jrxml');
-
-        $this->expectOutputRegex('/.*jasperstarter compile ".*hello_world.jrxml"/', $result->output());
-    }
-
     /** @test */
     public function outputWithUserOnExecute()
     {
@@ -121,7 +105,7 @@ public function outputWithUserOnExecute()
 
         $expected = 'su -u 1000 -c "./jasperstarter compile "/var/www/app/tests/test.jrxml" -o "/var/www/app/tests/test""';
 
-        $this->expectOutputRegex('/' . $expected . '/', $this->instance->output());
+        $this->expectOutputRegex('/' . $expected . '/', $this->instance->printOutput());
     }
 
     /** @test */
@@ -204,4 +188,12 @@ public function processWithWrongFormat()
             ]
         );
     }
+
+    /** @test */
+    public function output()
+    {
+        $result = $this->instance->listParameters('examples/hello_world.jrxml');
+
+        $this->expectOutputRegex('/.*jasperstarter list_parameters ".*hello_world.jrxml' . '/', $result->output() . "\n");
+    }
 }