[Libreoffice-commits] .: 2 commits - starmath/qa

[Caolán McNamara]

 starmath/qa/cppunit/test_nodetotextvisitors.cxx |   24 ++++++++++------
 starmath/qa/cppunit/test_starmath.cxx           |   34 ++++++++++++++----------
 2 files changed, 35 insertions(+), 23 deletions(-)

New commits:
commit 7abda5fc9b7be383f09f8572ded2a9ac50be845a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 20 12:37:32 2010 +0000

    make buildable under windows

diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index e5b9e93..fc5552a 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -29,7 +29,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_starmath.hxx"
 
-#include "sal/config.h"
+#ifdef WNT
+# include <tools/prewin.h>
+# include <windows.h>
+# include <tools/postwin.h>
+#endif
+
+#include "preextstl.h"
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include "postextstl.h"
+
+#include <sal/config.h>
 
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/processfactory.hxx>
@@ -43,14 +57,6 @@
 #include <visitors.hxx>
 #include <cursor.hxx>
 
-#include "preextstl.h"
-#include <cppunit/TestSuite.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/TestCase.h>
-#include <cppunit/plugin/TestPlugIn.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include "postextstl.h"
-
 namespace CppUnit {
 template<>
 struct assertion_traits<String>
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index f5a5ae3..e1e5bf4 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -3,7 +3,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_starmath.hxx"
 
-#include "sal/config.h"
+#ifdef WNT
+# include <tools/prewin.h>
+# include <windows.h>
+# include <tools/postwin.h>
+#endif
+
+#include "preextstl.h"
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include "postextstl.h"
+
+#include <sal/config.h>
 
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/processfactory.hxx>
@@ -27,14 +41,6 @@
 
 #include <svx/zoomitem.hxx>
 
-#include "preextstl.h"
-#include <cppunit/TestSuite.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/TestCase.h>
-#include <cppunit/plugin/TestPlugIn.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include "postextstl.h"
-
 SO2_DECL_REF(SmDocShell)
 SO2_IMPL_REF(SmDocShell)
 
commit b2fcd8cd7ed0cda7c60efa3188dc12994f874e15
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 20 12:34:54 2010 +0000

    The change from List to vector changes order of error messages
    
    Which IMO is probably a good thing as the first error is now
    at the start, and the last at the end. Which is way more sane,
    so change test rather than change code.

diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index 0d7bbd4..f5a5ae3 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -222,6 +222,11 @@ void Test::tmEditFailure()
 
     const SmErrorDesc *pErrorDesc = m_xDocShRef->GetParser().NextError();
 
+    CPPUNIT_ASSERT_MESSAGE("Should be a PE_COLOR_EXPECTED",
+        pErrorDesc && pErrorDesc->Type == PE_COLOR_EXPECTED);
+
+    pErrorDesc = m_xDocShRef->GetParser().PrevError();
+
     CPPUNIT_ASSERT_MESSAGE("Should be a PE_UNEXPECTED_CHAR",
         pErrorDesc && pErrorDesc->Type == PE_UNEXPECTED_CHAR);
 
@@ -230,11 +235,6 @@ void Test::tmEditFailure()
     CPPUNIT_ASSERT_MESSAGE("Should be a PE_RGROUP_EXPECTED",
         pErrorDesc && pErrorDesc->Type == PE_RGROUP_EXPECTED);
 
-    pErrorDesc = m_xDocShRef->GetParser().PrevError();
-
-    CPPUNIT_ASSERT_MESSAGE("Should be a PE_COLOR_EXPECTED",
-        pErrorDesc && pErrorDesc->Type == PE_COLOR_EXPECTED);
-
     const SmErrorDesc *pLastErrorDesc = m_xDocShRef->GetParser().PrevError();
 
     CPPUNIT_ASSERT_MESSAGE("Should be three syntax errors",