Add test

src/Fiv/Tokenizer/Query/Base.php

@@ -21,7 +21,7 @@ abstract class Base {
     protected $cache = null;
 
 
-    public function __construct($collection = null) {
+    public function __construct(Tokenizer\Collection $collection = null) {
       $this->collection = $collection;
     }
 

src/Fiv/Tokenizer/Query/Extended.php

@@ -211,7 +211,6 @@ protected function parse() {
           # У нас є 2 або більше умов
           # І на останню умову немає токена.
           # Все цикл завершується.
-          // @todo Перевірити вихід із цикла, якщо остання умова possible
           if (!is_object($token)) {
             $lastTokenIndex = false;
             break;
@@ -343,11 +342,7 @@ protected function parse() {
      */
     protected function addQuery(Query $query, $type, $options = []) {
 
-      if (!in_array($type, [static::STRICT, static::POSSIBLE, static::EXPECT, static::SEARCH, static::SECTION])) {
-        throw new \Fiv\Tokenizer\Exception('Invalid condition type: ' . $type);
-      }
-
-      $this->cleanCache();
+     $this->cleanCache();
 
       $this->queries[] = [$query, $type, $options];
 

tests/Tests/Tokenizer/Query/ExtendedTest.php

@@ -139,4 +139,52 @@ public function testExpectResult() {
       $this->assertEquals('echo 1+5*9', $code);
     }
 
+    public function testExpectFail() {
+      $file = $this->initFileWithCode('<?php
+         echo 1+5*9; echo 2+4
+      ');
+      $q = $file->getCollection()->extendedQuery();
+      $q->strict()->valueIs('echo');
+      $q->expect()->typeIs(T_WHITESPACE);
+
+      $this->assertCount(0, $q->getBlock());
+    }
+
+    public function testSectionFail() {
+      $file = $this->initFileWithCode('<?php
+         function(){}
+         function (){}
+      ');
+      $q = $file->getCollection()->extendedQuery();
+      $q->strict()->valueIs('function');
+      $q->section('(', ')');
+
+      $this->assertCount(2, $q->getBlock());
+    }
+
+    public function testMoreQueriesThanTokens() {
+      $file = $this->initFileWithCode('<?php
+         echo
+      ');
+      $q = $file->getCollection()->extendedQuery();
+      $q->strict()->valueLike('!.+!');
+      $q->strict()->typeIs(T_WHITESPACE);
+      $q->strict()->typeIs(T_ECHO);
+      $q->strict()->typeIs(T_WHITESPACE);
+      $q->strict()->valueLike('!.+!');
+
+      $this->assertCount(0, $q->getBlock());
+
+      $file = $this->initFileWithCode('<?php
+         echo 1;
+         echo');
+      $q = $file->getCollection()->extendedQuery();
+      $q->strict()->typeIs(T_ECHO);
+      $q->strict()->typeIs(T_WHITESPACE);
+      $q->strict()->valueLike('!.+!');
+
+      $this->assertCount(1, $q->getBlock());
+
+    }
+
   }

tests/Tests/Tokenizer/TokenTest.php

@@ -40,4 +40,12 @@ public function testGetData() {
       unlink($file->getPath());
     }
 
+    public function testToString() {
+      $file = $this->initFileWithCode('<?php echo 1');
+      $firstToken = $file->getCollection()->getFirst();
+
+      $this->assertEquals('<?php ', (string)$firstToken);
+
+    }
+
   }