Skip to content

Commit

Permalink
Use assertCount in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@dvdoug
dvdoug committed Nov 10, 2018
1 parent 14440d6 commit dce4d32
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 33 deletions.
4 changes: 2 additions & 2 deletions tests/EfficiencyTest.php
View file
Expand Up @@ -84,12 +84,12 @@ public function testCanPackRepresentativeLargerSamples(
$packedItemCount3D += $packedBox->getItems()->count();
}

self::assertEquals($expectedBoxes2D, $packedBoxes2D->count());
self::assertCount($expectedBoxes2D, $packedBoxes2D);
self::assertEquals($expectedItemCount, $packedItemCount2D);
self::assertEquals($expectedVolumeUtilisation2D, $packedBoxes2D->getVolumeUtilisation());
self::assertEquals($expectedWeightVariance2D, $packedBoxes2D->getWeightVariance());

self::assertEquals($expectedBoxes3D, $packedBoxes3D->count());
self::assertCount($expectedBoxes3D, $packedBoxes3D);
self::assertEquals($expectedItemCount, $packedItemCount3D);
self::assertEquals($expectedVolumeUtilisation3D, $packedBoxes3D->getVolumeUtilisation());
self::assertEquals($expectedWeightVariance3D, $packedBoxes3D->getWeightVariance());
Expand Down
13 changes: 6 additions & 7 deletions tests/ItemListTest.php
View file
Expand Up @@ -10,7 +10,6 @@

use DVDoug\BoxPacker\Test\TestItem;
use PHPUnit\Framework\TestCase;
use function count;
use function iterator_to_array;

/**
Expand Down Expand Up @@ -67,19 +66,19 @@ public function testKeepingItemsOfSameTypeTogether(): void
public function testCount(): void
{
$itemList = new ItemList();
self::assertEquals(0, count($itemList));
self::assertCount(0, $itemList);

$item1 = new TestItem('Item A', 20, 20, 2, 100, true);
$itemList->insert($item1);
self::assertEquals(1, count($itemList));
self::assertCount(1, $itemList);

$item2 = new TestItem('Item B', 20, 20, 2, 100, true);
$itemList->insert($item2);
self::assertEquals(2, count($itemList));
self::assertCount(2, $itemList);

$item3 = new TestItem('Item C', 20, 20, 2, 100, true);
$itemList->insert($item3);
self::assertEquals(3, count($itemList));
self::assertCount(3, $itemList);
}

/**
Expand All @@ -92,7 +91,7 @@ public function testTop(): void
$itemList->insert($item1);

self::assertEquals($item1, $itemList->top());
self::assertEquals(1, count($itemList));
self::assertCount(1, $itemList);
}

/**
Expand All @@ -105,6 +104,6 @@ public function testExtract(): void
$itemList->insert($item1);

self::assertEquals($item1, $itemList->extract());
self::assertEquals(0, count($itemList));
self::assertCount(0, $itemList);
}
}
4 changes: 2 additions & 2 deletions tests/PackedBoxListTest.php
View file
Expand Up @@ -41,7 +41,7 @@ public function testInsertAndCount(): void
$packedBoxList->insert($packedBoxA);
$packedBoxList->insert($packedBoxB);

self::assertEquals(2, $packedBoxList->count());
self::assertCount(2, $packedBoxList);
}

/**
Expand All @@ -67,7 +67,7 @@ public function testInsertFromArrayAndCount(): void
$packedBoxList = new PackedBoxList();
$packedBoxList->insertFromArray([$packedBoxA, $packedBoxB]);

self::assertEquals(2, $packedBoxList->count());
self::assertCount(2, $packedBoxList);
}

/**
Expand Down
18 changes: 8 additions & 10 deletions tests/PackerTest.php
View file
Expand Up @@ -11,7 +11,6 @@
use DVDoug\BoxPacker\Test\TestBox;
use DVDoug\BoxPacker\Test\TestItem;
use PHPUnit\Framework\TestCase;
use function count;
use function iterator_to_array;

/**
Expand Down Expand Up @@ -80,8 +79,8 @@ public function testWeightRedistributionActivatesOrNot(): void
/** @var PackedBox[] $packedBoxes */
$packedBoxes = iterator_to_array($packer->pack(), false);

self::assertEquals(2, $packedBoxes[0]->getItems()->count());
self::assertEquals(2, $packedBoxes[1]->getItems()->count());
self::assertCount(2, $packedBoxes[0]->getItems());
self::assertCount(2, $packedBoxes[1]->getItems());

// same items, but with redistribution turned off - expecting 3+1 based on pure fit
$packer = new Packer();
Expand All @@ -92,8 +91,8 @@ public function testWeightRedistributionActivatesOrNot(): void
/** @var PackedBox[] $packedBoxes */
$packedBoxes = iterator_to_array($packer->pack(), false);

self::assertEquals(3, $packedBoxes[0]->getItems()->count());
self::assertEquals(1, $packedBoxes[1]->getItems()->count());
self::assertCount(3, $packedBoxes[0]->getItems());
self::assertCount(1, $packedBoxes[1]->getItems());
}

/**
Expand All @@ -106,7 +105,7 @@ public function testIssue52A(): void
$packer->addItem(new TestItem('Item', 15, 13, 8, 407, true), 2);
$packedBoxes = $packer->pack();

self::assertEquals(1, $packedBoxes->count());
self::assertCount(1, $packedBoxes);
self::assertEquals(26, $packedBoxes->top()->getUsedWidth());
self::assertEquals(15, $packedBoxes->top()->getUsedLength());
self::assertEquals(8, $packedBoxes->top()->getUsedDepth());
Expand All @@ -125,7 +124,7 @@ public function testIssue52B(): void
$packer->addItem(new TestItem('Item 4', 148, 210, 32, 880, true));
$packedBoxes = $packer->pack();

self::assertEquals(1, $packedBoxes->count());
self::assertCount(1, $packedBoxes);
self::assertEquals(310, $packedBoxes->top()->getUsedWidth());
self::assertEquals(368, $packedBoxes->top()->getUsedLength());
self::assertEquals(32, $packedBoxes->top()->getUsedDepth());
Expand All @@ -145,8 +144,7 @@ public function testIssue52C(): void
/** @var PackedBox[] $packedBoxes */
$packedBoxes = iterator_to_array($packer->pack(), false);

self::assertEquals(1, count($packedBoxes));

self::assertCount(1, $packedBoxes);
self::assertEquals(210, $packedBoxes[0]->getUsedWidth());
self::assertEquals(297, $packedBoxes[0]->getUsedLength());
self::assertEquals(74, $packedBoxes[0]->getUsedDepth());
Expand Down Expand Up @@ -174,6 +172,6 @@ public function testIssue38(): void
/** @var PackedBox[] $packedBoxes */
$packedBoxes = iterator_to_array($packer->pack(), false);

self::assertEquals(2, count($packedBoxes));
self::assertCount(2, $packedBoxes);
}
}
19 changes: 9 additions & 10 deletions tests/VolumePackerTest.php
View file
Expand Up @@ -12,7 +12,6 @@
use DVDoug\BoxPacker\Test\TestConstrainedTestItem;
use DVDoug\BoxPacker\Test\TestItem;
use PHPUnit\Framework\TestCase;
use function count;

/**
* @covers \DVDoug\BoxPacker\VolumePacker
Expand Down Expand Up @@ -52,7 +51,7 @@ public function testUsedWidthAndRemainingWidthHandleRotationsCorrectly(): void
$packer->addItem(new TestItem('Item 3', 6, 17, 2, 1, true), 3);
$packedBoxes = $packer->pack();

self::assertEquals(1, $packedBoxes->count());
self::assertCount(1, $packedBoxes);

/** @var PackedBox $packedBox */
$packedBox = $packedBoxes->top();
Expand All @@ -75,7 +74,7 @@ public function testConstraints(): void
$packer->addItem(new TestItem('Item', 1, 1, 1, 0, false), 8);
$packedBoxes = $packer->pack();

self::assertEquals(1, $packedBoxes->count());
self::assertCount(1, $packedBoxes);

// same dimensions but now constrained by type
TestConstrainedTestItem::$limit = 2;
Expand All @@ -85,7 +84,7 @@ public function testConstraints(): void
$packer->addItem(new TestConstrainedTestItem('Item', 1, 1, 1, 0, false), 8);
$packedBoxes = $packer->pack();

self::assertEquals(4, $packedBoxes->count());
self::assertCount(4, $packedBoxes);
}

/**
Expand All @@ -101,7 +100,7 @@ public function testIssue14(): void
$packer->addItem(new TestItem('9x1x6Item', 9, 1, 6, 1, true));
$packedBoxes = $packer->pack();

self::assertEquals(1, $packedBoxes->count());
self::assertCount(1, $packedBoxes);
}

/**
Expand All @@ -119,7 +118,7 @@ public function testIssue47A(): void
$packer = new VolumePacker($box, $itemList);
$packedBox = $packer->pack();

self::assertEquals(23, count($packedBox->getItems()));
self::assertCount(23, $packedBox->getItems());
}

/**
Expand All @@ -137,7 +136,7 @@ public function testIssue47B(): void
$packer = new VolumePacker($box, $itemList);
$packedBox = $packer->pack();

self::assertEquals(23, count($packedBox->getItems()));
self::assertCount(23, $packedBox->getItems());
}

/**
Expand All @@ -156,7 +155,7 @@ public function testAllowsRotatedBoxesInNewRow(): void
$packer = new VolumePacker($box, $itemList);
$packedBox = $packer->pack();

self::assertEquals(9, count($packedBox->getItems()));
self::assertCount(9, $packedBox->getItems());
}

/**
Expand All @@ -174,7 +173,7 @@ public function testIssue148(): void
$packer = new VolumePacker($box, $itemList);
$packedBox = $packer->pack();

self::assertEquals(12, count($packedBox->getItems()));
self::assertCount(12, $packedBox->getItems());

$box = new TestBox('Box', 27, 37, 22, 100, 25, 36, 21, 15000);
$item = new TestItem('Item', 6, 12, 20, 100, true);
Expand All @@ -186,6 +185,6 @@ public function testIssue148(): void
$packer = new VolumePacker($box, $itemList);
$packedBox = $packer->pack();

self::assertEquals(12, count($packedBox->getItems()));
self::assertCount(12, $packedBox->getItems());
}
}
4 changes: 2 additions & 2 deletions tests/WeightRedistributorTest.php
View file
Expand Up @@ -30,7 +30,7 @@ public function testWeightRedistributionActivatesOrNot(): void
/** @var PackedBox[] $packedBoxes */
$packedBoxes = iterator_to_array($packer->pack(), false);

self::assertEquals(2, $packedBoxes[0]->getItems()->count());
self::assertEquals(2, $packedBoxes[1]->getItems()->count());
self::assertCount(2, $packedBoxes[0]->getItems());
self::assertCount(2, $packedBoxes[1]->getItems());
}
}

0 comments on commit dce4d32

Please sign in to comment.