summaryrefslogtreecommitdiffstats
path: root/src/svnqt/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/svnqt/tests')
-rw-r--r--src/svnqt/tests/CMakeLists.txt38
-rw-r--r--src/svnqt/tests/ckpath.cpp4
-rw-r--r--src/svnqt/tests/crepo.cpp14
-rw-r--r--src/svnqt/tests/lsdir.cpp18
-rw-r--r--src/svnqt/tests/testlistener.h2
5 files changed, 40 insertions, 36 deletions
diff --git a/src/svnqt/tests/CMakeLists.txt b/src/svnqt/tests/CMakeLists.txt
index 78344ad..60193d0 100644
--- a/src/svnqt/tests/CMakeLists.txt
+++ b/src/svnqt/tests/CMakeLists.txt
@@ -1,23 +1,25 @@
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+include_directories( ${CMAKE_SOURCE_DIR} )
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-MACRO(BUILD_TEST tname)
- SET(${tname}-src ${tname}.cpp)
- IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
- SET(${tname}-src ${${tname}-src} ${tname}.h)
- ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
- ADD_EXECUTABLE(${tname} ${${tname}-src})
- TARGET_LINK_LIBRARIES(${tname} ${svnqt-name} ${TQT_LIBRARIES})
- ADD_TEST(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
-ENDMACRO(BUILD_TEST)
+macro(build_test tname)
+ set(${tname}-src ${tname}.cpp)
+ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
+ set(${tname}-src ${${tname}-src} ${tname}.h)
+ endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
+ add_executable(${tname} ${${tname}-src})
+ target_link_libraries(${tname} ${svnqt-name} ${TQT_LIBRARIES})
+ add_test(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
+endmacro(build_test)
-IF (BUILD_TESTS)
- CONFIGURE_FILE(
+if (BUILD_TESTS)
+ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/testconfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/testconfig.h
)
- ADD_TEST(rmrepo "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/repo")
- ADD_TEST(rmco "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/co")
- BUILD_TEST(crepo)
- BUILD_TEST(lsdir)
- BUILD_TEST(ckpath)
-ENDIF(BUILD_TESTS)
+ build_test(crepo)
+ build_test(lsdir)
+ build_test(ckpath)
+
+ # lsdir relies on output from crepo
+ set_tests_properties(crepo lsdir PROPERTIES RUN_SERIAL TRUE)
+endif(BUILD_TESTS)
diff --git a/src/svnqt/tests/ckpath.cpp b/src/svnqt/tests/ckpath.cpp
index 64a57ca..a404e50 100644
--- a/src/svnqt/tests/ckpath.cpp
+++ b/src/svnqt/tests/ckpath.cpp
@@ -1,4 +1,4 @@
-#include "src/svnqt/path.hpp"
+#include "src/svnqt/path.h"
#include <iostream>
int main(int,char**)
@@ -15,7 +15,7 @@ int main(int,char**)
}
unsigned j = 0;
while (pa.length()>0) {
- std::cout << pa.path() << std::endl;
+ std::cout << pa.path().local8Bit() << std::endl;
pa.removeLast();
++j;
}
diff --git a/src/svnqt/tests/crepo.cpp b/src/svnqt/tests/crepo.cpp
index fa43d90..baaf444 100644
--- a/src/svnqt/tests/crepo.cpp
+++ b/src/svnqt/tests/crepo.cpp
@@ -1,8 +1,8 @@
-#include "src/svnqt/client.hpp"
+#include "src/svnqt/client.h"
#include "src/svnqt/tests/testconfig.h"
-#include "src/svnqt/repository.hpp"
-#include "src/svnqt/repositorylistener.hpp"
-#include "src/svnqt/targets.hpp"
+#include "src/svnqt/repository.h"
+#include "src/svnqt/repositorylistener.h"
+#include "src/svnqt/targets.h"
#include "testlistener.h"
@@ -17,17 +17,19 @@ class Listener:public svn::repository::RepositoryListener
virtual ~Listener(){}
virtual void sendWarning(const TQString&msg)
{
- std::cout << msg << std::endl;
+ std::cout << msg.local8Bit() << std::endl;
}
virtual void sendError(const TQString&msg)
{
- std::cout << msg << std::endl;
+ std::cout << msg.local8Bit() << std::endl;
}
virtual bool isCanceld(){return false;}
};
int main(int,char**)
{
+ system("/bin/rm -rvf -- " TESTREPOPATH " " TESTCOPATH);
+
TQString p = TESTREPOPATH;
Listener ls;
svn::repository::Repository rp(&ls);
diff --git a/src/svnqt/tests/lsdir.cpp b/src/svnqt/tests/lsdir.cpp
index f3a2f6f..c8db993 100644
--- a/src/svnqt/tests/lsdir.cpp
+++ b/src/svnqt/tests/lsdir.cpp
@@ -1,8 +1,8 @@
-#include "src/svnqt/client.hpp"
+#include "src/svnqt/client.h"
#include "src/svnqt/tests/testconfig.h"
-#include "src/svnqt/status.hpp"
-#include "src/svnqt/svnqttypes.hpp"
+#include "src/svnqt/status.h"
+#include "src/svnqt/svnqttypes.h"
#include <iostream>
int main(int,char**)
@@ -28,8 +28,8 @@ int main(int,char**)
std::cout << "List 1 "<<dlist.size()<<std::endl;
for (unsigned int i=0; i < dlist.size();++i) {
TQDateTime dt = svn::DateTime(dlist[i]->time());
- std::cout << dlist[i]->name() << " "
- << dlist[i]->lastAuthor() << " "
+ std::cout << dlist[i]->name().local8Bit() << " "
+ << dlist[i]->lastAuthor().local8Bit() << " "
<< dlist[i]->size() << " "
<< dt.toTime_t() << std::endl;
}
@@ -44,8 +44,8 @@ int main(int,char**)
std::cout << "List 2 "<<dlist.size()<<std::endl;
for (unsigned int i=0; i < dlist.size();++i) {
TQDateTime dt = svn::DateTime(dlist[i]->time());
- std::cout << dlist[i]->name() << " "
- << dlist[i]->lastAuthor() << " "
+ std::cout << dlist[i]->name().local8Bit() << " "
+ << dlist[i]->lastAuthor().local8Bit() << " "
<< dlist[i]->size() << " "
<< dt.toTime_t() << std::endl;
}
@@ -59,7 +59,7 @@ int main(int,char**)
return -1;
}
for (unsigned int i=0; i < slist.size();++i) {
- std::cout << slist[i]->path()<< std::endl;
+ std::cout << slist[i]->path().local8Bit() << std::endl;
}
std::cout << "================"<<std::endl;
std::cout << "Second status:"<<std::endl;
@@ -71,7 +71,7 @@ int main(int,char**)
return -1;
}
for (unsigned int i=0; i < slist.size();++i) {
- std::cout << slist[i]->path()<< std::endl;
+ std::cout << slist[i]->path().local8Bit() << std::endl;
}
return 0;
diff --git a/src/svnqt/tests/testlistener.h b/src/svnqt/tests/testlistener.h
index 3efa96d..8d1300a 100644
--- a/src/svnqt/tests/testlistener.h
+++ b/src/svnqt/tests/testlistener.h
@@ -1,7 +1,7 @@
#ifndef _TESTLISTENER_
#define _TESTLISTENER_
-#include "src/svnqt/context_listener.hpp"
+#include "src/svnqt/context_listener.h"
class TestListener:public svn::ContextListener
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-22 22:16:25 +0000