[Zope3-checkins] CVS: Zope3/src/zope/app/applicationcontrol/tests - test_zopeversion.py:1.8

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/app/applicationcontrol/tests
In directory cvs.zope.org:/tmp/cvs-serv23772/src/zope/app/applicationcontrol/tests

Modified Files:
	test_zopeversion.py 
Log Message:
add support to the ZopeVersion utility for non-branch tag and date checkouts


=== Zope3/src/zope/app/applicationcontrol/tests/test_zopeversion.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/applicationcontrol/tests/test_zopeversion.py:1.7	Mon May  3 10:18:25 2004
+++ Zope3/src/zope/app/applicationcontrol/tests/test_zopeversion.py	Mon May  3 11:13:03 2004
@@ -53,12 +53,31 @@
     def test_IVerify(self):
         verifyObject(IZopeVersion, self._Test__new())
 
+    # CVS/Tag lines can start with different characters, each of which
+    # has some meaning:
+    #   D - checked out with a date; format is YYYY.MM.DD.HH.MM.SS
+    #       where HH.MM.SS indicates timezone (04.00.00 is GMT - 4 hours)
+    #   N - checked out with a non-branch tag; format is Ntagname
+    #   T - checked out with a branch tag; format is Ttagname
+
     def test_ZopeVersion(self):
         self.prepare(None, None)
         zope_version = self._Test__new()
         self.assertEqual(zope_version.getZopeVersion(), "Development/Unknown")
 
+    def test_ZopeVersion_cvsdate(self):
+        self.prepare(None, "D2004.04.30.04.00.00")
+        zope_version = self._Test__new()
+        self.assertEqual(zope_version.getZopeVersion(),
+                         "Development/Unknown (2004.04.30.04.00.00)")
+
     def test_ZopeVersion_cvstag(self):
+        self.prepare(None, "Nsome-tag")
+        zope_version = self._Test__new()
+        self.assertEqual(zope_version.getZopeVersion(),
+                         "Development/Unknown (some-tag)")
+
+    def test_ZopeVersion_cvsbranchtag(self):
         self.prepare(None, "Tsome-tag")
         zope_version = self._Test__new()
         self.assertEqual(zope_version.getZopeVersion(),
@@ -70,7 +89,23 @@
         self.assertEqual(zope_version.getZopeVersion(),
                          "Zope X3 1.0.1a1")
 
+    def test_ZopeVersion_release_cvsdate(self):
+        # demonstrate that the version.txt data is discarded if
+        # there's revision-control metadata:
+        self.prepare("Zope X3 1.0.1a1", "D2004.04.30.04.00.00")
+        zope_version = self._Test__new()
+        self.assertEqual(zope_version.getZopeVersion(),
+                         "Development/Unknown (2004.04.30.04.00.00)")
+
     def test_ZopeVersion_release_cvstag(self):
+        # demonstrate that the version.txt data is discarded if
+        # there's revision-control metadata:
+        self.prepare("Zope X3 1.0.1a1", "Nsome-tag")
+        zope_version = self._Test__new()
+        self.assertEqual(zope_version.getZopeVersion(),
+                         "Development/Unknown (some-tag)")
+
+    def test_ZopeVersion_release_cvsbranchtag(self):
         # demonstrate that the version.txt data is discarded if
         # there's revision-control metadata:
         self.prepare("Zope X3 1.0.1a1", "Tsome-tag")