Add a test for full kind descriptor

Author: weynhamz

PHPCtags.class.php

@@ -3,13 +3,9 @@ class PHPCtags
 {
     private $mFile;
 
-    private $mKinds;
-
     private $mParser;
 
-    public function __construct()
-    {
-        $this->mKinds= array(
+    private static $mKinds = array(
             'c' => 'class',
             'm' => 'method',
             'f' => 'function',
@@ -18,9 +14,17 @@ public function __construct()
             'v' => 'variable',
             'i' => 'interface',
         );
+
+    public function __construct()
+    {
         $this->mParser = new PHPParser_Parser(new PHPParser_Lexer);
     }
 
+    public static function getMKinds()
+    {
+        return self::$mKinds;
+    }
+
     private function getNodeAccess($node)
     {
         if ($node->isPrivate()) return 'private';
@@ -179,7 +183,7 @@ private function render($structs, $options)
             #field=K, kind of tag as fullname
             if (in_array('K', $options['fields'])) {
                 in_array('z', $options['fields']) && $str .= "kind:";
-                $str .= "\t" . $this->mKinds[$struct['kind']];
+                $str .= "\t" . self::$mKinds[$struct['kind']];
             }
 
             #field=n

tests/PHPCtagsTestCase.php

@@ -10,7 +10,7 @@ abstract class PHPCtagsTestCase {
 
     public function __construct()
     {
-        $this->mFormat = "<name>\t<file>\t/^<line content>$/;\"\t<kind>\tline:<line number>\t<scope>\t<access>";
+        $this->mFormat = "<name>\t<file>\t/^<line content>$/;\"\t<short kind>\tline:<line number>\t<scope>\t<access>";
         $this->mOptions = array(
             'excmd' => 'pattern',
             'fields' => array('n','k','s','a'),
@@ -46,6 +46,7 @@ public function getExampleContent()
 
     public function getExpectResult()
     {
+        $kinds = PHPCtags::getMKinds();
         $testcase_expect = '';
         $testcase_example_define = $this->getExampleDefine();
         $testcase_example_content = $this->getExampleContent();
@@ -55,7 +56,8 @@ public function getExpectResult()
             $line = preg_replace('/<name>/', $define['name'], $line);
             $line = preg_replace('/<file>/', $this->getExample(), $line);
             $line = preg_replace('/<line content>/', rtrim($testcase_example_content[$define['line'] - 1], "\n"), $line);
-            $line = preg_replace('/<kind>/', $define['kind'], $line);
+            $line = preg_replace('/<short kind>/', $define['kind'], $line);
+            $line = preg_replace('/<full kind>/', $kinds[$define['kind']], $line);
             $line = preg_replace('/<line number>/', $define['line'], $line);
             if(!empty($define['scope'])) {
                 $line = preg_replace('/<scope>/', $define['scope'], $line);

tests/testcases/0002.testcase.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Test for full kind identifier
+ **/
+class t_0002 extends PHPCtagsTestCase {
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->mFormat = "<name>\t<file>\t/^<line content>$/;\"\t<full kind>\tline:<line number>\t<scope>\t<access>";
+        $this->mExample = '0001';
+        $this->mOptions['fields'] = array('n','K','s','a');
+    }
+
+}