[Zope3-checkins] CVS: Zope3/src/zope/app/browser/form/tests - test_vocabularywidget.py:1.1.2.12

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/app/browser/form/tests
In directory cvs.zope.org:/tmp/cvs-serv18762

Modified Files:
      Tag: schema-vocabulary-branch
	test_vocabularywidget.py 
Log Message:
- test_field_indirection() renamed to test_vocabulary_specialization()
- removed "_simple" and "_multi" from test method names since the
  separation is now made by class


=== Zope3/src/zope/app/browser/form/tests/test_vocabularywidget.py 1.1.2.11 => 1.1.2.12 ===
--- Zope3/src/zope/app/browser/form/tests/test_vocabularywidget.py:1.1.2.11	Tue May  6 14:50:16 2003
+++ Zope3/src/zope/app/browser/form/tests/test_vocabularywidget.py	Tue May  6 14:56:21 2003
@@ -107,7 +107,7 @@
             self.assert_(result.find(check) >= 0,
                          "%r not found in %r" % (check, result))
 
-    def test_field_indirection(self):
+    def test_vocabulary_specialization(self):
         bound = self.makeField(SampleVocabulary())
         w = getView(bound, "display", TestRequest())
         self.assertEqual(w(), "foo")
@@ -146,12 +146,12 @@
                     IBrowserPresentation,
                     SampleDisplayWidget)
 
-    def test_simple_display(self):
+    def test_display(self):
         bound = self.makeField(BasicVocabulary(["splat", "foobar"]))
         w = getView(bound, "display", TestRequest())
         self.assertEqual(w(), "splat")
 
-    def test_simple_display_with_form_value(self):
+    def test_display_with_form_value(self):
         bound = self.makeField(BasicVocabulary(["splat", "foobar"]))
         request = TestRequest(QUERY_STRING='field.f=foobar')
         request.processInputs()
@@ -159,7 +159,7 @@
         self.assert_(w.haveData())
         self.assertEqual(w(), "foobar")
 
-    def test_simple_edit(self):
+    def test_edit(self):
         vocab = BasicVocabulary(["splat", "foobar"])
         bound = self.makeField(vocab)
         w = getView(bound, "edit", TestRequest())
@@ -186,7 +186,7 @@
             '>foobar<',
             ])
 
-    def test_simple_edit_with_form_value(self):
+    def test_edit_with_form_value(self):
         bound = self.makeField(BasicVocabulary(["splat", "foobar"]))
         request = TestRequest(QUERY_STRING='field.f=foobar')
         request.processInputs()
@@ -235,7 +235,7 @@
                     IBrowserPresentation,
                     SampleDisplayWidget)
 
-    def test_multi_display_without_value(self):
+    def test_display_without_value(self):
         bound = self.makeField(BasicVocabulary(["splat", "foobar", "frob"]),
                                None)
         w = getView(bound, "display", TestRequest())
@@ -248,7 +248,7 @@
             '</span>',
             ])
 
-    def test_multi_display_with_value(self):
+    def test_display_with_value(self):
         bound = self.makeField(BasicVocabulary(["splat", "foobar", "frob"]),
                                ["foobar", "frob"])
         w = getView(bound, "display", TestRequest())
@@ -270,7 +270,7 @@
             '</li>',
             ])
 
-    def test_multi_display_with_form_data(self):
+    def test_display_with_form_data(self):
         bound = self.makeField(BasicVocabulary(["splat", "foobar", "frob"]),
                                ["foobar", "frob"])
         request = TestRequest(QUERY_STRING='field.f:list=splat')
@@ -291,7 +291,7 @@
         self.assert_(s.find("foobar") < 0)
         self.assert_(s.find("frob") < 0)
 
-    def test_multi_edit(self):
+    def test_edit(self):
         bound = self.makeField(BasicVocabulary(["splat", "foobar", "frob"]))
         w = getView(bound, "edit", TestRequest())
         self.assert_(not w.haveData())
@@ -323,7 +323,7 @@
             ])
         self.assert_(s3.find('selected') < 0)
 
-    def test_multi_edit_with_form_value(self):
+    def test_edit_with_form_value(self):
         bound = self.makeField(BasicVocabulary(["splat", "foobar"]))
         request = TestRequest(
             QUERY_STRING='field.f:list=foobar&field.f:list=splat')