Merge pull request #98 from ivanlanin/develop

Progi1984 · Progi1984 · commit bf13fefcd1c0 · 2014-03-09T22:33:32.000+01:00
Basic unit tests for PHPWord\Style completed
diff --git a/Classes/PHPWord/Section/Settings.php b/Classes/PHPWord/Section/Settings.php
@@ -617,7 +617,7 @@ public function getPageNumberingStart()
      * @return int
      */
     public function getHeaderHeight() {
-      return $this->headerHeight;
+        return $this->headerHeight;
     }
 
     /**
@@ -626,8 +626,11 @@ public function getHeaderHeight() {
      * @param int $pValue
      */
     public function setHeaderHeight($pValue = '') {
-      $this->headerHeight = $pValue;
-      return $this;
+        if (!is_numeric($pValue)) {
+            $pValue = 720;
+        }
+        $this->headerHeight = $pValue;
+        return $this;
     }
 
     /**
@@ -636,7 +639,7 @@ public function setHeaderHeight($pValue = '') {
      * @return int
      */
     public function getFooterHeight() {
-      return $this->footerHeight;
+        return $this->footerHeight;
     }
 
     /**
@@ -645,8 +648,11 @@ public function getFooterHeight() {
      * @param int $pValue
      */
     public function setFooterHeight($pValue = '') {
-      $this->footerHeight = $pValue;
-      return $this;
+        if (!is_numeric($pValue)) {
+            $pValue = 720;
+        }
+        $this->footerHeight = $pValue;
+        return $this;
     }
 
     /**
@@ -655,6 +661,9 @@ public function setFooterHeight($pValue = '') {
      * @param int $pValue
      */
     public function setColsNum($pValue = '') {
+        if (!is_numeric($pValue)) {
+            $pValue = 1;
+        }
         $this->_colsNum = $pValue;
         return $this;
     }
@@ -674,6 +683,9 @@ public function getColsNum() {
      * @param int $pValue
      */
     public function setColsSpace($pValue = '') {
+        if (!is_numeric($pValue)) {
+            $pValue = 720;
+        }
         $this->_colsSpace = $pValue;
         return $this;
     }
diff --git a/Classes/PHPWord/Style/TOC.php b/Classes/PHPWord/Style/TOC.php
@@ -85,7 +85,7 @@ public function getTabPos()
      */
     public function setTabPos($pValue)
     {
-        $this->_tabLeader = $pValue;
+        $this->_tabPos = $pValue;
     }
 
     /**
diff --git a/Classes/PHPWord/Style/TableFull.php b/Classes/PHPWord/Style/TableFull.php
@@ -247,7 +247,7 @@ public function setBgColor($pValue = null)
     /**
      * Set TLRBVH Border Size
      *
-     * @param int $pValue
+     * @param   int     $pValue Border size in eighths of a point (1/8 point)
      */
     public function setBorderSize($pValue = null)
     {
@@ -466,6 +466,11 @@ public function getCellMarginBottom()
         return $this->_cellMarginBottom;
     }
 
+    /**
+     * Set TLRB cell margin
+     *
+     * @param   int     $pValue Margin in twips
+     */
     public function setCellMargin($pValue = null)
     {
         $this->_cellMarginTop = $pValue;
diff --git a/Tests/PHPWord/Section/SettingsTest.php b/Tests/PHPWord/Section/SettingsTest.php
@@ -217,7 +217,7 @@ public function testColumnsSpace()
         $this->assertEquals($iVal, $oSettings->getColsSpace());
 
         $this->assertInstanceOf('PHPWord_Section_Settings', $oSettings->setColsSpace());
-        $this->assertEquals(1, $oSettings->getColsSpace());
+        $this->assertEquals(720, $oSettings->getColsSpace());
     }
 
     public function testBreakType()
diff --git a/Tests/PHPWord/Style/CellTest.php b/Tests/PHPWord/Style/CellTest.php
@@ -12,6 +12,7 @@
  */
 class CellTest extends \PHPUnit_Framework_TestCase
 {
+
     /**
      * Test setting style with normal value
      */
@@ -34,7 +35,6 @@ public function testSetGetNormal()
             'gridSpan' => 2,
             'vMerge' => 2,
         );
-        //'defaultBorderColor' => null,
         foreach ($attributes as $key => $value) {
             $set = "set{$key}";
             $get = "get{$key}";
diff --git a/Tests/PHPWord/Style/ImageTest.php b/Tests/PHPWord/Style/ImageTest.php
@@ -0,0 +1,71 @@
+<?php
+namespace PHPWord\Tests\Style;
+
+use PHPUnit_Framework_TestCase;
+use PHPWord_Style_Image;
+
+/**
+ * Class ImageTest
+ *
+ * @package PHPWord\Tests
+ * @runTestsInSeparateProcesses
+ */
+class ImageTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Test setting style with normal value
+     */
+    public function testSetGetNormal()
+    {
+        $object = new PHPWord_Style_Image();
+
+        $properties = array(
+            'width' => 200,
+            'height' => 200,
+            'align' => 'left',
+            'marginTop' => 240,
+            'marginLeft' => 240,
+            'wrappingStyle' => 'inline',
+        );
+        foreach ($properties as $key => $value) {
+            $set = "set{$key}";
+            $get = "get{$key}";
+            $object->$set($value);
+            $this->assertEquals($value, $object->$get());
+        }
+    }
+
+    /**
+     * Test setStyleValue method
+     */
+    public function testSetStyleValue()
+    {
+        $object = new PHPWord_Style_Image();
+
+        $properties = array(
+            'width' => 200,
+            'height' => 200,
+            'align' => 'left',
+            'marginTop' => 240,
+            'marginLeft' => 240,
+        );
+        foreach ($properties as $key => $value) {
+            $get = "get{$key}";
+            $object->setStyleValue("_{$key}", $value);
+            $this->assertEquals($value, $object->$get());
+        }
+    }
+
+    /**
+     * Test setWrappingStyle exception
+     *
+     * @expectedException InvalidArgumentException
+     */
+    public function testSetWrappingStyleException()
+    {
+        $object = new PHPWord_Style_Image();
+        $object->setWrappingStyle('foo');
+    }
+
+}
diff --git a/Tests/PHPWord/Style/ListItemTest.php b/Tests/PHPWord/Style/ListItemTest.php
@@ -0,0 +1,51 @@
+<?php
+namespace PHPWord\Tests\Style;
+
+use PHPUnit_Framework_TestCase;
+use PHPWord_Style_ListItem;
+
+/**
+ * Class ListItemTest
+ *
+ * @package PHPWord\Tests
+ * @runTestsInSeparateProcesses
+ */
+class ListItemTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Test construct
+     */
+    public function testConstruct()
+    {
+        $object = new PHPWord_Style_ListItem();
+
+        $value = PHPWord_Style_ListItem::TYPE_BULLET_FILLED;
+        $this->assertEquals($value, $object->getListType());
+    }
+
+    /**
+     * Test set style value
+     */
+    public function testSetStyleValue()
+    {
+        $object = new PHPWord_Style_ListItem();
+
+        $value = PHPWord_Style_ListItem::TYPE_ALPHANUM;
+        $object->setStyleValue('_listType', $value);
+        $this->assertEquals($value, $object->getListType());
+    }
+
+    /**
+     * Test list type
+     */
+    public function testListType()
+    {
+        $object = new PHPWord_Style_ListItem();
+
+        $value = PHPWord_Style_ListItem::TYPE_ALPHANUM;
+        $object->setListType($value);
+        $this->assertEquals($value, $object->getListType());
+    }
+
+}
diff --git a/Tests/PHPWord/Style/ParagraphTest.php b/Tests/PHPWord/Style/ParagraphTest.php
@@ -123,4 +123,15 @@ public function testLineHeight()
         $this->assertEquals(720, $lineHeight);
         $this->assertEquals('auto', $lineRule);
     }
+
+    /**
+     * Test setLineHeight validation
+     */
+    public function testLineHeightValidation()
+    {
+        $object = new PHPWord_Style_Paragraph();
+        $object->setLineHeight('12.5pt');
+        $this->assertEquals(12.5, $object->getLineHeight());
+    }
+
 }
diff --git a/Tests/PHPWord/Style/RowTest.php b/Tests/PHPWord/Style/RowTest.php
@@ -0,0 +1,43 @@
+<?php
+namespace PHPWord\Tests\Style;
+
+use PHPUnit_Framework_TestCase;
+use PHPWord_Style_Row;
+
+/**
+ * Class RowTest
+ *
+ * @package PHPWord\Tests
+ * @runTestsInSeparateProcesses
+ */
+class RowTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Test properties with normal value
+     */
+    public function testProperties()
+    {
+        $object = new PHPWord_Style_Row();
+
+        $properties = array(
+            'tblHeader' => true,
+            'cantSplit' => false,
+        );
+        foreach ($properties as $key => $value) {
+            // set/get
+            $set = "set{$key}";
+            $get = "get{$key}";
+            $expected = $value ? 1 : 0;
+            $object->$set($value);
+            $this->assertEquals($expected, $object->$get());
+
+            // setStyleValue
+            $value = !$value;
+            $expected = $value ? 1 : 0;
+            $object->setStyleValue("_{$key}", $value);
+            $this->assertEquals($expected, $object->$get());
+        }
+    }
+
+}
diff --git a/Tests/PHPWord/Style/TOCTest.php b/Tests/PHPWord/Style/TOCTest.php
@@ -0,0 +1,41 @@
+<?php
+namespace PHPWord\Tests\Style;
+
+use PHPUnit_Framework_TestCase;
+use PHPWord_Style_TOC;
+
+/**
+ * Class TOCTest
+ *
+ * @package PHPWord\Tests
+ * @runTestsInSeparateProcesses
+ */
+class TOCTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Test properties with normal value
+     */
+    public function testProperties()
+    {
+        $object = new PHPWord_Style_TOC();
+
+        $properties = array(
+            'tabPos' => 9062,
+            'tabLeader' => PHPWord_Style_TOC::TABLEADER_DOT,
+            'indent' => 200,
+        );
+        foreach ($properties as $key => $value) {
+            // set/get
+            $set = "set{$key}";
+            $get = "get{$key}";
+            $object->$set($value);
+            $this->assertEquals($value, $object->$get());
+
+            // setStyleValue
+            $object->setStyleValue("_{$key}", null);
+            $this->assertEquals(null, $object->$get());
+        }
+    }
+
+}
diff --git a/Tests/PHPWord/Style/TableFullTest.php b/Tests/PHPWord/Style/TableFullTest.php
diff --git a/Tests/PHPWord/Style/TableTest.php b/Tests/PHPWord/Style/TableTest.php
diff --git a/Tests/PHPWord/Style/TabsTest.php b/Tests/PHPWord/Style/TabsTest.php

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function getTabPos()`
`85`	`85`	`*/`
`86`	`86`	`public function setTabPos($pValue)`
`87`	`87`	`{`
`88`		`- $this->_tabLeader = $pValue;`
	`88`	`+ $this->_tabPos = $pValue;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ public function setBgColor($pValue = null)`
`247`	`247`	`/**`
`248`	`248`	`* Set TLRBVH Border Size`
`249`	`249`	`*`
`250`		`- * @param int $pValue`
	`250`	`+ * @param int $pValue Border size in eighths of a point (1/8 point)`
`251`	`251`	`*/`
`252`	`252`	`public function setBorderSize($pValue = null)`
`253`	`253`	`{`
`@@ -466,6 +466,11 @@ public function getCellMarginBottom()`
`466`	`466`	`return $this->_cellMarginBottom;`
`467`	`467`	`}`
`468`	`468`
	`469`	`+ /**`
	`470`	`+ * Set TLRB cell margin`
	`471`	`+ *`
	`472`	`+ * @param int $pValue Margin in twips`
	`473`	`+ */`
`469`	`474`	`public function setCellMargin($pValue = null)`
`470`	`475`	`{`
`471`	`476`	`$this->_cellMarginTop = $pValue;`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public function testColumnsSpace()`
`217`	`217`	`$this->assertEquals($iVal, $oSettings->getColsSpace());`
`218`	`218`
`219`	`219`	`$this->assertInstanceOf('PHPWord_Section_Settings', $oSettings->setColsSpace());`
`220`		`- $this->assertEquals(1, $oSettings->getColsSpace());`
	`220`	`+ $this->assertEquals(720, $oSettings->getColsSpace());`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`public function testBreakType()`