From 5fd96867db89931fb13d511ff57882ad55da8714 Mon Sep 17 00:00:00 2001
From: Maciej Malarz <malarzm@gmail.com>
Date: Sun, 22 Oct 2017 22:20:13 +0200
Subject: [PATCH 1/2] Add read only implementations of provided collections

---
 lib/Malarzm/Collections/Mixin/ReadOnly.php    |  46 ++++++++
 .../ReadOnly/ReadOnlyArrayCollection.php      |  11 ++
 .../ReadOnly/ReadOnlyListArray.php            |  11 ++
 .../ReadOnly/ReadOnlyObjectSet.php            |  11 ++
 .../Collections/ReadOnly/ReadOnlySet.php      |  11 ++
 .../ReadOnly/ReadOnlySortedCollection.php     |  11 ++
 .../ReadOnly/ReadOnlySortedList.php           |  11 ++
 tests/Malarzm/Tests/BaseReadOnlyTest.php      |  72 ++++++++++++
 .../ReadOnly/ReadOnlyArrayCollectionTest.php  |  19 ++++
 .../ReadOnly/ReadOnlyListArrayTest.php        |  22 ++++
 .../ReadOnly/ReadOnlyObjectSetTest.php        |  27 +++++
 .../Collections/ReadOnly/ReadOnlySetTest.php  |  32 ++++++
 .../ReadOnly/ReadOnlySortedCollectionTest.php |  91 ++++++++++++++++
 .../ReadOnly/ReadOnlySortedListTest.php       | 103 ++++++++++++++++++
 14 files changed, 478 insertions(+)
 create mode 100644 lib/Malarzm/Collections/Mixin/ReadOnly.php
 create mode 100644 lib/Malarzm/Collections/ReadOnly/ReadOnlyArrayCollection.php
 create mode 100644 lib/Malarzm/Collections/ReadOnly/ReadOnlyListArray.php
 create mode 100644 lib/Malarzm/Collections/ReadOnly/ReadOnlyObjectSet.php
 create mode 100644 lib/Malarzm/Collections/ReadOnly/ReadOnlySet.php
 create mode 100644 lib/Malarzm/Collections/ReadOnly/ReadOnlySortedCollection.php
 create mode 100644 lib/Malarzm/Collections/ReadOnly/ReadOnlySortedList.php
 create mode 100644 tests/Malarzm/Tests/BaseReadOnlyTest.php
 create mode 100644 tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyArrayCollectionTest.php
 create mode 100644 tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyListArrayTest.php
 create mode 100644 tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyObjectSetTest.php
 create mode 100644 tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySetTest.php
 create mode 100644 tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedCollectionTest.php
 create mode 100644 tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedListTest.php

diff --git a/lib/Malarzm/Collections/Mixin/ReadOnly.php b/lib/Malarzm/Collections/Mixin/ReadOnly.php
new file mode 100644
index 0000000..50b96c4
--- /dev/null
+++ b/lib/Malarzm/Collections/Mixin/ReadOnly.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Malarzm\Collections\Mixin;
+
+trait ReadOnly
+{
+    /**
+     * @throws \LogicException
+     */
+    public function clear()
+    {
+        throw new \LogicException('You can not modify a read only collection.');
+    }
+
+    /**
+     * @throws \LogicException
+     */
+    public function add($element)
+    {
+        throw new \LogicException('You can not modify a read only collection.');
+    }
+
+    /**
+     * @throws \LogicException
+     */
+    public function remove($key)
+    {
+        throw new \LogicException('You can not modify a read only collection.');
+    }
+
+    /**
+     * @throws \LogicException
+     */
+    public function removeElement($element)
+    {
+        throw new \LogicException('You can not modify a read only collection.');
+    }
+
+    /**
+     * @throws \LogicException
+     */
+    public function set($key, $value)
+    {
+        throw new \LogicException('You can not modify a read only collection.');
+    }
+}
diff --git a/lib/Malarzm/Collections/ReadOnly/ReadOnlyArrayCollection.php b/lib/Malarzm/Collections/ReadOnly/ReadOnlyArrayCollection.php
new file mode 100644
index 0000000..03dcfa7
--- /dev/null
+++ b/lib/Malarzm/Collections/ReadOnly/ReadOnlyArrayCollection.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Malarzm\Collections\ReadOnly;
+
+use Malarzm\Collections\ArrayCollection;
+use Malarzm\Collections\Mixin\ReadOnly;
+
+class ReadOnlyArrayCollection extends ArrayCollection
+{
+    use ReadOnly;
+}
diff --git a/lib/Malarzm/Collections/ReadOnly/ReadOnlyListArray.php b/lib/Malarzm/Collections/ReadOnly/ReadOnlyListArray.php
new file mode 100644
index 0000000..62c2a06
--- /dev/null
+++ b/lib/Malarzm/Collections/ReadOnly/ReadOnlyListArray.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Malarzm\Collections\ReadOnly;
+
+use Malarzm\Collections\ListArray;
+use Malarzm\Collections\Mixin\ReadOnly;
+
+class ReadOnlyListArray extends ListArray
+{
+    use ReadOnly;
+}
diff --git a/lib/Malarzm/Collections/ReadOnly/ReadOnlyObjectSet.php b/lib/Malarzm/Collections/ReadOnly/ReadOnlyObjectSet.php
new file mode 100644
index 0000000..d17f799
--- /dev/null
+++ b/lib/Malarzm/Collections/ReadOnly/ReadOnlyObjectSet.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Malarzm\Collections\ReadOnly;
+
+use Malarzm\Collections\Mixin\ReadOnly;
+use Malarzm\Collections\ObjectSet;
+
+class ReadOnlyObjectSet extends ObjectSet
+{
+    use ReadOnly;
+}
diff --git a/lib/Malarzm/Collections/ReadOnly/ReadOnlySet.php b/lib/Malarzm/Collections/ReadOnly/ReadOnlySet.php
new file mode 100644
index 0000000..eeb09af
--- /dev/null
+++ b/lib/Malarzm/Collections/ReadOnly/ReadOnlySet.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Malarzm\Collections\ReadOnly;
+
+use Malarzm\Collections\Mixin\ReadOnly;
+use Malarzm\Collections\Set;
+
+abstract class ReadOnlySet extends Set
+{
+    use ReadOnly;
+}
diff --git a/lib/Malarzm/Collections/ReadOnly/ReadOnlySortedCollection.php b/lib/Malarzm/Collections/ReadOnly/ReadOnlySortedCollection.php
new file mode 100644
index 0000000..4c44fa6
--- /dev/null
+++ b/lib/Malarzm/Collections/ReadOnly/ReadOnlySortedCollection.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Malarzm\Collections\ReadOnly;
+
+use Malarzm\Collections\Mixin\ReadOnly;
+use Malarzm\Collections\SortedCollection;
+
+abstract class ReadOnlySortedCollection extends SortedCollection
+{
+    use ReadOnly;
+}
diff --git a/lib/Malarzm/Collections/ReadOnly/ReadOnlySortedList.php b/lib/Malarzm/Collections/ReadOnly/ReadOnlySortedList.php
new file mode 100644
index 0000000..d8b223d
--- /dev/null
+++ b/lib/Malarzm/Collections/ReadOnly/ReadOnlySortedList.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Malarzm\Collections\ReadOnly;
+
+use Malarzm\Collections\Mixin\ReadOnly;
+use Malarzm\Collections\SortedList;
+
+abstract class ReadOnlySortedList extends SortedList
+{
+    use ReadOnly;
+}
diff --git a/tests/Malarzm/Tests/BaseReadOnlyTest.php b/tests/Malarzm/Tests/BaseReadOnlyTest.php
new file mode 100644
index 0000000..c7570ea
--- /dev/null
+++ b/tests/Malarzm/Tests/BaseReadOnlyTest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Malarzm\Collections\Tests;
+
+use Doctrine\Common\Collections\Collection;
+
+abstract class BaseReadOnlyTest extends BaseTest
+{
+    /**
+     * @dataProvider provideCollection
+     */
+    public function testClearAndIsEmpty(Collection $coll)
+    {
+        $this->setExpectedException('\LogicException', 'You can not modify a read only collection.');
+        parent::testClearAndIsEmpty($coll);
+    }
+
+
+    /**
+     * @dataProvider provideCollection
+     */
+    public function testAddIsProhibited(Collection $coll, array $elements)
+    {
+        $this->setExpectedException('\LogicException', 'You can not modify a read only collection.');
+        $coll->add(reset($elements));
+    }
+
+    /**
+     * @dataProvider provideCollection
+     */
+    public function testRemoveIsProhibited(Collection $coll, array $elements)
+    {
+        $this->setExpectedException('\LogicException', 'You can not modify a read only collection.');
+        $coll->remove(array_keys($elements)[0]);
+    }
+
+    /**
+     * @dataProvider provideCollection
+     */
+    public function testRemoveElementIsProhibited(Collection $coll, array $elements)
+    {
+        $this->setExpectedException('\LogicException', 'You can not modify a read only collection.');
+        $coll->remove(reset($elements));
+    }
+
+    /**
+     * @dataProvider provideCollection
+     */
+    public function testSetIsProhibited(Collection $coll, array $elements)
+    {
+        $this->setExpectedException('\LogicException', 'You can not modify a read only collection.');
+        $coll->set(array_keys($elements)[0], reset($elements));
+    }
+
+    /**
+     * @dataProvider provideCollection
+     */
+    public function testOffsetSetIsProhibited(Collection $coll, array $elements)
+    {
+        $this->setExpectedException('\LogicException', 'You can not modify a read only collection.');
+        $coll[array_keys($elements)[0]] = reset($elements);
+    }
+
+    /**
+     * @dataProvider provideCollection
+     */
+    public function testOffsetRemoveIsProhibited(Collection $coll, array $elements)
+    {
+        $this->setExpectedException('\LogicException', 'You can not modify a read only collection.');
+        unset($coll[array_keys($elements)[0]]);
+    }
+}
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyArrayCollectionTest.php b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyArrayCollectionTest.php
new file mode 100644
index 0000000..912a794
--- /dev/null
+++ b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyArrayCollectionTest.php
@@ -0,0 +1,19 @@
+<?php
+
+
+namespace Malarzm\Collections\Tests\Collections\ReadOnly;
+
+use Malarzm\Collections\ReadOnly\ReadOnlyArrayCollection;
+use Malarzm\Collections\Tests\BaseReadOnlyTest;
+
+class ReadOnlyArrayCollectionTest extends BaseReadOnlyTest
+{
+    public function provideCollection()
+    {
+        $associative = [ 'foo' => 1, 'bar' => 2, 7 ];
+        return [
+            [ new ReadOnlyArrayCollection([ 5, 7, 9 ]), [ 5, 7, 9] ],
+            [ new ReadOnlyArrayCollection($associative), $associative ],
+        ];
+    }
+}
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyListArrayTest.php b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyListArrayTest.php
new file mode 100644
index 0000000..51367e9
--- /dev/null
+++ b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyListArrayTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Malarzm\Collections\Tests\Collections\ReadOnly;
+
+use Malarzm\Collections\ReadOnly\ReadOnlyListArray;
+use Malarzm\Collections\Tests\BaseReadOnlyTest;
+
+class ReadOnlyListArrayTest extends BaseReadOnlyTest
+{
+    public function provideCollection()
+    {
+        return [
+            [ new ReadOnlyListArray([1, 2, 3]), [1, 2, 3] ],
+        ];
+    }
+
+    public function testConstructFixesElements()
+    {
+        $coll = new ReadOnlyListArray([ 3 => 1]);
+        $this->assertSame([ 1 ], $coll->toArray());
+    }
+}
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyObjectSetTest.php b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyObjectSetTest.php
new file mode 100644
index 0000000..6e308e4
--- /dev/null
+++ b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyObjectSetTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Malarzm\Collections\Tests\Collections\ReadOnly;
+
+use Doctrine\Common\Collections\Collection;
+use Malarzm\Collections\ReadOnly\ReadOnlyObjectSet;
+use Malarzm\Collections\Tests\BaseReadOnlyTest;
+
+class ReadOnlyObjectSetTest extends BaseReadOnlyTest
+{
+    public function provideCollection()
+    {
+        $elements = [ new \stdClass(), new \stdClass(), new \stdClass() ];
+        return [
+            [ new ReadOnlyObjectSet($elements), $elements ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideCollection
+     */
+    public function testContains(Collection $coll, array $elements)
+    {
+        $this->assertTrue($coll->contains($coll->first()));
+        $this->assertFalse($coll->contains(new \stdClass()));
+    }
+}
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySetTest.php b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySetTest.php
new file mode 100644
index 0000000..9aeb669
--- /dev/null
+++ b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySetTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Malarzm\Collections\Tests\Collections\ReadOnly;
+
+use Malarzm\Collections\Malarzm\Collections\ReadOnly\ReadOnlySet;
+use Malarzm\Collections\Tests\BaseReadOnlyTest;
+
+class ReadOnlySetTest extends BaseReadOnlyTest
+{
+    public function provideCollection()
+    {
+        $associative = [ 'foo' => 1, 'bar' => 2, 7 ];
+        return [
+            [ new ReadOnlyIntSet([ 5, 7, 9 ]), [ 5, 7, 9] ],
+            [ new ReadOnlyIntSet($associative), $associative ],
+        ];
+    }
+}
+
+class ReadOnlyIntSet extends ReadOnlySet
+{
+    public function compare($a, $b)
+    {
+        if ($a > $b) {
+            return 1;
+        } elseif ($a === $b) {
+            return 0;
+        } else {
+            return -1;
+        }
+    }
+}
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedCollectionTest.php b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedCollectionTest.php
new file mode 100644
index 0000000..2e4fa1f
--- /dev/null
+++ b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedCollectionTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Malarzm\Collections\Tests\Collections\ReadOnly;
+
+use Malarzm\Collections\ReadOnly\ReadOnlySortedCollection;
+use Malarzm\Collections\Tests\BaseReadOnlyTest;
+
+class ReadOnlySortedCollectionTest extends BaseReadOnlyTest
+{
+    public function provideCollection()
+    {
+        $associative = [ 'foo' => 1, 'bar' => 2, 5 ];
+        return [
+            [ new SortedIntCollection([ 5, 7, 9 ], 'usort'), [ 5, 7, 9] ],
+            [ new SortedIntCollection($associative, 'uasort'), $associative ],
+        ];
+    }
+
+    public function testSortIsCalled()
+    {
+        $i = 0; $spy = new SortSpy();
+        ++$i; $c = new SortedIntCollection([2, 1], $spy);
+        $this->assertEquals($i, $spy->cnt);
+    }
+
+    public function testMapKeepsSortOrder()
+    {
+        $collection = new SortedObjectCollection([
+            (object) ['sortOrder' => 1],
+            (object) ['sortOrder' => 2],
+            (object) ['sortOrder' => 3],
+        ]);
+
+        $newCollection = $collection->map(function ($object) { return (array) $object; });
+
+        $expected = [
+            ['sortOrder' => 1],
+            ['sortOrder' => 2],
+            ['sortOrder' => 3],
+        ];
+
+        $this->assertSame($expected, $newCollection->toArray());
+    }
+}
+
+class SortedIntCollection extends ReadOnlySortedCollection
+{
+    public function compare($a, $b)
+    {
+        if ($a > $b) {
+            return 1;
+        } elseif ($a === $b) {
+            return 0;
+        } else {
+            return -1;
+        }
+    }
+}
+
+class SortedObjectCollection extends ReadOnlySortedCollection
+{
+    public function compare($a, $b)
+    {
+        if (! $a instanceof \stdClass || ! $b instanceof \stdClass) {
+            return 0;
+        }
+
+        if (! isset($a->sortOrder, $b->sortOrder)) {
+            return 0;
+        }
+
+        if ($a->sortOrder > $b->sortOrder) {
+            return 1;
+        } elseif ($a->sortOrder === $b->sortOrder) {
+            return 0;
+        } else {
+            return -1;
+        }
+    }
+}
+
+class SortSpy
+{
+    public $cnt = 0;
+
+    public function __invoke(& $elements, $comp)
+    {
+        $this->cnt++;
+        usort($elements, $comp);
+    }
+}
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedListTest.php b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedListTest.php
new file mode 100644
index 0000000..dd660a8
--- /dev/null
+++ b/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedListTest.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Malarzm\Collections\Tests\Collections\ReadOnly;
+
+use Malarzm\Collections\ReadOnly\ReadOnlySortedList;
+
+class ReadOnlySortedListTest extends \PHPUnit_Framework_TestCase
+{
+    public function provideCollection()
+    {
+        return [
+            [ new SortedIntList([1, 2, 3]), [1, 2, 3] ],
+        ];
+    }
+
+    public function testConstructFixesElements()
+    {
+        $c = new SortedIntList([ 1 => 8, 3 => 4, 8 => 9 ]);
+        $this->assertSame([4, 8, 9], $c->toArray());
+    }
+
+    public function testContainsThoroughly()
+    {
+        $c = new SortedIntList([ 5, 9, 7, 1, 3 ]);
+        $this->assertFalse($c->contains(0));
+        $this->assertTrue($c->contains(1));
+        $this->assertFalse($c->contains(2));
+        $this->assertTrue($c->contains(3));
+        $this->assertFalse($c->contains(4));
+        $this->assertTrue($c->contains(5));
+        $this->assertFalse($c->contains(6));
+        $this->assertTrue($c->contains(7));
+        $this->assertFalse($c->contains(8));
+        $this->assertTrue($c->contains(9));
+        $this->assertFalse($c->contains(10));
+    }
+
+    public function testIndexOfThoroughly()
+    {
+        $c = new SortedIntList([ 5, 9, 7, 1, 3 ]);
+        $this->assertSame(0, $c->indexOf(1));
+        $this->assertSame(1, $c->indexOf(3));
+        $this->assertSame(2, $c->indexOf(5));
+        $this->assertSame(3, $c->indexOf(7));
+        $this->assertSame(4, $c->indexOf(9));
+        $this->assertSame(false, $c->indexOf(666));
+    }
+
+    public function testMapKeepsSortOrder()
+    {
+        $collection = new SortedObjectList([
+            (object) ['sortOrder' => 1],
+            (object) ['sortOrder' => 2],
+            (object) ['sortOrder' => 3],
+        ]);
+
+        $newCollection = $collection->map(function ($object) { return (array) $object; });
+
+        $expected = [
+            ['sortOrder' => 1],
+            ['sortOrder' => 2],
+            ['sortOrder' => 3],
+        ];
+
+        $this->assertSame($expected, $newCollection->toArray());
+    }
+}
+
+class SortedIntList extends ReadOnlySortedList
+{
+    public function compare($a, $b)
+    {
+        if ($a > $b) {
+            return 1;
+        } elseif ($a === $b) {
+            return 0;
+        } else {
+            return -1;
+        }
+    }
+}
+
+class SortedObjectList extends ReadOnlySortedList
+{
+    public function compare($a, $b)
+    {
+        if (! $a instanceof \stdClass || ! $b instanceof \stdClass) {
+            return 0;
+        }
+
+        if (! isset($a->sortOrder, $b->sortOrder)) {
+            return 0;
+        }
+
+        if ($a->sortOrder > $b->sortOrder) {
+            return 1;
+        } elseif ($a->sortOrder === $b->sortOrder) {
+            return 0;
+        } else {
+            return -1;
+        }
+    }
+}

From 8cef96034461b43580fdaad39158bb3ff852aa4d Mon Sep 17 00:00:00 2001
From: Maciej Malarz <maciej.malarz@codete.com>
Date: Wed, 20 Dec 2017 16:04:11 +0100
Subject: [PATCH 2/2] Unscrew test structure

---
 composer.json                                                  | 3 +++
 phpunit.xml.dist                                               | 2 +-
 tests/{Malarzm/Tests => }/BaseReadOnlyTest.php                 | 0
 tests/{Malarzm/Tests => }/BaseTest.php                         | 0
 tests/{Malarzm/Tests => }/Collections/ArrayCollectionTest.php  | 3 ++-
 tests/{Malarzm/Tests => }/Collections/DiffableTest.php         | 3 ++-
 tests/{Malarzm/Tests => }/Collections/ListArrayTest.php        | 3 ++-
 tests/{Malarzm/Tests => }/Collections/ObjectSetTest.php        | 3 ++-
 .../Collections/ReadOnly/ReadOnlyArrayCollectionTest.php       | 0
 .../Tests => }/Collections/ReadOnly/ReadOnlyListArrayTest.php  | 0
 .../Tests => }/Collections/ReadOnly/ReadOnlyObjectSetTest.php  | 0
 .../Tests => }/Collections/ReadOnly/ReadOnlySetTest.php        | 2 +-
 .../Collections/ReadOnly/ReadOnlySortedCollectionTest.php      | 0
 .../Tests => }/Collections/ReadOnly/ReadOnlySortedListTest.php | 0
 tests/{Malarzm/Tests => }/Collections/SetTest.php              | 3 ++-
 tests/{Malarzm/Tests => }/Collections/SortedCollectionTest.php | 3 ++-
 tests/{Malarzm/Tests => }/Collections/SortedListTest.php       | 3 ++-
 tests/bootstrap.php                                            | 2 --
 18 files changed, 19 insertions(+), 11 deletions(-)
 rename tests/{Malarzm/Tests => }/BaseReadOnlyTest.php (100%)
 rename tests/{Malarzm/Tests => }/BaseTest.php (100%)
 rename tests/{Malarzm/Tests => }/Collections/ArrayCollectionTest.php (94%)
 rename tests/{Malarzm/Tests => }/Collections/DiffableTest.php (95%)
 rename tests/{Malarzm/Tests => }/Collections/ListArrayTest.php (93%)
 rename tests/{Malarzm/Tests => }/Collections/ObjectSetTest.php (96%)
 rename tests/{Malarzm/Tests => }/Collections/ReadOnly/ReadOnlyArrayCollectionTest.php (100%)
 rename tests/{Malarzm/Tests => }/Collections/ReadOnly/ReadOnlyListArrayTest.php (100%)
 rename tests/{Malarzm/Tests => }/Collections/ReadOnly/ReadOnlyObjectSetTest.php (100%)
 rename tests/{Malarzm/Tests => }/Collections/ReadOnly/ReadOnlySetTest.php (90%)
 rename tests/{Malarzm/Tests => }/Collections/ReadOnly/ReadOnlySortedCollectionTest.php (100%)
 rename tests/{Malarzm/Tests => }/Collections/ReadOnly/ReadOnlySortedListTest.php (100%)
 rename tests/{Malarzm/Tests => }/Collections/SetTest.php (94%)
 rename tests/{Malarzm/Tests => }/Collections/SortedCollectionTest.php (96%)
 rename tests/{Malarzm/Tests => }/Collections/SortedListTest.php (97%)

diff --git a/composer.json b/composer.json
index 44be9ef..30ec199 100644
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,9 @@
   "autoload": {
     "psr-0": { "Malarzm\\Collections\\": "lib/" }
   },
+  "autoload-dev": {
+    "psr-4": { "Malarzm\\Collections\\Tests\\": "tests/" }
+  },
   "extra": {
     "branch-alias": {
       "dev-master": "1.0.x-dev"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 30f9d81..09fb130 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,7 +12,7 @@
 >
     <testsuites>
         <testsuite name="Malarzm CollectionsTest Suite">
-            <directory>./tests/Malarzm/</directory>
+            <directory>./tests//</directory>
         </testsuite>
     </testsuites>
 </phpunit>
\ No newline at end of file
diff --git a/tests/Malarzm/Tests/BaseReadOnlyTest.php b/tests/BaseReadOnlyTest.php
similarity index 100%
rename from tests/Malarzm/Tests/BaseReadOnlyTest.php
rename to tests/BaseReadOnlyTest.php
diff --git a/tests/Malarzm/Tests/BaseTest.php b/tests/BaseTest.php
similarity index 100%
rename from tests/Malarzm/Tests/BaseTest.php
rename to tests/BaseTest.php
diff --git a/tests/Malarzm/Tests/Collections/ArrayCollectionTest.php b/tests/Collections/ArrayCollectionTest.php
similarity index 94%
rename from tests/Malarzm/Tests/Collections/ArrayCollectionTest.php
rename to tests/Collections/ArrayCollectionTest.php
index dee9b0e..afb8dca 100644
--- a/tests/Malarzm/Tests/Collections/ArrayCollectionTest.php
+++ b/tests/Collections/ArrayCollectionTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Malarzm\Collections\Tests;
+namespace Malarzm\Collections\Tests\Collections;
 
 use Malarzm\Collections\ArrayCollection;
+use Malarzm\Collections\Tests\BaseTest;
 
 class ArrayCollectionTest extends BaseTest
 {
diff --git a/tests/Malarzm/Tests/Collections/DiffableTest.php b/tests/Collections/DiffableTest.php
similarity index 95%
rename from tests/Malarzm/Tests/Collections/DiffableTest.php
rename to tests/Collections/DiffableTest.php
index a95d56b..0d69677 100644
--- a/tests/Malarzm/Tests/Collections/DiffableTest.php
+++ b/tests/Collections/DiffableTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Malarzm\Collections\Tests;
+namespace Malarzm\Collections\Tests\Collections;
 
 use Malarzm\Collections\Diffable;
+use Malarzm\Collections\Tests\BaseTest;
 
 class DiffableTest extends BaseTest
 {
diff --git a/tests/Malarzm/Tests/Collections/ListArrayTest.php b/tests/Collections/ListArrayTest.php
similarity index 93%
rename from tests/Malarzm/Tests/Collections/ListArrayTest.php
rename to tests/Collections/ListArrayTest.php
index ad77baf..b2206f6 100644
--- a/tests/Malarzm/Tests/Collections/ListArrayTest.php
+++ b/tests/Collections/ListArrayTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Malarzm\Collections\Tests;
+namespace Malarzm\Collections\Tests\Collections;
 
 use Malarzm\Collections\ListArray;
+use Malarzm\Collections\Tests\BaseTest;
 
 class ListArrayTest extends BaseTest
 {
diff --git a/tests/Malarzm/Tests/Collections/ObjectSetTest.php b/tests/Collections/ObjectSetTest.php
similarity index 96%
rename from tests/Malarzm/Tests/Collections/ObjectSetTest.php
rename to tests/Collections/ObjectSetTest.php
index 10e1ffd..a62ad02 100644
--- a/tests/Malarzm/Tests/Collections/ObjectSetTest.php
+++ b/tests/Collections/ObjectSetTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Malarzm\Collections\Tests;
+namespace Malarzm\Collections\Tests\Collections;
 
 use Doctrine\Common\Collections\Collection;
 use Malarzm\Collections\ObjectSet;
+use Malarzm\Collections\Tests\BaseTest;
 
 class ObjectSetTest extends BaseTest
 {
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyArrayCollectionTest.php b/tests/Collections/ReadOnly/ReadOnlyArrayCollectionTest.php
similarity index 100%
rename from tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyArrayCollectionTest.php
rename to tests/Collections/ReadOnly/ReadOnlyArrayCollectionTest.php
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyListArrayTest.php b/tests/Collections/ReadOnly/ReadOnlyListArrayTest.php
similarity index 100%
rename from tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyListArrayTest.php
rename to tests/Collections/ReadOnly/ReadOnlyListArrayTest.php
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyObjectSetTest.php b/tests/Collections/ReadOnly/ReadOnlyObjectSetTest.php
similarity index 100%
rename from tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlyObjectSetTest.php
rename to tests/Collections/ReadOnly/ReadOnlyObjectSetTest.php
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySetTest.php b/tests/Collections/ReadOnly/ReadOnlySetTest.php
similarity index 90%
rename from tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySetTest.php
rename to tests/Collections/ReadOnly/ReadOnlySetTest.php
index 9aeb669..fb59a6b 100644
--- a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySetTest.php
+++ b/tests/Collections/ReadOnly/ReadOnlySetTest.php
@@ -2,7 +2,7 @@
 
 namespace Malarzm\Collections\Tests\Collections\ReadOnly;
 
-use Malarzm\Collections\Malarzm\Collections\ReadOnly\ReadOnlySet;
+use Malarzm\Collections\ReadOnly\ReadOnlySet;
 use Malarzm\Collections\Tests\BaseReadOnlyTest;
 
 class ReadOnlySetTest extends BaseReadOnlyTest
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedCollectionTest.php b/tests/Collections/ReadOnly/ReadOnlySortedCollectionTest.php
similarity index 100%
rename from tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedCollectionTest.php
rename to tests/Collections/ReadOnly/ReadOnlySortedCollectionTest.php
diff --git a/tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedListTest.php b/tests/Collections/ReadOnly/ReadOnlySortedListTest.php
similarity index 100%
rename from tests/Malarzm/Tests/Collections/ReadOnly/ReadOnlySortedListTest.php
rename to tests/Collections/ReadOnly/ReadOnlySortedListTest.php
diff --git a/tests/Malarzm/Tests/Collections/SetTest.php b/tests/Collections/SetTest.php
similarity index 94%
rename from tests/Malarzm/Tests/Collections/SetTest.php
rename to tests/Collections/SetTest.php
index 0e20da7..17bdde3 100644
--- a/tests/Malarzm/Tests/Collections/SetTest.php
+++ b/tests/Collections/SetTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Malarzm\Collections\Tests;
+namespace Malarzm\Collections\Tests\Collections;
 
 use Malarzm\Collections\Set;
+use Malarzm\Collections\Tests\BaseTest;
 
 class SetTest extends BaseTest
 {
diff --git a/tests/Malarzm/Tests/Collections/SortedCollectionTest.php b/tests/Collections/SortedCollectionTest.php
similarity index 96%
rename from tests/Malarzm/Tests/Collections/SortedCollectionTest.php
rename to tests/Collections/SortedCollectionTest.php
index 762b0f7..b74d53a 100644
--- a/tests/Malarzm/Tests/Collections/SortedCollectionTest.php
+++ b/tests/Collections/SortedCollectionTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Malarzm\Collections\Tests;
+namespace Malarzm\Collections\Tests\Collections;
 
 use Malarzm\Collections\SortedCollection;
+use Malarzm\Collections\Tests\BaseTest;
 
 class SortedCollectionTest extends BaseTest
 {
diff --git a/tests/Malarzm/Tests/Collections/SortedListTest.php b/tests/Collections/SortedListTest.php
similarity index 97%
rename from tests/Malarzm/Tests/Collections/SortedListTest.php
rename to tests/Collections/SortedListTest.php
index db7996d..f2d9c2b 100644
--- a/tests/Malarzm/Tests/Collections/SortedListTest.php
+++ b/tests/Collections/SortedListTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Malarzm\Collections\Tests;
+namespace Malarzm\Collections\Tests\Collections;
 
 use Malarzm\Collections\SortedList;
+use Malarzm\Collections\Tests\BaseTest;
 
 class SortedListTest extends BaseTest
 {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 3efc0cb..80b2850 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -5,5 +5,3 @@
 }
 
 $loader = require $file;
-
-$loader->add('Malarzm\Collections\Tests', __DIR__);