From f1c3a708b0105f00635900b13b1acaa56fa86bca Mon Sep 17 00:00:00 2001 From: ikemo Date: Sun, 7 Dec 2003 10:01:55 +0000 Subject: [PATCH] move tests git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@645 56b19765-1e22-0410-a548-a0f45d66c51a --- kita/src/libkita/tests/threadtest.cpp | 34 +++++++++++++++++++ kita/src/libkita/tests/threadtest.h | 2 +- kita/src/libkita/thread.cpp | 62 ----------------------------------- 3 files changed, 35 insertions(+), 63 deletions(-) diff --git a/kita/src/libkita/tests/threadtest.cpp b/kita/src/libkita/tests/threadtest.cpp index 7578461..7a40030 100644 --- a/kita/src/libkita/tests/threadtest.cpp +++ b/kita/src/libkita/tests/threadtest.cpp @@ -32,6 +32,18 @@ void ThreadTest::setUp() "Linux\n" "\n" "\n" ); + + m_fromxml2 = Thread::fromXml( m_fromxml.toXmlFragment() ); + + m_fromxml3 = Thread::fromXml( "\n" + " http://pc.2ch.net/linux/dat/1022744633.dat\n" + " 2ch browser thread\n" + " 700\n" + " \n" + " http://pc.2ch.net/linux/\n" + " Linux\n" + " \n" + "\n" ); } void ThreadTest::tearDown() @@ -48,6 +60,10 @@ void ThreadTest::testDatURL() m_noboard->datURL().url() ); CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/dat/1022744633.dat"), m_fromxml.datURL().url() ); + CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/dat/1022744633.dat"), + m_fromxml2.datURL().url() ); + CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/dat/1022744633.dat"), + m_fromxml3.datURL().url() ); } void ThreadTest::testURL() @@ -58,6 +74,10 @@ void ThreadTest::testURL() m_noboard->url() ); CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/test/read.cgi/linux/1022744633/"), m_fromxml.url() ); + CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/test/read.cgi/linux/1022744633/"), + m_fromxml2.url() ); + CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/test/read.cgi/linux/1022744633/"), + m_fromxml3.url() ); } void ThreadTest::testDatID() @@ -65,6 +85,8 @@ void ThreadTest::testDatID() CPPUNIT_ASSERT_EQUAL( QString( "1069738960" ), m_normal->datID() ); CPPUNIT_ASSERT_EQUAL( QString( "1069738960" ), m_noboard->datID() ); CPPUNIT_ASSERT_EQUAL( QString( "1022744633" ), m_fromxml.datID() ); + CPPUNIT_ASSERT_EQUAL( QString( "1022744633" ), m_fromxml2.datID() ); + CPPUNIT_ASSERT_EQUAL( QString( "1022744633" ), m_fromxml3.datID() ); } void ThreadTest::testResNum() @@ -72,6 +94,8 @@ void ThreadTest::testResNum() CPPUNIT_ASSERT_EQUAL( 0, m_normal->resNum() ); CPPUNIT_ASSERT_EQUAL( 0, m_noboard->resNum() ); CPPUNIT_ASSERT_EQUAL( 700, m_fromxml.resNum() ); + CPPUNIT_ASSERT_EQUAL( 700, m_fromxml2.resNum() ); + CPPUNIT_ASSERT_EQUAL( 700, m_fromxml3.resNum() ); } void ThreadTest::testName() @@ -82,6 +106,10 @@ void ThreadTest::testName() m_noboard->name() ); CPPUNIT_ASSERT_EQUAL( QString( "2ch browser thread" ), m_fromxml.name() ); + CPPUNIT_ASSERT_EQUAL( QString( "2ch browser thread" ), + m_fromxml2.name() ); + CPPUNIT_ASSERT_EQUAL( QString( "2ch browser thread" ), + m_fromxml3.name() ); } void ThreadTest::testBoardName() @@ -89,6 +117,8 @@ void ThreadTest::testBoardName() CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_normal->boardName() ); CPPUNIT_ASSERT_EQUAL( QString::null, m_noboard->boardName() ); CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_fromxml.boardName() ); + CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_fromxml2.boardName() ); + CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_fromxml3.boardName() ); } void ThreadTest::testBoardURL() @@ -96,6 +126,8 @@ void ThreadTest::testBoardURL() CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/" ), m_normal->boardURL() ); CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/" ), m_noboard->boardURL() ); CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/" ), m_fromxml.boardURL() ); + CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/" ), m_fromxml2.boardURL() ); + CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/" ), m_fromxml3.boardURL() ); } void ThreadTest::testBoardID() @@ -103,4 +135,6 @@ void ThreadTest::testBoardID() CPPUNIT_ASSERT_EQUAL( QString( "linux" ), m_normal->boardID() ); CPPUNIT_ASSERT_EQUAL( QString( "linux" ), m_noboard->boardID() ); CPPUNIT_ASSERT_EQUAL( QString( "linux" ), m_fromxml.boardID() ); + CPPUNIT_ASSERT_EQUAL( QString( "linux" ), m_fromxml2.boardID() ); + CPPUNIT_ASSERT_EQUAL( QString( "linux" ), m_fromxml3.boardID() ); } diff --git a/kita/src/libkita/tests/threadtest.h b/kita/src/libkita/tests/threadtest.h index a353447..d0e0fc4 100644 --- a/kita/src/libkita/tests/threadtest.h +++ b/kita/src/libkita/tests/threadtest.h @@ -29,7 +29,7 @@ class ThreadTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE_END(); Kita::Thread *m_normal, *m_noboard; - Kita::Thread m_fromxml; // FIXME: pointer¤Ë¤¹¤Ù¤­ + Kita::Thread m_fromxml, m_fromxml2, m_fromxml3; // FIXME: pointer¤Ë¤¹¤Ù¤­ public: void setUp(); void tearDown(); diff --git a/kita/src/libkita/thread.cpp b/kita/src/libkita/thread.cpp index 0bf4a19..3cf4c5a 100644 --- a/kita/src/libkita/thread.cpp +++ b/kita/src/libkita/thread.cpp @@ -159,68 +159,6 @@ Thread Thread::fromXml( const QString& xml ) bool Thread::test() { kdDebug() << "Thread::test()" << endl; - Thread thread = Thread::fromXml( "\n" - "http://pc.2ch.net/linux/dat/1022744633.dat\n" - "2ch browser thread\n" - "700\n" - "\n" - "http://pc.2ch.net/linux/\n" - "Linux\n" - "\n" - "\n" ); - - Thread thread2 = Thread::fromXml( thread.toXmlFragment() ); - - // TODO: ¤³¤³¤Ç»È¤ï¤ì¤Æ¤¤¤ëkdError¤Î»³¤Ï²¿¤È¤«¤·¤¿¤¤¡£ - if( thread2.datURL().url() != "http://pc.2ch.net/linux/dat/1022744633.dat" ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - if( thread2.url() != "http://pc.2ch.net/test/read.cgi/linux/1022744633/" ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - if( thread2.name() != "2ch browser thread" ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - if( thread2.resNum() != 700 ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - if( thread2.getBoard()->url().url() != "http://pc.2ch.net/linux/" ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - if( thread2.getBoard()->name() != "Linux" ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - - kdDebug() << thread.toXmlFragment() << endl; - - thread = Thread::fromXml( "\n" - " http://pc.2ch.net/linux/dat/1022744633.dat\n" - " 2ch browser thread\n" - " 700\n" - " \n" - " http://pc.2ch.net/linux/\n" - " Linux\n" - " \n" - "\n" ); - - if( thread.datURL().url() != "http://pc.2ch.net/linux/dat/1022744633.dat" ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - if( thread.url() != "http://pc.2ch.net/test/read.cgi/linux/1022744633/" ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - if( thread.name() != "2ch browser thread" ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - if( thread.resNum() != 700 ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - if( thread.getBoard()->url().url() != "http://pc.2ch.net/linux/" ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } - if( thread.getBoard()->name() != "Linux" ) { - kdError() << "inValid: line=" << __LINE__ << endl; - } return true; } -- 2.11.0