[Libreoffice-commits] core.git: 2 commits - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/README                        |   26 +++++++++++++++++---------
 writerfilter/source/ooxml/model.xml |   14 +++++++-------
 2 files changed, 24 insertions(+), 16 deletions(-)

New commits:
commit 4f917d47776addcd041a0ce3ec719f752643f8ef
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Sep 22 16:35:30 2014 +0200

    sw/qa/README: document that complex/unoapi are Java tests
    
    Change-Id: Ibaeefe795c8318824fe3d158871eae0477ef0fc4

diff --git a/sw/qa/README b/sw/qa/README
index fba0bdb..9395e0d 100644
--- a/sw/qa/README
+++ b/sw/qa/README
@@ -1,10 +1,18 @@
-You can find different types of Writer tests here, the most interesting ones:
+You can find different types of Writer tests here, the following directories
+are available:
 
-- core/filters-test: loads different file types (see SwFiltersTest::testCVEs()
-  for the list of supported filter types), and only makes sure Writer does not
-  crash. To add new tests, you just need to drop in the test files to the
-  relevant directory, no code change is necessary.
-- core/uwriter: this test has access to private Writer symbols, add new tests
-  here if you need that.
-- extras: see its own README -- executes import and export filters and asserts
-  the UNO model to verify the resulting document is the expected one.
+- core:
+  - filters-test: loads different file types (see SwFiltersTest::testCVEs() for
+    the list of supported filter types), and only makes sure Writer does not
+    crash. To add new tests, you just need to drop in the test files to the
+    relevant directory, no code change is necessary.
+  - uwriter: this test has access to private Writer symbols, add new tests here
+    if you need that.
+- extras:
+  - see its own README -- executes import and export filters and asserts the
+    UNO model to verify the resulting document is the expected one.
+  - also, any new C++ test that links to libsw (but does not need access to
+    private Writer symbols) should go in this directory, whether using the UNO
+    API or the internal one.
+- complex: JUnit-based tests using the UNO API
+- unoapi: JUnit-based test trying to get/set every UNO property, etc.
commit eeb8297e47bae11f2aeaa7bae6e51eee921e9e58
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Sep 22 12:39:20 2014 +0200

    Use constants for ST_TextEffect values
    
    Change-Id: If4226bbe1124ca21893840558559b2b0e24440d3

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index f194a13..1bb6cc1 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -16701,13 +16701,13 @@
       <attribute name="themeShade" tokenid="ooxml:CT_Underline_themeShade"/>
     </resource>
     <resource name="ST_TextEffect" resource="List">
-      <value tokenid="0">none</value>
-      <value tokenid="1">lights</value>
-      <value tokenid="2">blinkBackground</value>
-      <value tokenid="3">sparkle</value>
-      <value tokenid="4">antsBlack</value>
-      <value tokenid="5">antsRed</value>
-      <value tokenid="6">shimmer</value>
+      <value tokenid="ooxml:Value_ST_TextEffect_none">none</value>
+      <value tokenid="ooxml:Value_ST_TextEffect_lights">lights</value>
+      <value tokenid="ooxml:Value_ST_TextEffect_blinkBackground">blinkBackground</value>
+      <value tokenid="ooxml:Value_ST_TextEffect_sparkle">sparkle</value>
+      <value tokenid="ooxml:Value_ST_TextEffect_antsBlack">antsBlack</value>
+      <value tokenid="ooxml:Value_ST_TextEffect_antsRed">antsRed</value>
+      <value tokenid="ooxml:Value_ST_TextEffect_shimmer">shimmer</value>
     </resource>
     <resource name="CT_TextEffect" resource="Value">
       <attribute name="val" tokenid="ooxml:CT_TextEffect_val" action="setValue"/>