1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00

- CMakeLists.txt : Fix mess caused by rebase/merge

- pfPythonTest/CMakeLists.txt: changed python linking like Mystler suggested (at least I hope I understood it right)
- test_plString.cpp : added actual test, removed tab somewhere
This commit is contained in:
Anne Marije v/d Meer
2014-06-04 15:10:13 +02:00
parent 098df8b41e
commit bc3f64274c
3 changed files with 6 additions and 25 deletions

View File

@ -10,19 +10,8 @@ TEST(PlStringTest,ToUtf16)
uint16_t text[] = {0x0061,0x0062,0x0063,0x0064}; //abcd as in utf16
plStringBuffer<uint16_t> expected = plStringBuffer<uint16_t>(text,arrsize(text));
plStringBuffer<uint16_t> output = plString("abcd").ToUtf16();
const uint16_t* c = output.GetData();
const uint16_t* d = expected.GetData();
printf("expected size %d output size %d\n", expected.GetSize(), output.GetSize());
for (int i = 0; i<expected.GetSize(); i++)
{
printf("%u %s \n", c, c);
printf("%u %s \n", d, d);
EXPECT_EQ(d, c);
c++;
d++;
}
EXPECT_EQ(expected.GetSize(), output.GetSize()); //not really a good test
}
TEST(PlStringTest,ToWchar)
@ -111,7 +100,7 @@ TEST(PlStringTest,FindLast)
result = input.FindLast('f',plString::kCaseInsensitive);
EXPECT_EQ(-1,result);
plString input1 = plString("éeÉß");
plString input1 = plString("éeÉß");
//available accented char, case sensitive
result = input1.FindLast('e',plString::kCaseSensitive);
EXPECT_EQ(2,result);

View File

@ -94,12 +94,7 @@ target_link_libraries(test_pfPython pnTimer)
target_link_libraries(test_pfPython pnUtils)
target_link_libraries(test_pfPython pnUUID)
if(PYTHON_DEBUG_LIBRARY)
target_link_libraries(test_pfPython debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(test_pfPython optimized ${PYTHON_LIBRARY})
else()
target_link_libraries(test_pfPython ${PYTHON_LIBRARY})
endif()
target_link_libraries(test_pfPython ${PYTHON_LIBRARIES})
target_link_libraries(test_pfPython ${OPENAL_LIBRARY})
target_link_libraries(test_pfPython ${OPENSSL_LIBRARIES})