various improvements

This commit is contained in:
Adrien Loison committed 2017-11-19 02:41:07 +01:00
1 parent 102e17159c
commit 4d1d1c1e87
19 files changed
+90 -112

No files matched your search

+7 -7
View File
@@ -28,7 +28,7 @@ class RowTest extends \PHPUnit\Framework\TestCase
$row = new Row([], null);
$row->setCells([$this->getCellMock(), $this->getCellMock()]);
$this->assertEquals(2, count($row->getCells()));
$this->assertEquals(2, $row->getNumCells());
}
/**
@@ -39,11 +39,11 @@ class RowTest extends \PHPUnit\Framework\TestCase
$row = new Row([], null);
$row->setCells([$this->getCellMock(), $this->getCellMock()]);
$this->assertEquals(2, count($row->getCells()));
$this->assertEquals(2, $row->getNumCells());
$row->setCells([$this->getCellMock()]);
$this->assertEquals(1, count($row->getCells()));
$this->assertEquals(1, $row->getNumCells());
}
/**
@@ -53,11 +53,11 @@ class RowTest extends \PHPUnit\Framework\TestCase
{
$row = new Row([], null);
$this->assertEquals(0, count($row->getCells()));
$this->assertEquals(0, $row->getNumCells());
$row->setCells([$this->getCellMock(), $this->getCellMock()]);
$this->assertEquals(2, count($row->getCells()));
$this->assertEquals(2, $row->getNumCells());
}
/**
@@ -68,11 +68,11 @@ class RowTest extends \PHPUnit\Framework\TestCase
$row = new Row([], null);
$row->setCells([$this->getCellMock(), $this->getCellMock()]);
$this->assertEquals(2, count($row->getCells()));
$this->assertEquals(2, $row->getNumCells());
$row->addCell($this->getCellMock());
$this->assertEquals(3, count($row->getCells()));
$this->assertEquals(3, $row->getNumCells());
}
/**
@@ -1,6 +1,6 @@
<?php
namespace Box\Spout\Reader\XLSX\Manager;
namespace Box\Spout\Reader\Common\Manager;
use Box\Spout\Reader\Common\Entity\Cell;
use Box\Spout\Reader\Common\Entity\Row;
@@ -1,41 +0,0 @@
<?php
namespace Box\Spout\Reader\ODS\Manager;
use Box\Spout\Reader\Common\Entity\Cell;
use Box\Spout\Reader\Common\Entity\Row;
/**
* Class RowManagerTest
*/
class RowManagerTest extends \PHPUnit_Framework_TestCase
{
/**
* @return array
*/
public function dataProviderForTestIsEmptyRow()
{
return [
// cells, expected isEmpty
[[], true],
[[new Cell('')], true],
[[new Cell(''), new Cell('')], true],
[[new Cell(''), new Cell(''), new Cell('Okay')], false],
];
}
/**
* @dataProvider dataProviderForTestIsEmptyRow
*
* @param array $cells
* @param bool $expectedIsEmpty
* @return void
*/
public function testIsEmptyRow(array $cells, $expectedIsEmpty)
{
$rowManager = new RowManager();
$row = new Row($cells);
$this->assertEquals($expectedIsEmpty, $rowManager->isEmpty($row));
}
}
+7 -7
View File
@@ -39,7 +39,7 @@ class RowTest extends TestCase
$row = new Row([], null);
$row->setCells([$this->getCellMock(), $this->getCellMock()]);
$this->assertEquals(2, count($row->getCells()));
$this->assertEquals(2, $row->getNumCells());
}
/**
@@ -50,11 +50,11 @@ class RowTest extends TestCase
$row = new Row([], null);
$row->setCells([$this->getCellMock(), $this->getCellMock()]);
$this->assertEquals(2, count($row->getCells()));
$this->assertEquals(2, $row->getNumCells());
$row->setCells([$this->getCellMock()]);
$this->assertEquals(1, count($row->getCells()));
$this->assertEquals(1, $row->getNumCells());
}
/**
@@ -64,11 +64,11 @@ class RowTest extends TestCase
{
$row = new Row([], null);
$this->assertEquals(0, count($row->getCells()));
$this->assertEquals(0, $row->getNumCells());
$row->setCells([$this->getCellMock(), $this->getCellMock()]);
$this->assertEquals(2, count($row->getCells()));
$this->assertEquals(2, $row->getNumCells());
}
/**
@@ -79,11 +79,11 @@ class RowTest extends TestCase
$row = new Row([], null);
$row->setCells([$this->getCellMock(), $this->getCellMock()]);
$this->assertEquals(2, count($row->getCells()));
$this->assertEquals(2, $row->getNumCells());
$row->addCell($this->getCellMock());
$this->assertEquals(3, count($row->getCells()));
$this->assertEquals(3, $row->getNumCells());
}
/**