[asterisk-scf-commits] asterisk-scf/integration/test-utf.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  106875f8c7b241eb99f2ca618bff0933cda59d36 (commit)
      from  4d051d4532f99323d14ada0237f559b66e6fac6d (commit)

Summary of changes:
 config/testutf.config.in |    6 +++---
 src/CMakeLists.txt       |    5 ++++-
 src/TestUtf.cpp          |   17 ++++++++++++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 106875f8c7b241eb99f2ca618bff0933cda59d36
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Tue Mar 22 13:59:07 2011 -0500

    Minor cleanup for review.

diff --git a/config/testutf.config.in b/config/testutf.config.in
index 12613bf..9efee38 100644
--- a/config/testutf.config.in
+++ b/config/testutf.config.in
@@ -4,13 +4,13 @@ IceBox.InheritProperties=1
 
 # Boost Test arguments can be passed here.
 # IceBox.Service.TestUtf = TestUtf:create --log_level=all
-IceBox.Service.TestUtf=../src at testutf:create
+IceBox.Service.TestUtf=../src${binsubdir}@testutf:create
 #IceBox.Service.TestUtf = TestUtf:create
 
-IceBox.Service.ServiceDiscovery=${service_locator_bindir}/src at service_locator:create
+IceBox.Service.ServiceDiscovery=${service_locator_bindir}/src${binsubdir}@service_locator:create
 #IceBox.Service.ServiceDiscovery=service_locator:create
 
-IceBox.Service.Logger=${logger_bindir}/server/src at logging-service:createLoggingService
+IceBox.Service.Logger=${logger_bindir}/server/src${binsubdir}@logging-service:createLoggingService
 #IceBox.Service.Logger=logging-service:createLoggingService
 
 IceBox.LoadOrder=ServiceDiscovery,Logger,TestUtf
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 06b2360..4f7980f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,5 +17,8 @@ endif()
 include_directories(${logger_dir}/include)
 
 if(integrated_build STREQUAL "true")
-   icebox_add_test(test ../config/testutf.config)
+   if(Win32)
+      set(extra "../")
+   endif()
+   icebox_add_test(testutf testutf ${extra}../config/testutf.config)
 endif()
diff --git a/src/TestUtf.cpp b/src/TestUtf.cpp
index d160d90..396783b 100644
--- a/src/TestUtf.cpp
+++ b/src/TestUtf.cpp
@@ -174,6 +174,9 @@ BOOST_GLOBAL_FIXTURE(GlobalIceFixture);
 
 const std::string HardCoded("Τη γλώσσα μου έδωσαν ελληνική");
 
+/**
+ * Test passing a hard-coded UTF-8 string across the Ice interface to the logger.
+ */
 BOOST_AUTO_TEST_CASE(LogUtfStringConstant)
 {
     bool addLocatorSucceeded(true);
@@ -188,6 +191,13 @@ BOOST_AUTO_TEST_CASE(LogUtfStringConstant)
     }
 }
 
+/**
+ * This tests loading Ice properties set to UTF-8 strings and sending to the logger. 
+ * Testing:
+ *   - Ice properties as UTF-8 strings
+ *   - Passing UTF-8 encoded strings across Ice interface
+ *   - Logger handling the UTF-8 string (at least that the client side is free of exceptions)
+ */
 BOOST_AUTO_TEST_CASE(LogUtfIceProperties)
 {
     bool addLocatorSucceeded(true);
@@ -211,7 +221,12 @@ BOOST_AUTO_TEST_CASE(LogUtfIceProperties)
     }
 }
 
-
+/**
+ * This test compares the logged output to the original input data from the 
+ * previous tests.
+ * Testing:
+ *   - Logger handling the of UTF-8 string on server side.
+ */
 BOOST_AUTO_TEST_CASE(LogUtfLogFile)
 {
     bool addLocatorSucceeded(true);

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/test-utf.git