Move logs to own folder

9 files changed, 8 insertions, 7 deletions

diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index bf43d2631a..845787cec0 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -114,7 +114,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
      */
     private function logVisitsWithStaticResolver()
     {
-        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/fake_logs.log'; # log file
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs.log'; # log file
 
         $opts = array('--idsite'                    => $this->idSite,
                       '--token-auth'                => self::getTokenAuth(),
@@ -130,7 +130,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
      */
     public function logVisitsWithDynamicResolver()
     {
-        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/fake_logs_dynamic.log'; # log file
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_dynamic.log'; # log file
 
         $opts = array('--add-sites-new-hosts'       => false,
                       '--token-auth'                => self::getTokenAuth(),
@@ -146,7 +146,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
      */
     private function logVisitsWithAllEnabled()
     {
-        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/fake_logs_enable_all.log';
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_enable_all.log';
 
         $opts = array('--idsite'                    => $this->idSite,
                       '--token-auth'                => self::getTokenAuth(),
@@ -168,7 +168,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
      */
     private function replayLogFile()
     {
-        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/fake_logs_replay.log';
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_replay.log';
 
         $opts = array('--token-auth'                => self::getTokenAuth(),
                       '--recorders'                 => '4',
@@ -183,7 +183,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
      */
     private function logCustomFormat()
     {
-        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/fake_logs_custom.log';
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_custom.log';
 
         $opts = array('--idsite'           => $this->idSite,
                       '--token-auth'       => self::getTokenAuth(),
@@ -192,6 +192,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
 
         self::executeLogImporter($logFile, $opts);
     }
+
 }
 
 // needed by tests that use stored segments w/ the proxy index.php
diff --git a/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php b/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php
index 1d36404c8b..f6fd4a223f 100644
--- a/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php
@@ -43,7 +43,7 @@ class Test_Piwik_Fixture_VisitOverSeveralDaysImportedLogs extends Test_Piwik_Bas
      */
     private function logFromLogFileReverseVisitOrder()
     {
-        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/fake_logs_visits_in_reverse_chronological_order.log';
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_visits_in_reverse_chronological_order.log';
 
         $opts = array('--idsite'                    => $this->idSite,
                       '--token-auth'                => self::getTokenAuth(),);
diff --git a/tests/resources/README b/tests/resources/README
index 2015d8b108..98528064c6 100644
--- a/tests/resources/README
+++ b/tests/resources/README
@@ -1 +1 @@
-See tests/README.txt for help
+See tests/README.md for help
diff --git a/tests/resources/fake_logs.log b/tests/resources/access-logs/fake_logs.log
index f267faf2ee..f267faf2ee 100755..100644
--- a/tests/resources/fake_logs.log
+++ b/tests/resources/access-logs/fake_logs.log
diff --git a/tests/resources/fake_logs_custom.log b/tests/resources/access-logs/fake_logs_custom.log
index 85f4655d9b..85f4655d9b 100755..100644
--- a/tests/resources/fake_logs_custom.log
+++ b/tests/resources/access-logs/fake_logs_custom.log
diff --git a/tests/resources/fake_logs_dynamic.log b/tests/resources/access-logs/fake_logs_dynamic.log
index 75ef54c1d4..75ef54c1d4 100755..100644
--- a/tests/resources/fake_logs_dynamic.log
+++ b/tests/resources/access-logs/fake_logs_dynamic.log
diff --git a/tests/resources/fake_logs_enable_all.log b/tests/resources/access-logs/fake_logs_enable_all.log
index 742eb003e6..742eb003e6 100755..100644
--- a/tests/resources/fake_logs_enable_all.log
+++ b/tests/resources/access-logs/fake_logs_enable_all.log
diff --git a/tests/resources/fake_logs_replay.log b/tests/resources/access-logs/fake_logs_replay.log
index e976467b33..e976467b33 100644
--- a/tests/resources/fake_logs_replay.log
+++ b/tests/resources/access-logs/fake_logs_replay.log
diff --git a/tests/resources/fake_logs_visits_in_reverse_chronological_order.log b/tests/resources/access-logs/fake_logs_visits_in_reverse_chronological_order.log
index 2d7d0fb3f9..2d7d0fb3f9 100644
--- a/tests/resources/fake_logs_visits_in_reverse_chronological_order.log
+++ b/tests/resources/access-logs/fake_logs_visits_in_reverse_chronological_order.log