Upgrade PHPUnit (#148)

chingor13 · web-flow · commit f1d71ba8340f · 2018-03-28T13:04:52.000-07:00
* Upgrade tests to use real namespaces and unlock the phpunit version

* Fix TestCase for new tests
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "cache/adapter-common": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.8.*",
+        "phpunit/phpunit": ">= 4.8",
         "squizlabs/php_codesniffer": "2.*",
         "google/cloud-trace": "^0.4",
         "twig/twig": "~2.0",
diff --git a/tests/unit/Core/ContextTest.php b/tests/unit/Core/ContextTest.php
@@ -18,11 +18,12 @@
 namespace OpenCensus\Tests\Unit\Core;
 
 use OpenCensus\Core\Context;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group core
  */
-class ContextTest extends \PHPUnit_Framework_TestCase
+class ContextTest extends TestCase
 {
     public function setUp()
     {
@@ -59,14 +60,16 @@ public function testAttachingCurrentContext()
 
     public function testRestoringCurrentContext()
     {
+        $initialContext = Context::current();
         $context = new Context(['foo' => 'bar']);
         $prevContext = $context->attach();
 
         Context::current()->detach($prevContext);
+        $this->assertEquals($initialContext, Context::current());
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error_Warning
+     * @expectedException \PHPUnit\Framework\Error\Warning
      */
     public function testRestoringCurrentContextRequiresSameObject()
     {
diff --git a/tests/unit/Core/ScopeTest.php b/tests/unit/Core/ScopeTest.php
@@ -18,11 +18,12 @@
 namespace OpenCensus\Tests\Unit\Core;
 
 use OpenCensus\Core\Scope;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group core
  */
-class ScopeTest extends \PHPUnit_Framework_TestCase
+class ScopeTest extends TestCase
 {
     private $data;
 
diff --git a/tests/unit/Trace/Exporter/EchoExporterTest.php b/tests/unit/Trace/Exporter/EchoExporterTest.php
@@ -21,11 +21,12 @@
 use OpenCensus\Trace\SpanContext;
 use OpenCensus\Trace\Span;
 use OpenCensus\Trace\Tracer\TracerInterface;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class EchoExporterTest extends \PHPUnit_Framework_TestCase
+class EchoExporterTest extends TestCase
 {
     private $tracer;
 
diff --git a/tests/unit/Trace/Exporter/FileExporterTest.php b/tests/unit/Trace/Exporter/FileExporterTest.php
@@ -21,11 +21,12 @@
 use OpenCensus\Trace\SpanContext;
 use OpenCensus\Trace\Span;
 use OpenCensus\Trace\Tracer\TracerInterface;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class FileExporterTest extends \PHPUnit_Framework_TestCase
+class FileExporterTest extends TestCase
 {
     private $tracer;
     private $filename;
diff --git a/tests/unit/Trace/Exporter/LoggerExporterTest.php b/tests/unit/Trace/Exporter/LoggerExporterTest.php
@@ -25,11 +25,12 @@
 use OpenCensus\Trace\Span;
 use OpenCensus\Trace\Tracer\TracerInterface;
 use Prophecy\Argument;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class LoggerExporterTest extends \PHPUnit_Framework_TestCase
+class LoggerExporterTest extends TestCase
 {
     private $tracer;
     private $logger;
diff --git a/tests/unit/Trace/Exporter/StackdriverExporterTest.php b/tests/unit/Trace/Exporter/StackdriverExporterTest.php
@@ -28,11 +28,12 @@
 use Google\Cloud\Trace\Trace;
 use Google\Cloud\Trace\Span;
 use Google\Cloud\Trace\TraceClient;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class StackdriverExporterTest extends \PHPUnit_Framework_TestCase
+class StackdriverExporterTest extends TestCase
 {
     private $client;
 
diff --git a/tests/unit/Trace/Exporter/ZipkinExporterTest.php b/tests/unit/Trace/Exporter/ZipkinExporterTest.php
@@ -25,11 +25,12 @@
 use OpenCensus\Trace\Tracer\TracerInterface;
 use OpenCensus\Trace\Tracer\ContextTracer;
 use Prophecy\Argument;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class ZipkinExporterTest extends \PHPUnit_Framework_TestCase
+class ZipkinExporterTest extends TestCase
 {
     private $tracer;
 
diff --git a/tests/unit/Trace/Integrations/CurlTest.php b/tests/unit/Trace/Integrations/CurlTest.php
@@ -18,11 +18,12 @@
 namespace OpenCensus\Tests\Unit\Trace\Integrations;
 
 use OpenCensus\Trace\Integrations\Curl;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class CurlTest extends \PHPUnit_Framework_TestCase
+class CurlTest extends TestCase
 {
     public function testLoadUrlFromResource()
     {
diff --git a/tests/unit/Trace/Integrations/Guzzle/EventSubscriberTest.php b/tests/unit/Trace/Integrations/Guzzle/EventSubscriberTest.php
@@ -26,11 +26,12 @@
 use OpenCensus\Trace\Exporter\ExporterInterface;
 use OpenCensus\Trace\Integrations\Guzzle\EventSubscriber;
 use Prophecy\Argument;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class EventSubscriberTest extends \PHPUnit_Framework_TestCase
+class EventSubscriberTest extends TestCase
 {
     private $exporter;
 
diff --git a/tests/unit/Trace/Integrations/Guzzle/MiddlewareTest.php b/tests/unit/Trace/Integrations/Guzzle/MiddlewareTest.php
@@ -24,11 +24,12 @@
 use Prophecy\Argument;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class MiddlewareTest extends \PHPUnit_Framework_TestCase
+class MiddlewareTest extends TestCase
 {
     private $exporter;
 
diff --git a/tests/unit/Trace/Integrations/MemcacheTest.php b/tests/unit/Trace/Integrations/MemcacheTest.php
@@ -18,11 +18,12 @@
 namespace OpenCensus\Tests\Unit\Trace\Integrations;
 
 use OpenCensus\Trace\Integrations\Memcache;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class MemcacheTest extends \PHPUnit_Framework_TestCase
+class MemcacheTest extends TestCase
 {
     public function testHandleAttributeString()
     {
diff --git a/tests/unit/Trace/Integrations/MemcachedTest.php b/tests/unit/Trace/Integrations/MemcachedTest.php
@@ -18,11 +18,12 @@
 namespace OpenCensus\Tests\Unit\Trace\Integrations;
 
 use OpenCensus\Trace\Integrations\Memcached;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class MemcachedTest extends \PHPUnit_Framework_TestCase
+class MemcachedTest extends TestCase
 {
     public function testHandleAttributesString()
     {
diff --git a/tests/unit/Trace/Integrations/PDOTest.php b/tests/unit/Trace/Integrations/PDOTest.php
@@ -18,11 +18,12 @@
 namespace OpenCensus\Tests\Unit\Trace\Integrations;
 
 use OpenCensus\Trace\Integrations\PDO;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class PDOTest extends \PHPUnit_Framework_TestCase
+class PDOTest extends TestCase
 {
     public function testHandleQuery()
     {
diff --git a/tests/unit/Trace/Propagator/BinaryFormatterTest.php b/tests/unit/Trace/Propagator/BinaryFormatterTest.php
@@ -19,11 +19,12 @@
 
 use OpenCensus\Trace\SpanContext;
 use OpenCensus\Trace\Propagator\BinaryFormatter;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class BinaryFormatterTest extends \PHPUnit_Framework_TestCase
+class BinaryFormatterTest extends TestCase
 {
     /**
      * @dataProvider traceMetadata
@@ -49,7 +50,7 @@ public function testSerialize($traceId, $spanId, $enabled, $hex)
     }
 
     /**
-     * @expectedException \PHPUnit_Framework_Error_Warning
+     * @expectedException \PHPUnit\Framework\Error\Warning
      */
     public function testDeserializeBadData()
     {
diff --git a/tests/unit/Trace/Propagator/CloudTraceFormatterTest.php b/tests/unit/Trace/Propagator/CloudTraceFormatterTest.php
@@ -19,11 +19,12 @@
 
 use OpenCensus\Trace\SpanContext;
 use OpenCensus\Trace\Propagator\CloudTraceFormatter;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class CloudTraceFormatterTest extends \PHPUnit_Framework_TestCase
+class CloudTraceFormatterTest extends TestCase
 {
     /**
      * @dataProvider traceHeaders
diff --git a/tests/unit/Trace/Propagator/GrpcMetadataPropagatorTest.php b/tests/unit/Trace/Propagator/GrpcMetadataPropagatorTest.php
@@ -20,11 +20,12 @@
 use OpenCensus\Trace\SpanContext;
 use OpenCensus\Trace\Propagator\BinaryFormatter;
 use OpenCensus\Trace\Propagator\GrpcMetadataPropagator;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class GrpcMetadataPropagatorTest extends \PHPUnit_Framework_TestCase
+class GrpcMetadataPropagatorTest extends TestCase
 {
     /**
      * @dataProvider traceMetadata
diff --git a/tests/unit/Trace/Propagator/HttpHeaderPropagatorTest.php b/tests/unit/Trace/Propagator/HttpHeaderPropagatorTest.php
@@ -20,11 +20,12 @@
 use OpenCensus\Trace\SpanContext;
 use OpenCensus\Trace\Propagator\CloudTraceFormatter;
 use OpenCensus\Trace\Propagator\HttpHeaderPropagator;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class HttpHeaderPropagatorTest extends \PHPUnit_Framework_TestCase
+class HttpHeaderPropagatorTest extends TestCase
 {
     /**
      * @dataProvider traceMetadata
diff --git a/tests/unit/Trace/Propagator/TraceContextFormatterTest.php b/tests/unit/Trace/Propagator/TraceContextFormatterTest.php
@@ -19,11 +19,12 @@
 
 use OpenCensus\Trace\SpanContext;
 use OpenCensus\Trace\Propagator\TraceContextFormatter;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class TraceContextFormatterTest extends \PHPUnit_Framework_TestCase
+class TraceContextFormatterTest extends TestCase
 {
     /**
      * @dataProvider traceHeaders
diff --git a/tests/unit/Trace/RequestHandlerTest.php b/tests/unit/Trace/RequestHandlerTest.php
@@ -24,11 +24,12 @@
 use OpenCensus\Trace\Sampler\SamplerInterface;
 use OpenCensus\Trace\Tracer\NullTracer;
 use OpenCensus\Trace\Propagator\HttpHeaderPropagator;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class RequestHandlerTest extends \PHPUnit_Framework_TestCase
+class RequestHandlerTest extends TestCase
 {
     private $reporter;
 
diff --git a/tests/unit/Trace/Sampler/MultiSamplerTest.php b/tests/unit/Trace/Sampler/MultiSamplerTest.php
@@ -19,11 +19,12 @@
 
 use OpenCensus\Trace\Sampler\MultiSampler;
 use OpenCensus\Trace\Sampler\SamplerInterface;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class MultiSamplerTest extends \PHPUnit_Framework_TestCase
+class MultiSamplerTest extends TestCase
 {
     public function testNoSamplers()
     {
diff --git a/tests/unit/Trace/Sampler/ProbabilitySamplerTest.php b/tests/unit/Trace/Sampler/ProbabilitySamplerTest.php
@@ -18,11 +18,12 @@
 namespace OpenCensus\Tests\Unit\Trace\Sampler;
 
 use OpenCensus\Trace\Sampler\ProbabilitySampler;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class ProbabilitySamplerTest extends \PHPUnit_Framework_TestCase
+class ProbabilitySamplerTest extends TestCase
 {
     /**
      * @dataProvider invalidRates
diff --git a/tests/unit/Trace/Sampler/QpsSamplerTest.php b/tests/unit/Trace/Sampler/QpsSamplerTest.php
@@ -21,11 +21,12 @@
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
 use Prophecy\Argument;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class QpsSamplerTest extends \PHPUnit_Framework_TestCase
+class QpsSamplerTest extends TestCase
 {
     public function testCachedValue()
     {
diff --git a/tests/unit/Trace/SpanContextTest.php b/tests/unit/Trace/SpanContextTest.php
@@ -18,11 +18,12 @@
 namespace OpenCensus\Tests\Unit\Trace;
 
 use OpenCensus\Trace\SpanContext;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class SpanContextTest extends \PHPUnit_Framework_TestCase
+class SpanContextTest extends TestCase
 {
     public function testGeneratesDefaultTraceId()
     {
diff --git a/tests/unit/Trace/SpanDataTest.php b/tests/unit/Trace/SpanDataTest.php
@@ -22,11 +22,12 @@
 use OpenCensus\Trace\MessageEvent;
 use OpenCensus\Trace\SpanData;
 use OpenCensus\Trace\Status;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class SpanDataTest extends \PHPUnit_Framework_TestCase
+class SpanDataTest extends TestCase
 {
     public function testDefaults()
     {
diff --git a/tests/unit/Trace/SpanTest.php b/tests/unit/Trace/SpanTest.php
@@ -19,11 +19,12 @@
 
 use OpenCensus\Trace\Span;
 use OpenCensus\Trace\Status;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-class SpanTest extends \PHPUnit_Framework_TestCase
+class SpanTest extends TestCase
 {
     const EXPECTED_TIMESTAMP_FORMAT = '/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{9}Z$/';
 
diff --git a/tests/unit/Trace/Tracer/AbstractTracerTest.php b/tests/unit/Trace/Tracer/AbstractTracerTest.php
@@ -20,11 +20,12 @@
 use OpenCensus\Trace\MessageEvent;
 use OpenCensus\Trace\Span;
 use OpenCensus\Trace\SpanContext;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group trace
  */
-abstract class AbstractTracerTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractTracerTest extends TestCase
 {
     abstract protected function getTracerClass();
 
diff --git a/tests/unit/Trace/TracerTest.php b/tests/unit/Trace/TracerTest.php

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,12 @@`
`18`	`18`	`namespace OpenCensus\Tests\Unit\Core;`
`19`	`19`
`20`	`20`	`use OpenCensus\Core\Context;`
	`21`	`+use PHPUnit\Framework\TestCase;`
`21`	`22`
`22`	`23`	`/**`
`23`	`24`	`* @group core`
`24`	`25`	`*/`
`25`		`-class ContextTest extends \PHPUnit_Framework_TestCase`
	`26`	`+class ContextTest extends TestCase`
`26`	`27`	`{`
`27`	`28`	`public function setUp()`
`28`	`29`	`{`
`@@ -59,14 +60,16 @@ public function testAttachingCurrentContext()`
`59`	`60`
`60`	`61`	`public function testRestoringCurrentContext()`
`61`	`62`	`{`
	`63`	`+ $initialContext = Context::current();`
`62`	`64`	`$context = new Context(['foo' => 'bar']);`
`63`	`65`	`$prevContext = $context->attach();`
`64`	`66`
`65`	`67`	`Context::current()->detach($prevContext);`
	`68`	`+ $this->assertEquals($initialContext, Context::current());`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`/**`
`69`		`- * @expectedException PHPUnit_Framework_Error_Warning`
	`72`	`+ * @expectedException \PHPUnit\Framework\Error\Warning`
`70`	`73`	`*/`
`71`	`74`	`public function testRestoringCurrentContextRequiresSameObject()`
`72`	`75`	`{`