Skip to content

Commit b99d061

Browse files
oleibmanoleibman
committed
Clean Up Some Tests
1 parent 3d4b4b0 commit b99d061

File tree

8 files changed

+37
-10
lines changed

8 files changed

+37
-10
lines changed

‎tests/PhpSpreadsheetTests/Shared/DateTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use DateTimeZone;
1010
use PhpOffice\PhpSpreadsheet\Exception;
1111
use PhpOffice\PhpSpreadsheet\Shared\Date;
12+
use PhpOffice\PhpSpreadsheet\Spreadsheet;
1213
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
1314
use PHPUnit\Framework\TestCase;
1415

@@ -207,7 +208,7 @@ public function testVarious(): void
207208
$date = Date::PHPToExcel('2020-01-01');
208209
self::assertEquals(43831.0, $date);
209210

210-
$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
211+
$spreadsheet = new Spreadsheet();
211212
$sheet = $spreadsheet->getActiveSheet();
212213
$sheet->setCellValue('B1', 'x');
213214
/** @var float|int|string */
@@ -249,6 +250,7 @@ public function testVarious(): void
249250
->getNumberFormat()
250251
->setFormatCode('yyyy-mm-dd');
251252
self::assertFalse(Date::isDateTime($cella4));
253+
$spreadsheet->disconnectWorksheets();
252254
}
253255

254256
public function testRoundMicroseconds(): void

‎tests/PhpSpreadsheetTests/Shared/StringHelperInvalidCharTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@ public function testInvalidChar(): void
4343
$sheet->getCell("A$row")->getValue()
4444
);
4545
}
46+
$spreadsheet->disconnectWorksheets();
4647
}
4748
}

‎tests/PhpSpreadsheetTests/Style/BorderRangeTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public function testBorderRangeInAction(): void
6262
}
6363
}
6464
}
65+
$spreadsheet->disconnectWorksheets();
6566
}
6667

6768
public function testBorderRangeDirectly(): void
@@ -71,5 +72,6 @@ public function testBorderRangeDirectly(): void
7172
$sheet = $spreadsheet->getActiveSheet();
7273
$style = $sheet->getStyle('A1:C1')->getBorders()->getTop()->setBorderStyle(Border::BORDER_THIN);
7374
self::assertSame('A1:C1', $style->getSelectedCells(), 'getSelectedCells should not change after a style operation on a border range');
75+
$spreadsheet->disconnectWorksheets();
7476
}
7577
}

‎tests/PhpSpreadsheetTests/Style/BorderTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public function testAllBorders(): void
3131
self::assertSame(Border::BORDER_THIN, $borders->getRight()->getBorderStyle());
3232
self::assertSame(Border::BORDER_THIN, $borders->getLeft()->getBorderStyle());
3333
self::assertSame(Border::BORDER_NONE, $borders->getDiagonal()->getBorderStyle());
34+
$spreadsheet->disconnectWorksheets();
3435
}
3536

3637
public function testAllBordersArray(): void
@@ -45,6 +46,7 @@ public function testAllBordersArray(): void
4546
self::assertSame(Border::BORDER_THIN, $borders->getRight()->getBorderStyle());
4647
self::assertSame(Border::BORDER_THIN, $borders->getLeft()->getBorderStyle());
4748
self::assertSame(Border::BORDER_NONE, $borders->getDiagonal()->getBorderStyle());
49+
$spreadsheet->disconnectWorksheets();
4850
}
4951

5052
public function testAllBordersArrayNotSupervisor(): void
@@ -86,6 +88,7 @@ public function testOutline(): void
8688
self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
8789
self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
8890
self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getTop()->getBorderStyle());
91+
$spreadsheet->disconnectWorksheets();
8992
}
9093

9194
public function testInside(): void
@@ -115,6 +118,7 @@ public function testInside(): void
115118
self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
116119
self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
117120
self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getTop()->getBorderStyle());
121+
$spreadsheet->disconnectWorksheets();
118122
}
119123

120124
public function testHorizontal(): void
@@ -144,6 +148,7 @@ public function testHorizontal(): void
144148
self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
145149
self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
146150
self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getTop()->getBorderStyle());
151+
$spreadsheet->disconnectWorksheets();
147152
}
148153

149154
public function testVertical(): void
@@ -173,6 +178,7 @@ public function testVertical(): void
173178
self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
174179
self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
175180
self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getTop()->getBorderStyle());
181+
$spreadsheet->disconnectWorksheets();
176182
}
177183

178184
public function testNoSupervisorAllBorders(): void
@@ -213,6 +219,7 @@ public function testNoSupervisorHorizontal(): void
213219
public function testGetSharedComponentPseudo(): void
214220
{
215221
$this->expectException(PhpSpreadsheetException::class);
222+
$this->expectExceptionMessage('pseudo-border');
216223
$spreadsheet = new Spreadsheet();
217224
$sheet = $spreadsheet->getActiveSheet();
218225
$sheet->getStyle('A1')->getBorders()->getHorizontal()->setBorderStyle(Border::BORDER_MEDIUM);
@@ -233,6 +240,7 @@ public function testBorderStyle(): void
233240
$border->setBorderStyle(Border::BORDER_THIN)->setColor(new Color('FFFF0000'));
234241
self::assertEquals('FFFF0000', $border->getColor()->getARGB());
235242
self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
243+
$spreadsheet->disconnectWorksheets();
236244
}
237245

238246
public function testDiagonalDirection(): void
@@ -245,5 +253,6 @@ public function testDiagonalDirection(): void
245253

246254
self::assertSame(Border::BORDER_MEDIUM, $borders->getDiagonal()->getBorderStyle());
247255
self::assertSame(Borders::DIAGONAL_BOTH, $borders->getDiagonalDirection());
256+
$spreadsheet->disconnectWorksheets();
248257
}
249258
}

‎tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/WizardFactoryTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public function testWizardFromConditional(string $sheetName, string $cellAddress
6666
$wizard = Wizard::fromConditional($conditional);
6767
self::assertEquals($expectedWizads[$index], $wizard::class);
6868
}
69+
$spreadsheet->disconnectWorksheets();
6970
}
7071

7172
public static function conditionalProvider(): array

‎tests/PhpSpreadsheetTests/Style/StyleTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public function testStyleOddMethods(): void
2424
$styleArray = ['alignment' => ['textRotation' => 45]];
2525
$outArray = $cell1style->getStyleArray($styleArray);
2626
self::assertEquals($styleArray, $outArray['quotePrefix']);
27+
$spreadsheet->disconnectWorksheets();
2728
}
2829

2930
public function testStyleColumn(): void
@@ -58,6 +59,7 @@ public function testStyleColumn(): void
5859
self::assertTrue($sheet->getStyle('A1')->getFont()->getItalic());
5960
self::assertTrue($sheet->getStyle('B2')->getFont()->getItalic());
6061
self::assertFalse($sheet->getStyle('C3')->getFont()->getItalic());
62+
$spreadsheet->disconnectWorksheets();
6163
}
6264

6365
public function testStyleIsReused(): void
@@ -81,6 +83,7 @@ public function testStyleIsReused(): void
8183
$spreadsheet->garbageCollect();
8284

8385
self::assertCount(3, $spreadsheet->getCellXfCollection());
86+
$spreadsheet->disconnectWorksheets();
8487
}
8588

8689
public function testStyleRow(): void
@@ -115,6 +118,7 @@ public function testStyleRow(): void
115118
self::assertFalse($sheet->getStyle('A1')->getFont()->getItalic());
116119
self::assertTrue($sheet->getStyle('B2')->getFont()->getItalic());
117120
self::assertTrue($sheet->getStyle('C3')->getFont()->getItalic());
121+
$spreadsheet->disconnectWorksheets();
118122
}
119123

120124
public function testIssue1712A(): void
@@ -137,6 +141,7 @@ public function testIssue1712A(): void
137141
->setRGB($rgb);
138142
self::assertEquals($rgb, $sheet->getCell('A1')->getStyle()->getFill()->getStartColor()->getRGB());
139143
self::assertEquals($rgb, $sheet->getCell('B1')->getStyle()->getFill()->getStartColor()->getRGB());
144+
$spreadsheet->disconnectWorksheets();
140145
}
141146

142147
public function testIssue1712B(): void
@@ -159,6 +164,7 @@ public function testIssue1712B(): void
159164
$sheet->fromArray(['OK', 'KO']);
160165
self::assertEquals($rgb, $sheet->getCell('A1')->getStyle()->getFill()->getStartColor()->getRGB());
161166
self::assertEquals($rgb, $sheet->getCell('B1')->getStyle()->getFill()->getStartColor()->getRGB());
167+
$spreadsheet->disconnectWorksheets();
162168
}
163169

164170
public function testStyleLoopUpwards(): void
@@ -184,6 +190,7 @@ public function testStyleLoopUpwards(): void
184190
self::assertFalse($sheet->getStyle('A1')->getFont()->getBold());
185191
self::assertFalse($sheet->getStyle('B2')->getFont()->getBold());
186192
self::assertTrue($sheet->getStyle('C3')->getFont()->getBold());
193+
$spreadsheet->disconnectWorksheets();
187194
}
188195

189196
public function testStyleCellAddressObject(): void
@@ -195,6 +202,7 @@ public function testStyleCellAddressObject(): void
195202
$style->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_YYYYMMDDSLASH);
196203

197204
self::assertSame(NumberFormat::FORMAT_DATE_YYYYMMDDSLASH, $style->getNumberFormat()->getFormatCode());
205+
$spreadsheet->disconnectWorksheets();
198206
}
199207

200208
public function testStyleCellRangeObject(): void
@@ -208,5 +216,6 @@ public function testStyleCellRangeObject(): void
208216
$style->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_YYYYMMDDSLASH);
209217

210218
self::assertSame(NumberFormat::FORMAT_DATE_YYYYMMDDSLASH, $style->getNumberFormat()->getFormatCode());
219+
$spreadsheet->disconnectWorksheets();
211220
}
212221
}

‎tests/PhpSpreadsheetTests/Worksheet/AutoSizeTest.php

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@
1313

1414
class AutoSizeTest extends TestCase
1515
{
16-
protected Spreadsheet $spreadsheet;
16+
private Spreadsheet $spreadsheet;
1717

18-
protected Worksheet $worksheet;
18+
private Worksheet $worksheet;
1919

2020
protected function setUp(): void
2121
{
22-
parent::setUp();
23-
24-
$spreadsheet = new Spreadsheet();
25-
$this->worksheet = $spreadsheet->getActiveSheet();
22+
$this->spreadsheet = new Spreadsheet();
23+
$this->worksheet = $this->spreadsheet->getActiveSheet();
2624

2725
$this->worksheet->setCellValue('A1', 'YEAR')
2826
->setCellValue('B1', 'QUARTER')
@@ -44,7 +42,13 @@ protected function setUp(): void
4442
}
4543
}
4644

47-
protected function setTable(): Table
45+
protected function tearDown(): void
46+
{
47+
$this->spreadsheet->disconnectWorksheets();
48+
unset($this->spreadsheet, $this->worksheet);
49+
}
50+
51+
private function setTable(): Table
4852
{
4953
$table = new Table('A1:D5', 'Sales_Data');
5054
$tableStyle = new TableStyle();
@@ -55,7 +59,7 @@ protected function setTable(): Table
5559
return $table;
5660
}
5761

58-
protected function readColumnSizes(): array
62+
private function readColumnSizes(): array
5963
{
6064
$columnSizes = [];
6165
$toColumn = $this->worksheet->getHighestColumn();

‎tests/PhpSpreadsheetTests/Worksheet/CloneTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public function testSerialize1(): void
5252
serialize($sheet1);
5353
}
5454

55-
#[\PHPUnit\Framework\Attributes\RunInSeparateProcess]
5655
public function testSerialize2(): void
5756
{
5857
$sheet1 = new Worksheet();

0 commit comments

Comments
 (0)