1 files changed, 63 insertions, 2 deletions

diff --git a/linden/indra/test/llservicebuilder_tut.cpp b/linden/indra/test/llservicebuilder_tut.cpp
index 2afe8e1..6e8e299 100644
--- a/linden/indra/test/llservicebuilder_tut.cpp
+++ b/linden/indra/test/llservicebuilder_tut.cpp
@@ -13,12 +13,12 @@
 * ("GPL"), unless you have obtained a separate licensing agreement
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
-* online at http://secondlife.com/developers/opensource/gplv2
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
 * 
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
-* online at http://secondlife.com/developers/opensource/flossexception
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -113,5 +113,66 @@ namespace tut
                         test_url ,
                         "/proc/do/something/useful?estate_id=1&query=public");
         }
+
+        template<> template<>
+        void ServiceBuilderTestObject::test<6>()
+        {
+                LLSD test_block;
+                test_block["service-builder"] = "Which way to the {${$baz}}?";
+                mServiceBuilder.createServiceDefinition(
+                        "ServiceBuilderTest",
+                        test_block["service-builder"]); 
+
+                LLSD data_map;
+                data_map["foo"] = "bar";
+                data_map["baz"] = "foo";
+                std::string test_url = mServiceBuilder.buildServiceURI(
+                        "ServiceBuilderTest",
+                        data_map);
+                ensure_equals(
+                        "recursive url creation",
+                        test_url ,
+                        "Which way to the bar?");
+        }
+
+        template<> template<>
+        void ServiceBuilderTestObject::test<7>()
+        {
+                LLSD test_block;
+                test_block["service-builder"] = "Which way to the {$foo}?";
+                mServiceBuilder.createServiceDefinition(
+                        "ServiceBuilderTest",
+                        test_block["service-builder"]); 
+
+                LLSD data_map;
+                data_map["baz"] = "foo";
+                std::string test_url = mServiceBuilder.buildServiceURI(
+                        "ServiceBuilderTest",
+                        data_map);
+                ensure_equals(
+                        "fails to do replacement",
+                        test_url ,
+                        "Which way to the {$foo}?");
+        }
+
+        template<> template<>
+        void ServiceBuilderTestObject::test<8>()
+        {
+                LLSD test_block;
+                test_block["service-builder"] = "/proc/{$proc}{%params}";
+                mServiceBuilder.createServiceDefinition(
+                        "ServiceBuilderTest",
+                        test_block["service-builder"]); 
+                LLSD data_map;
+                data_map["proc"] = "do/something/useful";
+                data_map["params"] = LLSD();
+                std::string test_url = mServiceBuilder.buildServiceURI(
+                        "ServiceBuilderTest",
+                        data_map);
+                ensure_equals(
+                        "strip params",
+                        test_url ,
+                        "/proc/do/something/useful");
+        }
 }