From 56a715453bedd9d14de02cf561f34eab3baba1af Mon Sep 17 00:00:00 2001 From: mattab Date: Tue, 14 May 2013 15:15:35 +1200 Subject: I'm using Meld on Ubuntu to compare processed VS expected files. slightly updating README to clarifying workflow. --- tests/README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/README.md b/tests/README.md index f766013cf2..f018007dd6 100644 --- a/tests/README.md +++ b/tests/README.md @@ -25,10 +25,15 @@ Integration tests allow to test how major Piwik components interact together. A test will typically generate hits to the Tracker (record visits and page views) and then test all API responses and for each API output. It then checks that they match expected XML (or CSV, json, etc.). If a test fails, you can compare the processed/ and expected/ directories in a graphical -text compare tool, such as WinMerge on Win, to easily view changes between files. +text compare tool, such as WinMerge on Win, or MELD on Linux, to easily view changes between files. + +For example using Meld, click on "Start new comparison", "Directory comparison", +in "Original" select "path/to/piwik/tests/PHPUnit/Integration/expected" +in "Mine" select "path/to/piwik/tests/PHPUnit/Integration/processed" + If changes are expected due to the code changes you make, simply copy the file from processed/ to -expected/, and test will then pass. Otherwise, if you didn't expect to modify the API outputs, -it might be that your changes are breaking some features unexpectedly. +expected/, and test will then pass. Copying files is done easily using Meld (ALT+LEFT). +Otherwise, if you didn't expect to modify the API outputs, it might be that your changes are breaking some features unexpectedly. ## PHPUnit Tests -- cgit v1.2.3