zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/windows-fixes into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/windows-fixes/+merge/106083

- fixed itemfactory unit test on Windows
- disabled string unit test on Windows (because of bug #867271)
-- 
https://code.launchpad.net/~zorba-coders/zorba/windows-fixes/+merge/106083
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp	2012-05-08 01:09:52 +0000
+++ src/store/naive/simple_item_factory.cpp	2012-05-17 00:53:18 +0000
@@ -1011,7 +1011,7 @@
     xs_base64Binary value)
 {
   const std::vector<char>& data = value.getData();
-  result = new Base64BinaryItem(&data[0], data.size(), true);
+  result = new Base64BinaryItem(data.size()!=0?&data[0]:0, data.size(), true);
   return true;
 }
 

=== modified file 'test/unit/CMakeLists.txt'
--- test/unit/CMakeLists.txt	2012-05-03 12:31:51 +0000
+++ test/unit/CMakeLists.txt	2012-05-17 00:53:18 +0000
@@ -137,7 +137,10 @@
 ZORBA_GENERATE_EXE(LibUnitTest lib_unit_test.cpp "" "" "")
 
 # ADD NEW UNIT TESTS HERE
-ZORBA_ADD_TEST("test/libunit/string" LibUnitTest string)
+IF (NOT WIN32)
+  # disabled because of bug lp:867271
+  ZORBA_ADD_TEST("test/libunit/string" LibUnitTest string)
+ENDIF (NOT WIN32)
 ZORBA_ADD_TEST("test/libunit/uri" LibUnitTest uri)
 EXPECTED_FAILURE(test/libunit/uri 3118348)
 ZORBA_ADD_TEST("test/libunit/json_parser" LibUnitTest json_parser)