From 7dbea95bf030c920c5f77e0f2cabac07ba5460e0 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 2 Jul 2008 08:43:31 +0000
Subject: INTEGRATION: CWS sb90 (1.9.22); FILE MERGED 2008/06/25 12:12:04 sb
 1.9.22.1: #157787# added .override feature

---
 sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'sal')

diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index 6f0076577877..b1aef4fe88a6 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: rtl_Bootstrap.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -768,6 +768,16 @@ namespace rtl_Bootstrap
                 t.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("qadev17")));
         }
 
+        void testOverride() {
+            rtl::OUString t(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "${.override:$ORIGIN/" SAL_CONFIGFILE("rtl") ":ORIGIN}"));
+            Bootstrap(t_getSourcePath("rtl")).expandMacrosFrom(t);
+            CPPUNIT_ASSERT_MESSAGE(
+                "override",
+                t.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("direct")));
+        }
+
         void testSection() {
             rtl::OUStringBuffer b;
             b.appendAscii(RTL_CONSTASCII_STRINGPARAM("${"));
@@ -799,6 +809,7 @@ namespace rtl_Bootstrap
         CPPUNIT_TEST(expandMacrosFrom_003);
         CPPUNIT_TEST(testRecursion);
         CPPUNIT_TEST(testLink);
+        CPPUNIT_TEST(testOverride);
         CPPUNIT_TEST(testSection);
         CPPUNIT_TEST_SUITE_END();
     }; // class expandMacrosFrom
@@ -915,6 +926,7 @@ static void create_rtlrc()
     sLines += "RTLVALUE=qadev17\n";
     sLines += "TESTSHL_SOVALUE=rtlfile\n";
     sLines += "RECURSIVE=${$ORIGIN/" SAL_CONFIGFILE("testshl2") ":RECURSIVE}\n";
+    sLines += "ORIGIN=direct\n";
     sLines += "[Other_Section]\n";
     sLines += "TESTSHL_SOVALUE=rtlfile_other\n";
 
-- 
cgit