Adjust test code after xp-framework/rfc#297 was implemented

ChangeLog.md

@@ -3,6 +3,9 @@ XP Compiler ChangeLog
 
 ## ?.?.? / ????-??-??
 
+* Adjusted test code after xp-framework/rfc#297 was implemented
+  (@thekid)
+
 ## 6.0.0 / 2016-01-23
 
 * **Adopted semantic versioning. See xp-framework/rfc#300** - @thekid

src/main/php/xp/compiler/Syntax.class.php

@@ -76,7 +76,7 @@ public function parse(InputStream $in, $source= null, $messages= null) {
       $this->parser= $this->newParser();
     }
 
-    $result= $this->parser->parse($this->newLexer($in, $source ? $source : $in->toString()));
+    $result= $this->parser->parse($this->newLexer($in, $source ? $source : \xp::stringOf($in)));
     if ($messages) foreach ($this->parser->getWarnings() as $warning) {
       $messages->warn(
         sprintf('P%03d', $warning->code),

src/test/php/net/xp_lang/tests/execution/source/CastingTest.class.php

@@ -79,8 +79,8 @@ public function nullAsVarArray() {
   }
 
   #[@test]
-  public function dateAsObject() {
-    $this->run('return new util.Date() as lang.Object;');
+  public function dateAsValue() {
+    $this->run('return new util.Date() as lang.Value;');
   }
 
   #[@test, @expect(ClassCastException::class)]

src/test/php/net/xp_lang/tests/types/ScopeTest.class.php

@@ -178,14 +178,14 @@ public function mapExtension() {
   #[@test]
   public function objectExtensionInherited() {
     with (
-      $objectType= new TypeReflection(XPClass::forName('lang.Object')), 
-      $dateType= new TypeReflection(XPClass::forName('util.Date')),
-      $classNameMethod= new Method('getClassName')
+      $parentType= new TypeReflection(XPClass::forName('unittest.TestCase')),
+      $thisType= new TypeReflection(typeof($this)),
+      $getNameMethod= new Method('getName')
     ); {
-      $this->fixture->addExtension($objectType, $classNameMethod);
+      $this->fixture->addExtension($parentType, $getNameMethod);
       $this->assertEquals(
-        $classNameMethod,
-        $this->fixture->getExtension($dateType, $classNameMethod->name)
+        $getNameMethod,
+        $this->fixture->getExtension($thisType, $getNameMethod->name)
       );
     }
   }