X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FFileHandle.test.cc;h=60ba3ba60eab29eee968cede0ff5cac933db3532;hb=92f8630b75f3ef50e73c48cde58645dcd1534e27;hp=f4dac9dfb3a2e10182821c3979a2359234484dd3;hpb=fb08e3defcfb7cd8851ede0fab6cad424d168485;p=senf.git diff --git a/Socket/FileHandle.test.cc b/Socket/FileHandle.test.cc index f4dac9d..60ba3ba 100644 --- a/Socket/FileHandle.test.cc +++ b/Socket/FileHandle.test.cc @@ -1,9 +1,9 @@ // $Id$ // // Copyright (C) 2006 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) -// Stefan Bund +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Stefan Bund // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -20,7 +20,8 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// Unit tests +/** \file + \brief FileHandle unit tests */ //#include "FileHandle.test.hh" //#include "FileHandle.test.ih" @@ -31,7 +32,7 @@ #include #include "FileHandle.hh" -#include +#include "../Utils/auto_unit_test.hh" #include #define prefix_ @@ -51,7 +52,7 @@ namespace { { int rv = ::open(name.c_str(),O_RDWR|O_NONBLOCK) ; if (rv<0) - throw senf::SystemException(errno); + throw senf::SystemException(); fd(rv); } }; @@ -73,9 +74,9 @@ BOOST_AUTO_UNIT_TEST(fileHandle) BOOST_CHECK_EQUAL(fh.fd(), fh2.fd()); BOOST_CHECK(fh.writeable()); - BOOST_CHECK_NO_THROW(fh.close()); + SENF_CHECK_NO_THROW(fh.close()); BOOST_CHECK_THROW(fh.close(),senf::SystemException); - BOOST_CHECK_NO_THROW(fh.terminate()); + SENF_CHECK_NO_THROW(fh.terminate()); } { @@ -97,6 +98,7 @@ BOOST_AUTO_UNIT_TEST(fileHandle) if (fcntl(fds[1],F_SETFL,flags|O_NONBLOCK) == -1) BOOST_FAIL(strerror(errno)); char buffer[1024]; + ::memset(buffer, 0, sizeof(buffer)); while (write(fds[1],buffer,1024) == 1024) ; FHandle fh2(fds[1]);