[Checkins] SVN: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/ Remove unneeded ZCML stuff for simple sample and add some interface related tests.

[Uli Fouquet]

Log message for revision 119852:
  Remove unneeded ZCML stuff for simple sample and add some interface related tests.

Changed:
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/app.py
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/configure.zcml
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/ftesting.zcml
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/interfaces.py
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/tests/test_app.py

-=-
Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/app.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/app.py	2011-01-23 11:26:48 UTC (rev 119851)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/app.py	2011-01-23 11:27:51 UTC (rev 119852)
@@ -1,2 +1,5 @@
-class AppSample(object):
-    pass
+from zope.interface import implements
+from mypkg.interfaces import ISampleApp
+
+class SampleApp(object):
+    implements(ISampleApp)

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/configure.zcml
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/configure.zcml	2011-01-23 11:26:48 UTC (rev 119851)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/configure.zcml	2011-01-23 11:27:51 UTC (rev 119852)
@@ -4,19 +4,4 @@
    package="mypkg"
    >
 
-  <!-- Basic configuration. -->
-  <include package="zope.component" file="meta.zcml" />
-  <include package="zope.component" />
-
-  <!-- Those next ZCML includes are required by zope.app.appsetup. -->
-  <include package="zope.security" file="meta.zcml" />
-  <include package="zope.security" />
-
-  <include package="zope.location" />
-  <include package="zope.traversing" />
-  <include package="zope.container" />
-  <include package="zope.site" />
-
-  <include package="zope.app.appsetup" />
-
 </configure>

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/ftesting.zcml
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/ftesting.zcml	2011-01-23 11:26:48 UTC (rev 119851)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/ftesting.zcml	2011-01-23 11:27:51 UTC (rev 119852)
@@ -1,6 +1,5 @@
 <configure
    xmlns="http://namespaces.zope.org/zope"
-   package="mypkg"
    >
 
   <include package="mypkg" file="configure.zcml" />

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/interfaces.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/interfaces.py	2011-01-23 11:26:48 UTC (rev 119851)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/interfaces.py	2011-01-23 11:27:51 UTC (rev 119852)
@@ -4,13 +4,3 @@
     """A sample application.
     """
     pass
-
-class ISampleInterface1(zope.interface.Interface):
-    """Sample interface 1.
-    """
-    pass
-
-class ISampleInterface2(zope.interface.Interface):
-    """Sample interface 2.
-    """
-    pass

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/tests/test_app.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/tests/test_app.py	2011-01-23 11:26:48 UTC (rev 119851)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/simple/mypkg/tests/test_app.py	2011-01-23 11:27:51 UTC (rev 119852)
@@ -1,6 +1,16 @@
-from mypkg.app import AppSample
+from zope.interface.verify import verifyClass, verifyObject
+from mypkg.app import SampleApp
+from mypkg.interfaces import ISampleApp
 
 def test_app_create():
-    # Assure we can create instances of `AppSample`
-    app = AppSample()
+    # Assure we can create instances of `SampleApp`
+    app = SampleApp()
     assert app is not None
+
+def test_app_class_iface():
+    # Assure the class implements the declared interface
+    assert verifyClass(ISampleApp, SampleApp)
+
+def test_app_instance_iface():
+    # Assure instances of the class provide the declared interface
+    assert verifyObject(ISampleApp, SampleApp())