buildframework/helium/doc/src/manual/stage_matti.rst.inc.ftl
changeset 628 7c4a911dc066
parent 587 85df38eb4012
--- a/buildframework/helium/doc/src/manual/stage_matti.rst.inc.ftl	Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/doc/src/manual/stage_matti.rst.inc.ftl	Fri Aug 13 14:59:05 2010 +0300
@@ -32,9 +32,9 @@
 .. _`and the matti website`:  http://trmatti1.nmp.nokia.com/help/
 </#if>  
 
-The set up of parameters is very similar (a few less parameters and it mostly uses ATS values). The main difference is that once the drop file has been uploaded to the ATS server it uses MATTI to perform the tests and not ATS, this is achieved by calling the MATTIDrop.py script instead of the ATSE or ATS scripts when creating the drop file (the drop file contains the flash files and the ruby tests to be performed).
+The set up of parameters is very similar (a few less parameters and it mostly uses ATS values). The main difference is that once the drop file has been uploaded to the ATS server it uses MATTI to perform the tests (the drop file contains the flash files, the ruby tests/sip profiles, data files, sis files and/or parameters file in xml format).
 
-The following parameters are the ones that are not listed in the ATS parameters, all other parameters required are as listed in the ATS section above.
+The following parameters are the ones that are not listed in the ATS parameters, all other parameters required are as listed in the ATS section above, which include :hlm-p:`ats.server`, :hlm-p:`ats.email.list`, :hlm-p:`ats.email.format`, :hlm-p:`ats.email.subject`, :hlm-p:`ats.testrun.name`, :hlm-p:`ats.product.name`, :hlm-p:`ats.flashfiles.minlimit`, :hlm-p:`ats.flash.images` and :hlm-p:`ats.upload.enabled`. 
 
 * [must] - must be set by user
 * [recommended] - should be set by user but not mandatory
@@ -43,34 +43,32 @@
 .. csv-table:: ATS Ant properties
    :header: "Property name", "Edit status", "Description"
    
-    ":hlm-p:`matti.scripts`", "[must]", "The location of the test scrips as ruby test files i.e. .rb files."
-    ":hlm-p:`enabled.matti`", "[must]", "Enable MATTI testing to occur, if not present the target :hlm-t:`matti-test` will not run."
-    ":hlm-p:`template.file`", "[must]", "Location of the matti template file."
-    ":hlm-p:`ats.sis.images.dir`", "[recommended]", "Location of the the SIS installation files needed to flash to the phone (if required and present)."
-    ":hlm-p:`ats.script.type`", "[must]", "Always set to import, this means the MATTI server will retrieve the tests."
-    ":hlm-p:`ats.image.type`", "[must]", "Image type whether Engineering English or localised."
-    ":hlm-p:`ats.flashfiles.minlimit`", "[must]", "Minimum number of flash files required in to add to the drop file."
-    ":hlm-p:`tsrc.data.dir`", "[recommended]", "Test source code data directory. only required for testing the Ant MATTI code."
-    ":hlm-p:`ta.flag.list`", "[recommended]", "TA flag list."
+    ":hlm-p:`matti.enabled`", "[must]", "Enable MATTI testing to occur, if not present the target :hlm-t:`matti-test` will not run."
+    ":hlm-p:`matti.asset.location`", "[must]", "The location of the test asset where  ruby test files, sip profiles, hardware data etc are located."
+    ":hlm-p:`matti.test.profiles`", "[must]", "Test profiles to be executed should be mentioned in this comma separated list e.g., 'bat, fute'."
+    ":hlm-p:`matti.sierra.enabled`", "[must]", "Mustbe set to 'true' if sierra is engine is to be used. If true .sip files are used otherwise .rb (ruby) files are used to execute tests-"
+    ":hlm-p:`matti.test.timeout`", "[must]", "Separate but similar property to ats.test.timeout for matti tests."
+    ":hlm-p:`matti.parameters`", "[must]", "Matti test parameters can be given through Matti parameters xml file."
+    ":hlm-p:`matti.sis.files`", "[must]", "There are special sis files required to execute with test execution. This is a comma separated list in which several sis files can be deifned in a certain format like '<src file on build area>#<destination to save the file on memory card>#<destination to install the file>' e.g. <x:\dir1\abc.sis#f:\memory1\abc.sis#c:\phonememory\private\abc.sis>"
+    ":hlm-p:`matti.sierra.parameters`", "[must]", "Sierra parameters are set using this property. e.g. '--teardown --ordered'"
+    ":hlm-p:`matti.template.file`", "[allowed]", "Location of the matti template file."
     
 
 All you need to do is setup the following parameters:
 
 .. code-block:: xml
 
-    <property name="enabled.matti" value="true" />
-    <property name="matti.scripts" value="${r'$'}{helium.dir}/tests/data/matti" />
-    <property name="template.file" value="${r'$'}{helium.dir}\tools\common\python\lib\ats3\matti\template\matti_demo.xml" />
-    <property name="ats.sis.images.dir" location="${r'$'}{build.drive}\output\matti\sis" />
-    <property name="ats.product.name" value="" />
-    <property name="ats.test.timeout" value="60" />
+    <property name="matti.enabled" value="true" />
+    <property name="matti.asset.location" value="\\server\share\matti_testcases, x:\dir\matti_testcases," />
+    <property name="matti.test.profiles" value="bat, fute" />
+    <property name="matti.sierra.enabled" value="true" />
+    <property name="matti.test.timeout" value="1200" />
+    <property name="matti.parameters" value="x:\dir\mattiparameters\matti_parameters.xml" />
+    <property name="matti.sis.files" value="x:\sisfiles\abc.sis#f:\data\abc.sis#C:\abc.sis, x:\sisfiles\xyz.sis#f:\data\xyz.sis#F:\xyz.sis" />
+    <property name="matti.sierra.parameters" value="--ordered" />
+    <property name="matti.template.file" value="x:\dir\templates\matti_template_2.xml" />
+    
 
-    <!--ATS testing properties-->
-    <property name="tsrc.data.dir" value="data_rom" />
-    <property name="ats.ctc.enabled" value="True" />
-    <property name="ats.flashfiles.minlimit" value="2"/>
-    <property name="ta.flag.list" value="TA_M, TA_MU, TA_MMAPPFW,TA_MM"/>
-    <property name="ats.server" value="12345675:80"/>
 
 In order to upload and view the test run you need to have a valid user ID and password that matches that in your ``.netrc`` file. To create the account open a web browser window and enter the name of the ats.server with /ATS at the end e.g. http://123456:80/ATS. Click on the link in the top right hand corner to create the account. To view the test run once your account is active you need to click on the 'test runs' tab.
 
@@ -79,4 +77,4 @@
 
     hlm -Dbuild.number=001 -Dbuild.drive=z: -Dcore.build.version=001 matti-test
 
-If it displays the message 'Testdrop created!' with the file name then the ``MATTIDrops.py`` script has done what it needs to do. The next thing to check is that the drop file has been uploaded to the ATS server OK. If that is performed successfully then the rest of the testing needs to be performed by the ATS server. There is also a ``test.xml`` file created that contains details needed for debugging any problems that might occur. To determine if the tests have run correctly you need to read the test run details from the server.
+If it displays the message 'Matti testdrop created successfully!', script has done what it needs to do. The next thing to check is that the drop file has been uploaded to the ATS server OK. If that is performed successfully then the rest of the testing needs to be performed by the ATS server. There is also a ``test.xml`` file created that contains details needed for debugging any problems that might occur. To determine if the tests have run correctly you need to read the test run details from the server.