From a341b51f6c355f0550233855d2d7eb4a4ebfcfc9 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Wed, 18 Aug 2010 11:53:07 +0200
Subject: [PATCH] Simplify vfsStream usage.

---
 Tests/PHP/CodeCoverage/UtilTest.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Tests/PHP/CodeCoverage/UtilTest.php b/Tests/PHP/CodeCoverage/UtilTest.php
index 7c38842a1..29cbd8ee4 100644
--- a/Tests/PHP/CodeCoverage/UtilTest.php
+++ b/Tests/PHP/CodeCoverage/UtilTest.php
@@ -100,12 +100,11 @@ class PHP_CodeCoverage_UtilTest extends PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        if (!class_exists('vfsStreamWrapper')) {
-            $this->markTestSkipped('vfsStreamWrapper is not available.');
+        if (!class_exists('vfsStream')) {
+            $this->markTestSkipped('vfsStream is not available.');
         }
 
-        vfsStreamWrapper::register();
-        vfsStreamWrapper::setRoot(new vfsStreamDirectory('UtilTest'));
+        vfsStream::setup('UtilTest');
     }
 
     /**
@@ -380,7 +379,7 @@ public function testReducePaths3()
      */
     public function testGetDirectory()
     {
-        if (!class_exists('vfsStreamWrapper')) {
+        if (!class_exists('vfsStream')) {
             $this->markTestSkipped('vfsStream is not installed');
         }
 
@@ -395,7 +394,7 @@ public function testGetDirectory()
      */
     public function testGetDirectory2()
     {
-        if (!class_exists('vfsStreamWrapper')) {
+        if (!class_exists('vfsStream')) {
             $this->markTestSkipped('vfsStream is not installed');
         }
 
@@ -412,7 +411,7 @@ public function testGetDirectory2()
      */
     public function testGetDirectory3()
     {
-        if (!class_exists('vfsStreamWrapper')) {
+        if (!class_exists('vfsStream')) {
             $this->markTestSkipped('vfsStream is not installed');
         }