fixes test

Signed-off-by: Faizan Akram <[email protected]>

Author: faizanakram99

phpunit.xml.dist

@@ -25,20 +25,15 @@
     <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
 
     <log type="coverage-html" 
-        target="build/coverage" 
-        title="CodeGen"
-        charset="UTF-8" 
-        yui="true" 
-        highlight="true"
+        target="build/coverage"
         lowUpperBound="35" 
         highLowerBound="70"/>
 
     <log type="coverage-clover" 
         target="build/logs/clover.xml"/>
 
     <log type="junit" 
-        target="build/logs/junit.xml"
-        logIncompleteSkipped="false"/>
+        target="build/logs/junit.xml"/>
 
   </logging>
 

tests/ClassTemplate/ClassDeclareTest.php

@@ -8,7 +8,7 @@ class ClassFileTest extends CodeGenTestCase
     public function testUse()
     {
         $use = new UseClass('\Foo\Bar');
-        is( 'Foo\Bar', $use->class );
+        $this->assertCodeEquals('use Foo\Bar;', $use);
     }
 
     public function testClassTemplateWithDefaultOptions() 
@@ -36,27 +36,27 @@ public function testClassTemplate()
             'template' => 'Class.php.twig',
             'template_dirs' => array('src/ClassTemplate/Templates'),
         ));
-        ok($classTemplate);
+        $this->assertTrue($classTemplate);
         $classTemplate->addProperty('record','Product');
         $classTemplate->addProperty('fields', array('lang', 'name'));
         $classTemplate->addMethod('public','getTwo',array(),'return 2;');
         $classTemplate->addMethod('public','getFoo',array('$i'),'return $i;');
 
         $this->evalTemplate($classTemplate);
 
-        ok(class_exists($classTemplate->class->getFullName()));
+        $this->assertTrue(class_exists($classTemplate->class->getFullName()));
 
         $bar22 = new Foo\Bar1;
-        ok($bar22);
+        $this->assertTrue($bar22);
 
-        is('Product', $bar22->record);
-        is(array('lang','name'), $bar22->fields);
+        $this->assertEquals('Product', $bar22->record);
+        $this->assertEquals(array('lang','name'), $bar22->fields);
 
-        ok(method_exists($bar22,'getTwo'));
-        ok(method_exists($bar22,'getFoo'));
+        $this->assertTrue(method_exists($bar22,'getTwo'));
+        $this->assertTrue(method_exists($bar22,'getFoo'));
 
-        is(2,$bar22->getTwo());
+        $this->assertEquals(2,$bar22->getTwo());
 
-        is(3,$bar22->getFoo(3));
+        $this->assertEquals(3,$bar22->getFoo(3));
     }
 }

tests/ClassTemplate/ClassDeclareTraitTest.php

@@ -49,9 +49,9 @@ public function testTraitUseAs() {
         $this->evalTemplate($classTemplate);
 
         $foo = new Foo\TraitUseAsTest;
-        ok($foo);
-        is('hello from A',$foo->talk());
-        is('hello from B',$foo->hello());
+        $this->assertTrue($foo);
+        $this->assertEquals('hello from A',$foo->talk());
+        $this->assertEquals('hello from B',$foo->hello());
     }
 }
 

tests/ClassTemplate/ClassInjectionTest.php

@@ -19,10 +19,10 @@ public function __toString() {
 );
         require 'tests/tmp_class';
         $foo = new InjectFoo;
-        ok($foo);
+        $this->assertTrue($foo);
 
         $inject = new ClassTemplate\ClassInjection($foo);
-        ok($inject);
+        $this->assertTrue($inject);
 
         $inject->read();
 
@@ -37,20 +37,20 @@ function getValue() {
         $inject->write();
 
         // file_put_contents('tests/data/injected', $inject);
-        is( file_get_contents('tests/data/injected'), $inject->__toString() );
+        $this->assertEquals( file_get_contents('tests/data/injected'), $inject->__toString() );
 
         $inject->read();
-        is( file_get_contents('tests/data/injected'), $inject->__toString() );
+        $this->assertEquals( file_get_contents('tests/data/injected'), $inject->__toString() );
 
         $inject->write();
-        is( file_get_contents('tests/data/injected'), $inject->__toString() );
+        $this->assertEquals( file_get_contents('tests/data/injected'), $inject->__toString() );
 
 
         $inject->replaceContent('');
         $inject->write();
 
         // file_put_contents('tests/data/replaced',$inject);
-        is( file_get_contents('tests/data/replaced'), $inject->__toString() );
+        $this->assertEquals( file_get_contents('tests/data/replaced'), $inject->__toString() );
 
 
         // TODO test the content

tests/data/class_simple.fixture

@@ -1,16 +1,22 @@
 <?php
+
 namespace Foo;
+
 class Bar2
 {
+
     public $record = 'Product';
+
     public $fields = array (
       0 => 'lang',
       1 => 'name',
     );
+
     public function getTwo()
     {
         return 2;
     }
+
     public function getFoo($i)
     {
         return $i;