Merge pull request nette#219 from dg/src

/Tester changed to /src
richard-ejem · Mar 27, 2015 · c6e3ed6 · c6e3ed6
2 parents a313981 + 2fee5b0
commit c6e3ed6
Show file tree

Hide file tree

Showing 53 changed files with 99 additions and 92 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,8 +30,8 @@ matrix:
           env: TESTER_PHP_BIN=php-cgi
 
 script:
-    - Tester/tester -p $TESTER_PHP_BIN tests -s
-    - Tester/tester -p $TESTER_PHP_BIN -o none tests/fail.phptx; if [ $? -eq 0 ]; then echo "tests/fail.phptx SHOULD FAIL"; exit 1; else echo "fail checked"; fi;
+    - src/tester -p $TESTER_PHP_BIN tests -s
+    - src/tester -p $TESTER_PHP_BIN -o none tests/fail.phptx; if [ $? -eq 0 ]; then echo "tests/fail.phptx SHOULD FAIL"; exit 1; else echo "fail checked"; fi;
     - php code-checker/src/code-checker.php
 
 after_failure:

diff --git a/Tester/bootstrap.php b/Tester/bootstrap.php
@@ -1,18 +1,2 @@
 <?php
-
-/**
- * Test environment initialization.
- */
-
-require __DIR__ . '/Framework/Helpers.php';
-require __DIR__ . '/Framework/Environment.php';
-require __DIR__ . '/Framework/DataProvider.php';
-require __DIR__ . '/Framework/Assert.php';
-require __DIR__ . '/Framework/Dumper.php';
-require __DIR__ . '/Framework/FileMock.php';
-require __DIR__ . '/Framework/TestCase.php';
-require __DIR__ . '/Framework/DomQuery.php';
-require __DIR__ . '/CodeCoverage/Collector.php';
-require __DIR__ . '/Runner/Job.php';
-
-Tester\Environment::setup();
+require __DIR__ . '/../src/bootstrap.php';
diff --git a/Tester/tester b/Tester/tester
@@ -1,4 +1,3 @@
 #!/usr/bin/env php
 <?php
-
-require __DIR__ . '/tester.php';
+require __DIR__ . '/../src/tester.php';
diff --git a/Tester/tester.php b/Tester/tester.php
@@ -1,34 +1,2 @@
 <?php
-
-/**
- * Nette Tester.
- * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
- */
-
-require __DIR__ . '/Runner/PhpInterpreter.php';
-require __DIR__ . '/Runner/ZendPhpInterpreter.php';
-require __DIR__ . '/Runner/HhvmPhpInterpreter.php';
-require __DIR__ . '/Runner/Runner.php';
-require __DIR__ . '/Runner/CliTester.php';
-require __DIR__ . '/Runner/Job.php';
-require __DIR__ . '/Runner/CommandLine.php';
-require __DIR__ . '/Runner/TestHandler.php';
-require __DIR__ . '/Runner/OutputHandler.php';
-require __DIR__ . '/Runner/Output/Logger.php';
-require __DIR__ . '/Runner/Output/TapPrinter.php';
-require __DIR__ . '/Runner/Output/ConsolePrinter.php';
-require __DIR__ . '/Runner/Output/JUnitPrinter.php';
-require __DIR__ . '/Framework/Helpers.php';
-require __DIR__ . '/Framework/Environment.php';
-require __DIR__ . '/Framework/Assert.php';
-require __DIR__ . '/Framework/Dumper.php';
-require __DIR__ . '/Framework/DataProvider.php';
-require __DIR__ . '/Framework/TestCase.php';
-require __DIR__ . '/CodeCoverage/PhpParser.php';
-require __DIR__ . '/CodeCoverage/Generators/AbstractGenerator.php';
-require __DIR__ . '/CodeCoverage/Generators/HtmlGenerator.php';
-require __DIR__ . '/CodeCoverage/Generators/CloverXMLGenerator.php';
-
-
-$tester = new Tester\Runner\CliTester;
-die($tester->run());
+require __DIR__ . '/../src/tester.php';
diff --git a/composer.json b/composer.json
@@ -18,9 +18,9 @@
 		"php": ">=5.3.0"
 	},
 	"autoload": {
-		"classmap": ["Tester/"]
+		"classmap": ["src/"]
 	},
-	"bin": ["Tester/tester"],
+	"bin": ["src/tester"],
 	"extra": {
 		"branch-alias": { "dev-master": "1.3-dev" }
 	}

diff --git a/readme.md b/readme.md
@@ -43,7 +43,7 @@ class Greeting
 So we create test file named `greeting.test.phpt`:
 
 ```php
-require 'Tester/bootstrap.php';
+require 'src/bootstrap.php';
 
 use Tester\Assert;
 

diff --git a/Tester/CodeCoverage/Collector.php → src/CodeCoverage/Collector.php b/Tester/CodeCoverage/Collector.php → src/CodeCoverage/Collector.php
diff --git a/...Coverage/Generators/AbstractGenerator.php → ...Coverage/Generators/AbstractGenerator.php b/...Coverage/Generators/AbstractGenerator.php → ...Coverage/Generators/AbstractGenerator.php
diff --git a/...overage/Generators/CloverXMLGenerator.php → ...overage/Generators/CloverXMLGenerator.php b/...overage/Generators/CloverXMLGenerator.php → ...overage/Generators/CloverXMLGenerator.php
diff --git a/...CodeCoverage/Generators/HtmlGenerator.php → ...CodeCoverage/Generators/HtmlGenerator.php b/...CodeCoverage/Generators/HtmlGenerator.php → ...CodeCoverage/Generators/HtmlGenerator.php
diff --git a/...er/CodeCoverage/Generators/template.phtml → src/CodeCoverage/Generators/template.phtml b/...er/CodeCoverage/Generators/template.phtml → src/CodeCoverage/Generators/template.phtml
diff --git a/Tester/CodeCoverage/PhpParser.php → src/CodeCoverage/PhpParser.php b/Tester/CodeCoverage/PhpParser.php → src/CodeCoverage/PhpParser.php
diff --git a/Tester/Framework/Assert.php → src/Framework/Assert.php b/Tester/Framework/Assert.php → src/Framework/Assert.php
diff --git a/Tester/Framework/DataProvider.php → src/Framework/DataProvider.php b/Tester/Framework/DataProvider.php → src/Framework/DataProvider.php
diff --git a/Tester/Framework/DomQuery.php → src/Framework/DomQuery.php b/Tester/Framework/DomQuery.php → src/Framework/DomQuery.php
diff --git a/Tester/Framework/Dumper.php → src/Framework/Dumper.php b/Tester/Framework/Dumper.php → src/Framework/Dumper.php
diff --git a/Tester/Framework/Environment.php → src/Framework/Environment.php b/Tester/Framework/Environment.php → src/Framework/Environment.php
diff --git a/Tester/Framework/FileMock.php → src/Framework/FileMock.php b/Tester/Framework/FileMock.php → src/Framework/FileMock.php
diff --git a/Tester/Framework/Helpers.php → src/Framework/Helpers.php b/Tester/Framework/Helpers.php → src/Framework/Helpers.php
diff --git a/Tester/Framework/TestCase.php → src/Framework/TestCase.php b/Tester/Framework/TestCase.php → src/Framework/TestCase.php
diff --git a/Tester/Runner/CliTester.php → src/Runner/CliTester.php b/Tester/Runner/CliTester.php → src/Runner/CliTester.php
diff --git a/Tester/Runner/CommandLine.php → src/Runner/CommandLine.php b/Tester/Runner/CommandLine.php → src/Runner/CommandLine.php
diff --git a/Tester/Runner/HhvmPhpInterpreter.php → src/Runner/HhvmPhpInterpreter.php b/Tester/Runner/HhvmPhpInterpreter.php → src/Runner/HhvmPhpInterpreter.php
diff --git a/Tester/Runner/Job.php → src/Runner/Job.php b/Tester/Runner/Job.php → src/Runner/Job.php
diff --git a/Tester/Runner/Output/ConsolePrinter.php → src/Runner/Output/ConsolePrinter.php b/Tester/Runner/Output/ConsolePrinter.php → src/Runner/Output/ConsolePrinter.php
diff --git a/Tester/Runner/Output/JUnitPrinter.php → src/Runner/Output/JUnitPrinter.php b/Tester/Runner/Output/JUnitPrinter.php → src/Runner/Output/JUnitPrinter.php
diff --git a/Tester/Runner/Output/Logger.php → src/Runner/Output/Logger.php b/Tester/Runner/Output/Logger.php → src/Runner/Output/Logger.php
diff --git a/Tester/Runner/Output/TapPrinter.php → src/Runner/Output/TapPrinter.php b/Tester/Runner/Output/TapPrinter.php → src/Runner/Output/TapPrinter.php
diff --git a/Tester/Runner/OutputHandler.php → src/Runner/OutputHandler.php b/Tester/Runner/OutputHandler.php → src/Runner/OutputHandler.php
diff --git a/Tester/Runner/PhpInterpreter.php → src/Runner/PhpInterpreter.php b/Tester/Runner/PhpInterpreter.php → src/Runner/PhpInterpreter.php
diff --git a/Tester/Runner/Runner.php → src/Runner/Runner.php b/Tester/Runner/Runner.php → src/Runner/Runner.php
diff --git a/Tester/Runner/TestHandler.php → src/Runner/TestHandler.php b/Tester/Runner/TestHandler.php → src/Runner/TestHandler.php
diff --git a/Tester/Runner/ZendPhpInterpreter.php → src/Runner/ZendPhpInterpreter.php b/Tester/Runner/ZendPhpInterpreter.php → src/Runner/ZendPhpInterpreter.php
diff --git a/Tester/Runner/info.php → src/Runner/info.php b/Tester/Runner/info.php → src/Runner/info.php
diff --git a/src/bootstrap.php b/src/bootstrap.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Test environment initialization.
+ */
+
+require __DIR__ . '/Framework/Helpers.php';
+require __DIR__ . '/Framework/Environment.php';
+require __DIR__ . '/Framework/DataProvider.php';
+require __DIR__ . '/Framework/Assert.php';
+require __DIR__ . '/Framework/Dumper.php';
+require __DIR__ . '/Framework/FileMock.php';
+require __DIR__ . '/Framework/TestCase.php';
+require __DIR__ . '/Framework/DomQuery.php';
+require __DIR__ . '/CodeCoverage/Collector.php';
+require __DIR__ . '/Runner/Job.php';
+
+Tester\Environment::setup();
diff --git a/src/tester b/src/tester
@@ -0,0 +1,4 @@
+#!/usr/bin/env php
+<?php
+
+require __DIR__ . '/tester.php';
diff --git a/src/tester.php b/src/tester.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Nette Tester.
+ * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
+ */
+
+require __DIR__ . '/Runner/PhpInterpreter.php';
+require __DIR__ . '/Runner/ZendPhpInterpreter.php';
+require __DIR__ . '/Runner/HhvmPhpInterpreter.php';
+require __DIR__ . '/Runner/Runner.php';
+require __DIR__ . '/Runner/CliTester.php';
+require __DIR__ . '/Runner/Job.php';
+require __DIR__ . '/Runner/CommandLine.php';
+require __DIR__ . '/Runner/TestHandler.php';
+require __DIR__ . '/Runner/OutputHandler.php';
+require __DIR__ . '/Runner/Output/Logger.php';
+require __DIR__ . '/Runner/Output/TapPrinter.php';
+require __DIR__ . '/Runner/Output/ConsolePrinter.php';
+require __DIR__ . '/Runner/Output/JUnitPrinter.php';
+require __DIR__ . '/Framework/Helpers.php';
+require __DIR__ . '/Framework/Environment.php';
+require __DIR__ . '/Framework/Assert.php';
+require __DIR__ . '/Framework/Dumper.php';
+require __DIR__ . '/Framework/DataProvider.php';
+require __DIR__ . '/Framework/TestCase.php';
+require __DIR__ . '/CodeCoverage/PhpParser.php';
+require __DIR__ . '/CodeCoverage/Generators/AbstractGenerator.php';
+require __DIR__ . '/CodeCoverage/Generators/HtmlGenerator.php';
+require __DIR__ . '/CodeCoverage/Generators/CloverXMLGenerator.php';
+
+
+$tester = new Tester\Runner\CliTester;
+die($tester->run());
diff --git a/tests/CodeCoverage/CloverXMLGenerator.phpt b/tests/CodeCoverage/CloverXMLGenerator.phpt
@@ -4,9 +4,9 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
-require __DIR__ . '/../../Tester/CodeCoverage/Generators/AbstractGenerator.php';
-require __DIR__ . '/../../Tester/CodeCoverage/Generators/CloverXMLGenerator.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/Generators/AbstractGenerator.php';
+require __DIR__ . '/../../src/CodeCoverage/Generators/CloverXMLGenerator.php';
 
 
 $coveredFile = __DIR__ . DIRECTORY_SEPARATOR . 'CloverXMLGenerator.covered.php';

diff --git a/tests/CodeCoverage/PhpParser.parse.edge.phpt b/tests/CodeCoverage/PhpParser.parse.edge.phpt
@@ -4,7 +4,7 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
 
 
 $parser = new CodeCoverage\PhpParser;

diff --git a/tests/CodeCoverage/PhpParser.parse.lines-of-code.phpt b/tests/CodeCoverage/PhpParser.parse.lines-of-code.phpt
@@ -4,7 +4,7 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
 
 
 $parser = new CodeCoverage\PhpParser;

diff --git a/tests/CodeCoverage/PhpParser.parse.lines.phpt b/tests/CodeCoverage/PhpParser.parse.lines.phpt
@@ -4,7 +4,7 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
 
 
 $parser = new CodeCoverage\PhpParser;

diff --git a/tests/CodeCoverage/PhpParser.parse.methods.phpt b/tests/CodeCoverage/PhpParser.parse.methods.phpt
@@ -4,7 +4,7 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
 
 
 $parser = new CodeCoverage\PhpParser;

diff --git a/tests/CodeCoverage/PhpParser.parse.namespaces.phpt b/tests/CodeCoverage/PhpParser.parse.namespaces.phpt
@@ -4,7 +4,7 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
 
 
 $parser = new CodeCoverage\PhpParser;

diff --git a/tests/Runner/CommandLine.phpt b/tests/Runner/CommandLine.phpt
@@ -4,7 +4,7 @@ use Tester\Assert,
 	Tester\Runner\CommandLine as Cmd;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/CommandLine.php';
+require __DIR__ . '/../../src/Runner/CommandLine.php';
 
 
 

diff --git a/tests/Runner/Runner.annotations.phpt b/tests/Runner/Runner.annotations.phpt
@@ -8,9 +8,9 @@ use Tester\Assert,
 	Tester\Runner\Runner;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/OutputHandler.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 class Logger implements Tester\Runner\OutputHandler

diff --git a/tests/Runner/Runner.edge.phpt b/tests/Runner/Runner.edge.phpt
@@ -8,9 +8,9 @@ use Tester\Assert,
 	Tester\Runner\Runner;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/OutputHandler.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 class Logger implements Tester\Runner\OutputHandler

diff --git a/tests/Runner/Runner.find-tests.phpt b/tests/Runner/Runner.find-tests.phpt
@@ -7,8 +7,8 @@
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 $runner = new Tester\Runner\Runner(createInterpreter());

diff --git a/tests/Runner/Runner.multiple-fails.phpt b/tests/Runner/Runner.multiple-fails.phpt
@@ -9,9 +9,9 @@ use Tester\Assert,
 	Tester\Runner\Runner;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/OutputHandler.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 class Logger implements Tester\Runner\OutputHandler

diff --git a/tests/Runner/Runner.multiple.phpt b/tests/Runner/Runner.multiple.phpt
@@ -8,8 +8,8 @@ use Tester\Assert,
 	Tester\Helpers;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 $runner = new Tester\Runner\Runner(createInterpreter());

diff --git a/tests/Runner/Runner.stop-on-fail.phpt b/tests/Runner/Runner.stop-on-fail.phpt
@@ -8,9 +8,9 @@ use Tester\Assert,
 	Tester\Runner\Runner;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/OutputHandler.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 class Logger implements Tester\Runner\OutputHandler

diff --git a/tests/RunnerOutput/JUnitPrinter.phpt b/tests/RunnerOutput/JUnitPrinter.phpt
@@ -9,10 +9,10 @@ use Tester\Assert,
 	Tester\Runner\Output\JUnitPrinter;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
-require __DIR__ . '/../../Tester/Runner/OutputHandler.php';
-require __DIR__ . '/../../Tester/Runner/Output/JUnitPrinter.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/Output/JUnitPrinter.php';
 
 
 Environment::$useColors = FALSE;

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,9 +1,9 @@
 <?php
 
-require __DIR__ . '/../Tester/bootstrap.php';
-require __DIR__ . '/../Tester/Runner/PhpInterpreter.php';
-require __DIR__ . '/../Tester/Runner/ZendPhpInterpreter.php';
-require __DIR__ . '/../Tester/Runner/HhvmPhpInterpreter.php';
+require __DIR__ . '/../src/bootstrap.php';
+require __DIR__ . '/../src/Runner/PhpInterpreter.php';
+require __DIR__ . '/../src/Runner/ZendPhpInterpreter.php';
+require __DIR__ . '/../src/Runner/HhvmPhpInterpreter.php';
 
 
 date_default_timezone_set('Europe/Prague');
@@ -14,7 +14,7 @@ function test(\Closure $function)
 	$function();
 }
 
-/** @return \Tester\Runner\PhpInterpreter */
+/** @return Tester\Runner\PhpInterpreter */
 function createInterpreter()
 {
 	return defined('HHVM_VERSION')

diff --git a/tools/create-phar/create-phar.php b/tools/create-phar/create-phar.php
@@ -25,7 +25,7 @@
 ");
 
 $phar->startBuffering();
-foreach ($iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__ . '/../../Tester', RecursiveDirectoryIterator::SKIP_DOTS)) as $file) {
+foreach ($iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__ . '/../../src', RecursiveDirectoryIterator::SKIP_DOTS)) as $file) {
 	echo "adding: {$iterator->getSubPathname()}\n";
 	$phar[$iterator->getSubPathname()] = php_strip_whitespace($file);
 }