Fixed and re-enabled test cases

tests/ClassValidatorTest.php

@@ -14,27 +14,13 @@ protected function setUp() {
         $this->validator = new ClassValidator;
     }
 
-    public function testValidateAsController() {
-        $this->validator->validateAsController($this->loadFromFile('controller1.php'));
-    }
-
-    public function testValidateControllerAsProvider() {
-        $this->expectException(Exceptions\PhpMAEException::class);
-        $this->validator->validateAsProvider($this->loadFromFile('controller1.php'));
-    }
-
-    public function testValidateAsProvider() {
-        $this->validator->validateAsProvider($this->loadFromFile('provider1.php'));
-    }
-
-    public function testValidateProviderAsController() {
-        $this->expectException(Exceptions\PhpMAEException::class); 
-        $this->validator->validateAsController($this->loadFromFile('provider1.php'));
+    public function testValidate() {
+        $this->validator->validate($this->loadFromFile('class1.php'));
     }
 
     public function testNonWhitelistedClass() {
         $this->expectException(\PHPSandbox\Error::class); 
-        $this->validator->validateAsController($this->loadFromFile('controller2.php'));
+        $this->validator->validate($this->loadFromFile('class2.php'));
     }
 
 }

tests/fixtures/class1.php

@@ -0,0 +1,9 @@
+<?php
+
+class TestClass1 {
+
+  public function __invoke() {
+    return "Hello World!";
+  }
+
+}

tests/fixtures/class2.php

@@ -0,0 +1,10 @@
+<?php
+
+class TestClass2 {
+
+  public function __invoke() {
+    $x = new ClassValidator;
+    return "Hello World!";
+  }
+
+}