From a0e95c24bf43e02bd0f6f104ba2d6067c8a2f575 Mon Sep 17 00:00:00 2001
From: Martin Baeuml <baeuml@kit.edu>
Date: Tue, 24 May 2011 22:09:22 +0200
Subject: [PATCH] move tests to own subdir, removes pytest runtime dependency

---
 sloth/items/factory.py          | 54 --------------------------------
 tests/container_factory_test.py | 11 +++++++
 tests/item_factory_test.py      | 55 +++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 54 deletions(-)
 create mode 100644 tests/container_factory_test.py
 create mode 100644 tests/item_factory_test.py

diff --git a/sloth/items/factory.py b/sloth/items/factory.py
index 24ef044..7abb135 100644
--- a/sloth/items/factory.py
+++ b/sloth/items/factory.py
@@ -86,57 +86,3 @@ class Factory:
             return None
         return item(*args, **kwargs)
 
-### testing
-import pytest
-class MockupRectItem:    pass
-class MockupPointItem:   pass
-class MockupPolygonItem: pass
-
-def _create_factory():
-    itemfactory = Factory({'point':   MockupPointItem,
-                           'polygon': MockupPolygonItem})
-    itemfactory.register('rect', MockupRectItem)
-
-    return itemfactory
-
-def test_register():
-    itemfactory = _create_factory()
-
-    item = itemfactory.create('rect')
-    assert isinstance(item, MockupRectItem)
-    item = itemfactory.create('point')
-    assert isinstance(item, MockupPointItem)
-    item = itemfactory.create('polygon')
-    assert isinstance(item, MockupPolygonItem)
-    item = itemfactory.create('polygon2')
-    assert item is None
-
-def test_register_fail():
-    itemfactory = _create_factory()
-    with pytest.raises(Exception):
-        itemfactory.register('rect', MockupRectItem)
-
-def test_register_replace():
-    itemfactory = _create_factory()
-
-    itemfactory.register('rect', MockupPolygonItem, replace=True)
-    item = itemfactory.create('rect')
-    assert isinstance(item, MockupPolygonItem)
-
-def test_clear():
-    itemfactory = _create_factory()
-
-    item = itemfactory.create('rect')
-    assert isinstance(item, MockupRectItem)
-    itemfactory.clear('rect')
-    item = itemfactory.create('rect')
-    assert item is None
-
-    item = itemfactory.create('point')
-    assert isinstance(item, MockupPointItem)
-    item = itemfactory.create('polygon')
-    assert isinstance(item, MockupPolygonItem)
-    itemfactory.clear()
-    assert itemfactory.create('point') is None
-    assert itemfactory.create('polygon') is None
-
diff --git a/tests/container_factory_test.py b/tests/container_factory_test.py
new file mode 100644
index 0000000..61ddc95
--- /dev/null
+++ b/tests/container_factory_test.py
@@ -0,0 +1,11 @@
+from sloth.annotations.container import *
+
+class MockupContainer:
+    pass
+
+def test_import_callable():
+    containers = (('*', 'container_factory_test.MockupContainer'),)
+    factory = AnnotationContainerFactory(containers)
+    item = factory.create('test')
+    assert isinstance(item, MockupContainer)
+
diff --git a/tests/item_factory_test.py b/tests/item_factory_test.py
new file mode 100644
index 0000000..5703bb2
--- /dev/null
+++ b/tests/item_factory_test.py
@@ -0,0 +1,55 @@
+import pytest
+from sloth.items import Factory
+
+class MockupRectItem:    pass
+class MockupPointItem:   pass
+class MockupPolygonItem: pass
+
+def _create_factory():
+    itemfactory = Factory({'point':   MockupPointItem,
+                           'polygon': MockupPolygonItem})
+    itemfactory.register('rect', MockupRectItem)
+
+    return itemfactory
+
+def test_register():
+    itemfactory = _create_factory()
+
+    item = itemfactory.create('rect')
+    assert isinstance(item, MockupRectItem)
+    item = itemfactory.create('point')
+    assert isinstance(item, MockupPointItem)
+    item = itemfactory.create('polygon')
+    assert isinstance(item, MockupPolygonItem)
+    item = itemfactory.create('polygon2')
+    assert item is None
+
+def test_register_fail():
+    itemfactory = _create_factory()
+    with pytest.raises(Exception):
+        itemfactory.register('rect', MockupRectItem)
+
+def test_register_replace():
+    itemfactory = _create_factory()
+
+    itemfactory.register('rect', MockupPolygonItem, replace=True)
+    item = itemfactory.create('rect')
+    assert isinstance(item, MockupPolygonItem)
+
+def test_clear():
+    itemfactory = _create_factory()
+
+    item = itemfactory.create('rect')
+    assert isinstance(item, MockupRectItem)
+    itemfactory.clear('rect')
+    item = itemfactory.create('rect')
+    assert item is None
+
+    item = itemfactory.create('point')
+    assert isinstance(item, MockupPointItem)
+    item = itemfactory.create('polygon')
+    assert isinstance(item, MockupPolygonItem)
+    itemfactory.clear()
+    assert itemfactory.create('point') is None
+    assert itemfactory.create('polygon') is None
+