From b3368071ac07dc321f60cd0cc0c2a34c584a6927 Mon Sep 17 00:00:00 2001
From: Thomas Keller <me@thomaskeller.biz>
Date: Thu, 14 Apr 2011 00:48:36 +0200
Subject: [PATCH] Continue with the mtn interface tests

- test getRepositorySize() with a test file
- implement tests for inTags(), inBranches(), getFile(),
  getCommit() and getExtraProperties()
- mark the static methods as untestable
---
 src/IDF/Scm/Monotone.php                |   3 +-
 test/IDF/Scm/MonotoneTest.php           | 179 +++++++++++++++++++++---
 test/data/IDF_Scm_MonotoneTest/test.mtn | Bin 0 -> 335872 bytes
 3 files changed, 160 insertions(+), 22 deletions(-)
 create mode 100644 test/data/IDF_Scm_MonotoneTest/test.mtn

diff --git a/src/IDF/Scm/Monotone.php b/src/IDF/Scm/Monotone.php
index 4c20a16..3be8ee5 100644
--- a/src/IDF/Scm/Monotone.php
+++ b/src/IDF/Scm/Monotone.php
@@ -668,7 +668,7 @@ class IDF_Scm_Monotone extends IDF_Scm
     {
         $revs = $this->_resolveSelector($commit);
         if (count($revs) == 0)
-            return array();
+            return false;
 
         $res = array();
 
@@ -676,6 +676,7 @@ class IDF_Scm_Monotone extends IDF_Scm
         $res['parents'] = preg_split("/\n/", $parents, -1, PREG_SPLIT_NO_EMPTY);
 
         $certs = $this->_getCerts($revs[0]);
+
         // FIXME: this assumes that author, date and changelog are always given
         $res['author'] = implode(', ', $certs['author']);
 
diff --git a/test/IDF/Scm/MonotoneTest.php b/test/IDF/Scm/MonotoneTest.php
index 9e35b97..8c0c0c0 100644
--- a/test/IDF/Scm/MonotoneTest.php
+++ b/test/IDF/Scm/MonotoneTest.php
@@ -53,7 +53,7 @@ class MonotoneStdioMock implements IDF_Scm_Monotone_IStdio
     public function getLastOutOfBandOutput() {}
 }
 
-class IDF_Scm_Monotone_Test extends PHPUnit_Framework_TestCase
+class IDF_Scm_MonotoneTest extends PHPUnit_Framework_TestCase
 {
     private $proj = null;
 
@@ -61,7 +61,7 @@ class IDF_Scm_Monotone_Test extends PHPUnit_Framework_TestCase
     {
         $this->proj = new IDF_Project();
         $this->proj->id = 1;
-        $this->proj->name = $this->proj->shortname = 'Test';
+        $this->proj->name = $this->proj->shortname = 'test';
         $this->proj->create();
 
         $this->proj->getConf()->setVal('mtn_master_branch', 'master.branch');
@@ -89,7 +89,10 @@ class IDF_Scm_Monotone_Test extends PHPUnit_Framework_TestCase
 
     public function testGetRepositorySize()
     {
-        $this->markTestSkipped('Cannot mock real repository file');
+        $repodir = DATADIR.'/'.__CLASS__.'/%s.mtn';
+        $GLOBALS['_PX_config']['mtn_repositories'] = $repodir;
+        $instance = $this->createMock();
+        $this->assertEquals(335872, $instance->getRepositorySize());
     }
 
     public function testIsAvailable()
@@ -139,8 +142,28 @@ class IDF_Scm_Monotone_Test extends PHPUnit_Framework_TestCase
 
     public function testInBranches()
     {
-        // returns the branches the given commit is in
-        $this->markTestIncomplete();
+        $instance = $this->createMock();
+
+        $stdio = "4567890123456789012345678901234567890123\n";
+        $instance->getStdio()->setExpectedOutput(array('select', '456'), array(), $stdio);
+
+        $stdio =<<<END
+      key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
+signature "ok"
+     name "branch"
+    value "main.branch"
+    trust "trusted"
+
+      key [aea5d3716d31281171aaecf3a7c227e5545b0504]
+signature "ok"
+     name "branch"
+    value "feature.branch"
+    trust "trusted"
+END;
+        $instance->getStdio()->setExpectedOutput(array('certs', '4567890123456789012345678901234567890123'), array(), $stdio);
+
+        $out = $instance->inBranches('456', null);
+        $this->assertEquals(array('h:main.branch', 'h:feature.branch'), $out);
     }
 
     public function testGetTags()
@@ -171,8 +194,34 @@ END;
 
     public function testInTags()
     {
-        // returns the tags that are attached to the given commit
-        $this->markTestIncomplete();
+        $instance = $this->createMock();
+
+        $stdio = "3456789012345678901234567890123456789012\n";
+        $instance->getStdio()->setExpectedOutput(array('select', '345'), array(), $stdio);
+
+        $stdio =<<<END
+      key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
+signature "ok"
+     name "tag"
+    value "release-1.0rc"
+    trust "trusted"
+
+      key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
+signature "ok"
+     name "tag"
+    value "release-1.0"
+    trust "trusted"
+
+      key [aea5d3716d31281171aaecf3a7c227e5545b0504]
+signature "ok"
+     name "tag"
+    value "release-1.0"
+    trust "trusted"
+END;
+        $instance->getStdio()->setExpectedOutput(array('certs', '3456789012345678901234567890123456789012'), array(), $stdio);
+
+        $out = $instance->inTags('345', null);
+        $this->assertEquals(array('t:release-1.0rc', 't:release-1.0'), $out);
     }
 
     public function testGetTree()
@@ -183,24 +232,22 @@ END;
 
     public function testFindAuthor()
     {
-        $this->markTestSkipped('This functionality here should reside in IDF_Scm');
+        $this->markTestSkipped('code under test should reside in IDF_Scm');
     }
 
     public function testGetAnonymousAccessUrl()
     {
-        // test the generation of the anonymous remote URL
-        $this->markTestIncomplete();
+        $this->markTestSkipped('cannot test this static method');
     }
 
     public function testGetAuthAccessUrl()
     {
-        // test the generation of the authenticated remote URL (only really visible for SSH)
-        $this->markTestIncomplete();
+        $this->markTestSkipped('cannot test this static method');
     }
 
     public function testFactory()
     {
-        $this->markTestSkipped('Cannot mock real repository');
+        $this->markTestSkipped('cannot test this static method');
     }
 
     public function testValidateRevision()
@@ -301,7 +348,7 @@ END;
         $this->assertFalse($instance->getPathInfo('foo', 't:123'));
 
         //
-        // existing file file
+        // existing file
         //
         $stdio =<<<END
       key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
@@ -334,6 +381,7 @@ END;
         $file = $instance->getPathInfo('doc/AUTHORS', 't:123');
         $this->assertEquals('doc/AUTHORS', $file->fullpath);
         $this->assertEquals('doc/AUTHORS', $file->efullpath);
+        $this->assertEquals('de9ed2fffe2e8c0094bf51bb66d1c1ff2deeaa03', $file->hash);
         $this->assertEquals('AUTHORS', $file->file);
         $this->assertEquals('blob', $file->type);
         $this->assertEquals(17024, $file->size);
@@ -386,8 +434,25 @@ END;
 
     public function testGetFile()
     {
-        // test cmd_only and full file fetching
-        $this->markTestIncomplete();
+        $instance = $this->createMock();
+        $thrown = false;
+        try
+        {
+            $instance->getFile(null, true);
+        }
+        catch (Pluf_Exception_NotImplemented $e)
+        {
+            $thrown = true;
+        }
+        $this->assertTrue($thrown);
+
+        $stdio = 'Foobar';
+        $instance->getStdio()->setExpectedOutput(array('get_file', '1234567890123456789012345678901234567890'), array(), $stdio);
+
+        $obj = new stdClass();
+        $obj->hash = '1234567890123456789012345678901234567890';
+
+        $this->assertEquals('Foobar', $instance->getFile($obj));
     }
 
     public function testGetChanges()
@@ -398,15 +463,87 @@ END;
 
     public function testGetCommit()
     {
-        // test get commit information with and without a diff text
-        // test multiple branches, dates, authors, aso
-        $this->markTestIncomplete();
+        $instance = $this->createMock();
+
+        $this->assertFalse($instance->getCommit('t:234'));
+
+        $stdio = "2345678901234567890123456789012345678901\n";
+        $instance->getStdio()->setExpectedOutput(array('select', 't:234'), array(), $stdio);
+
+        $stdio = "1234567890123456789012345678901234567891\n".
+                 "1234567890123456789012345678901234567892\n";
+        $instance->getStdio()->setExpectedOutput(array('parents', '2345678901234567890123456789012345678901'), array(), $stdio);
+
+        $stdio =<<<END
+      key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
+signature "ok"
+     name "author"
+    value "me@thomaskeller.biz"
+    trust "trusted"
+
+      key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
+signature "ok"
+     name "author"
+    value "graydon@pobox.com"
+    trust "trusted"
+
+      key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
+signature "ok"
+     name "branch"
+    value "main.branch"
+    trust "trusted"
+
+      key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
+signature "ok"
+     name "branch"
+    value "feature.branch"
+    trust "trusted"
+
+      key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
+signature "ok"
+     name "changelog"
+    value "something changed"
+    trust "trusted"
+
+      key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
+signature "ok"
+     name "changelog"
+    value "something changed here as
+well, unbelievable!"
+    trust "trusted"
+
+      key [1aaecf3a7c227e5545b0504aea5d3716d3128117]
+signature "ok"
+     name "date"
+    value "2011-03-19T13:59:47"
+    trust "trusted"
+END;
+        $instance->getStdio()->setExpectedOutput(array('certs', '2345678901234567890123456789012345678901'), array(), $stdio);
+
+        $commit = $instance->getCommit('t:234');
+
+        $this->assertEquals('2345678901234567890123456789012345678901', $commit->commit);
+        $this->assertEquals(array('1234567890123456789012345678901234567891',
+                                  '1234567890123456789012345678901234567892'),
+                            $commit->parents);
+        $this->assertEquals('me@thomaskeller.biz, graydon@pobox.com', $commit->author);
+        $this->assertEquals('2011-03-19 13:59:47', $commit->date);
+        $this->assertEquals('something changed', $commit->title);
+        $this->assertEquals("---\nsomething changed here as\nwell, unbelievable!", $commit->full_message);
+        $this->assertEquals('main.branch, feature.branch', $commit->branch);
+        $this->assertEquals('', $commit->diff);
     }
 
     public function testGetExtraProperties()
     {
-        // test array('parents' => array(rev1, rev2, ...)) or array() if root revision
-        $this->markTestIncomplete();
+        $instance = $this->createMock();
+
+        $this->assertEquals(array(), $instance->getExtraProperties(new stdClass()));
+
+        $cobj = (object) array('parents' => array('1234567890123456789012345678901234567891'));
+
+        $this->assertEquals(array('parents' => array('1234567890123456789012345678901234567891')),
+                            $instance->getExtraProperties($cobj));
     }
 
     public function testIsCommitLarge()
diff --git a/test/data/IDF_Scm_MonotoneTest/test.mtn b/test/data/IDF_Scm_MonotoneTest/test.mtn
new file mode 100644
index 0000000000000000000000000000000000000000..0e3c3337126c652ccb04ebf41f4bd6e14fb55913
GIT binary patch
literal 335872
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
RK!5-N0t5&UAV7e?e*m#*(?tLP

literal 0
HcmV?d00001