Adding support for parsing amazon cloudfront log files in log importer & making W3cExtendedFormat treat time-taken field as seconds by default (since that is what the W3C format specifies). Also add support for event tracking and cloudfront RTMP logs (which provide event logs). Also allow multiple spaces in between W3C extended log files. Allow derived classes of W3cExtendedFormat to define new custom field regexes.

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index 7642befc16..0603ae4d4b 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -29,6 +29,8 @@ class ManySitesImportedLogs extends Fixture
     public $addSegments = false;
     public $includeIisWithCustom = false;
     public $includeNetscaler = false;
+    public $includeCloudfront = false;
+    public $includeCloudfrontRtmp = false;
 
     public static function createAccessInstance()
     {
@@ -121,6 +123,14 @@ class ManySitesImportedLogs extends Fixture
         if ($this->includeNetscaler) {
             $this->logNetscaler();
         }
+
+        if ($this->includeCloudfront) {
+            $this->logCloudfront();
+        }
+
+        if ($this->includeCloudfrontRtmp) {
+            $this->logCloudfrontRtmp();
+        }
     }
 
     private function setupSegments()
@@ -264,4 +274,24 @@ class ManySitesImportedLogs extends Fixture
 
         return self::executeLogImporter($logFile, $opts);
     }
+
+    private function logCloudfront()
+    {
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_cloudfront.log';
+
+        $opts = array('--idsite'                    => $this->idSite,
+                      '--token-auth'                => self::getTokenAuth());
+
+        return self::executeLogImporter($logFile, $opts);
+    }
+
+    private function logCloudfrontRtmp()
+    {
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log';
+
+        $opts = array('--idsite'                    => $this->idSite,
+                      '--token-auth'                => self::getTokenAuth());
+
+        return self::executeLogImporter($logFile, $opts);
+    }
 }
\ No newline at end of file