[Libreoffice-commits] core.git: 3 commits - configmgr/qa

[Tor Lillqvist]

 configmgr/qa/unit/test.cxx    |   44 +++++++-----------------------------------
 configmgr/qa/unit/version.map |   25 -----------------------
 2 files changed, 8 insertions(+), 61 deletions(-)

New commits:
commit 2825fe0fefad9ba0e5108cd210c04eb5091be70d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Oct 22 19:24:59 2014 +0300

    Bin unused version.map file
    
    Change-Id: Ic0efcf61e43864d531721474540ec138033bffe6

diff --git a/configmgr/qa/unit/version.map b/configmgr/qa/unit/version.map
deleted file mode 100644
index 06b6a4a..0000000
--- a/configmgr/qa/unit/version.map
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-UDK_3_0_0 {
-    global:
-        registerAllTestFunction;
-
-    local:
-        *;
-};
commit a60ce288fadeffce563216d353abf9a9d953317c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Oct 22 19:22:26 2014 +0300

    WaE: overriding virtual function declaration not marked 'override'
    
    CppunitTest_configmgr_unit fails, though, so I did not uncomment it in
    Module_configmgr.mk. Presumably one would need to look in the old
    configmgr/qa/unit/makefile.mk to find out how to run it.
    
    Change-Id: Id368fd94076f873bfdd34f1829d6a009daa7fa84

diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 3fd8d13..7d01806 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -76,8 +76,8 @@ void normalize(
 
 class Test: public CppUnit::TestFixture {
 public:
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
     void testKeyFetch();
     void testKeySet();
@@ -129,7 +129,7 @@ protected:
     virtual bool iteration() = 0;
 
 private:
-    virtual void SAL_CALL run();
+    virtual void SAL_CALL run() SAL_OVERRIDE;
 
     osl::Condition & stop_;
     bool success_;
@@ -165,7 +165,7 @@ public:
         OUString const & relative);
 
 private:
-    virtual bool iteration();
+    virtual bool iteration() SAL_OVERRIDE;
 
     Test const & test_;
     OUString path_;
@@ -192,7 +192,7 @@ public:
         OUString const & relative);
 
 private:
-    virtual bool iteration();
+    virtual bool iteration() SAL_OVERRIDE;
 
     Test const & test_;
     OUString path_;
@@ -237,11 +237,11 @@ protected:
 
 private:
     virtual void SAL_CALL disposing(css::lang::EventObject const &)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException) SAL_OVERRIDE;
 
     virtual void SAL_CALL propertyChange(
         css::beans::PropertyChangeEvent const &)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException) SAL_OVERRIDE;
 
     int count_;
     bool * destroyed_;
@@ -295,7 +295,7 @@ public:
     SimpleRecursiveTest(Test const & theTest, int count, bool * destroyed);
 
 private:
-    virtual void step() const;
+    virtual void step() const SAL_OVERRIDE;
 };
 
 SimpleRecursiveTest::SimpleRecursiveTest(
commit 42a78549ce3c3cedb0e501d0488e0b85bfd5e8a8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Oct 22 19:16:44 2014 +0300

    WaE: Unreferenced function definition
    
    Change-Id: I3364da59679875c21691fa758578fd871e359956

diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index f824f4d..3fd8d13 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -312,34 +312,6 @@ void SimpleRecursiveTest::step() const
         css::uno::makeAny(OUString("step")));
 }
 
-class CrossThreadTest: public RecursiveTest {
-public:
-    CrossThreadTest(Test const & theTest, int count, bool * destroyed);
-
-private:
-    virtual void step() const;
-};
-
-CrossThreadTest::CrossThreadTest(
-    Test const & theTest, int count, bool * destroyed):
-    RecursiveTest(theTest, count, destroyed)
-{}
-
-void CrossThreadTest::step() const
-{
-    osl::Condition stop;
-    stop.set();
-    WriterThread(
-        stop, test_,
-        OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
-                 "dotuno:WebHtml"),
-        OUString("Label")).join();
-    test_.resetKey(
-        OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
-                 "dotuno:WebHtml"),
-        OUString("Label"));
-}
-
 void Test::setUp()
 {
     provider_ = css::configuration::theDefaultProvider::get(