Fixed unit tests

Author: dantleech

src/PHPCR/Shell/Console/Application/ShellApplication.php

@@ -142,15 +142,15 @@ public function init()
             $this->transports[$transport->getName()] = $transport;;
         }
 
-        $session = $this->getSession($this->sessionInput);
+        $session = $this->initSession();
 
-        $this->getHelperSet()->set(new EditorHelper($session));
+        $this->getHelperSet()->set(new EditorHelper($this->session));
         $this->getHelperSet()->set(new PhpcrConsoleDumperHelper());
-        $this->getHelperSet()->set(new PhpcrHelper($session));
+        $this->getHelperSet()->set(new PhpcrHelper($this->session));
         $this->getHelperSet()->set(new ResultFormatterHelper());
         $this->getHelperSet()->set(new TextHelper());
-        $this->getHelperSet()->set(new NodeHelper($session));
-        $this->getHelperSet()->set(new RepositoryHelper($session->getRepository()));
+        $this->getHelperSet()->set(new NodeHelper($this->session));
+        $this->getHelperSet()->set(new RepositoryHelper($this->session->getRepository()));
 
         // add new commands
         $this->add(new AccessControlPrivilegeListCommand());

tests/PHPCR/Shell/Application/ShellApplicationTest.php

@@ -12,9 +12,6 @@ public function setUp()
         $this->transport = $this->getMock(
             'PHPCR\Shell\Console\TransportInterface'
         );
-        $this->transport->expects($this->once())
-            ->method('getName')
-            ->will($this->returnValue('test'));
 
         $this->sessionInput = $this->getMock(
             'Symfony\Component\Console\Input\InputInterface'
@@ -39,15 +36,9 @@ public function setUp()
         $this->repository = $this->getMock(
             'PHPCR\RepositoryInterface'
         );
-        $this->repository->expects($this->once())
-            ->method('login')
-            ->will($this->returnValue($this->session));
-
-        $this->transport->expects($this->once())
-            ->method('getRepository')
-            ->will($this->returnValue($this->repository));
 
         $this->application = new ShellApplication('phpcr','v0.test',  $this->sessionInput, array($this->transport));
+        $this->application->setSessionInput($this->sessionInput);
         $this->application->setAutoExit(false);
     }