diff options
| author | sgiehl <stefan@piwik.org> | 2014-10-15 23:07:52 +0400 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-10-15 23:07:52 +0400 |
| commit | fddda01cb0e83511416613a31533a70d072e3338 (patch) | |
| tree | 909217a2447f8723da5d1b038c8b64c36af55fb3 /tests/PHPUnit/System/BackwardsCompatibility1XTest.php | |
| parent | bc822adb13a7b8a0fefb8d824fdd761e51879266 (diff) | |
| parent | 2d06c9a753b001a99c0b787e9735dc1e1de9ba87 (diff) | |
Merge branch 'master' into deprecate_usersettings
Conflicts:
core/Version.php
Diffstat (limited to 'tests/PHPUnit/System/BackwardsCompatibility1XTest.php')
| -rw-r--r-- | tests/PHPUnit/System/BackwardsCompatibility1XTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index 5b74883202..fa8de721a3 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -10,9 +10,9 @@ namespace Piwik\Tests\System; use Piwik\Common; use Piwik\Db; use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\SqlDump; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; /** * Tests that Piwik 2.0 works w/ data from Piwik 1.12. |