fix tests

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@770 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/libkita/tests/threadtest.cpp b/kita/src/libkita/tests/threadtest.cpp
index 653b7a1..dfb9996 100644 (file)
--- a/kita/src/libkita/tests/threadtest.cpp
+++ b/kita/src/libkita/tests/threadtest.cpp
@@ -15,12 +15,9 @@ using namespace Kita;
 void ThreadTest::setUp()
 {
     Kita::Board::setName( "http://pc.2ch.net/linux/", "Linux" );
-    m_normal = new Thread( 
-    "http://pc.2ch.net/linux/dat/1069738960.dat",
-    "Kita - 2ch client for KDE" );
-
-    m_noboard = new Thread( "http://pc.2ch.net/linux/dat/1069738960.dat",
+    Kita::Thread::setName( "http://pc.2ch.net/linux/dat/1069738960.dat",
     "Kita - 2ch client for KDE" );
+    m_normal = Kita::Thread::getByURL( "http://pc.2ch.net/linux/dat/1069738960.dat" );
 
     m_fromxml = Thread::fromXml( "<thread xmlns=\"http://kita.sourceforge.jp/ns/thread\">\n"
     "<daturl>http://pc.2ch.net/linux/dat/1022744633.dat</daturl>\n"
@@ -48,15 +45,12 @@ void ThreadTest::setUp()
 void ThreadTest::tearDown()
 {
     delete m_normal;
-    delete m_noboard;
 }
 
 void ThreadTest::testDatURL()
 {
     CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/dat/1069738960.dat"),
                           m_normal->datURL() );
-    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/dat/1069738960.dat"),
-                          m_noboard->datURL() );
     CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/dat/1022744633.dat"),
                           m_fromxml.datURL() );
     CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/dat/1022744633.dat"),
@@ -69,8 +63,6 @@ void ThreadTest::testURL()
 {
     CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/test/read.cgi/linux/1069738960/"),
                           m_normal->url() );
-    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/test/read.cgi/linux/1069738960/"),
-                          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/"),
@@ -82,7 +74,6 @@ void ThreadTest::testURL()
 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() );
@@ -91,7 +82,6 @@ void ThreadTest::testDatID()
 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() );
@@ -101,8 +91,6 @@ void ThreadTest::testName()
 {
     CPPUNIT_ASSERT_EQUAL( QString( "Kita - 2ch client for KDE" ),
                           m_normal->name() );
-    CPPUNIT_ASSERT_EQUAL( QString( "Kita - 2ch client for KDE" ),
-                          m_noboard->name() );
     CPPUNIT_ASSERT_EQUAL( QString( "2ch browser thread" ),
                           m_fromxml.name() );
     CPPUNIT_ASSERT_EQUAL( QString( "2ch browser thread" ),
@@ -114,8 +102,6 @@ void ThreadTest::testName()
 void ThreadTest::testBoardName()
 {
     CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_normal->boardName() );
-    // ¢­m_normal¤Î¥³¥ó¥¹¥È¥é¥¯¥¿¤ÇÀßÄꤷ¤Æ¤ë¤Î¤¿¤á
-    CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), 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() );
@@ -124,7 +110,6 @@ void ThreadTest::testBoardName()
 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() );
@@ -133,7 +118,6 @@ void ThreadTest::testBoardURL()
 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 d0e0fc4..8296110 100644 (file)
--- a/kita/src/libkita/tests/threadtest.h
+++ b/kita/src/libkita/tests/threadtest.h
@@ -28,7 +28,7 @@ class ThreadTest : public CppUnit::TestFixture {
     CPPUNIT_TEST( testBoardID );
     CPPUNIT_TEST_SUITE_END();
 
-    Kita::Thread *m_normal, *m_noboard;
+    Kita::Thread *m_normal;
     Kita::Thread m_fromxml, m_fromxml2, m_fromxml3;  // FIXME: pointer¤Ë¤¹¤Ù¤­
 public:
     void setUp();

diff --git a/kita/src/libkita/thread.h b/kita/src/libkita/thread.h
index aee6857..6162efe 100644 (file)
--- a/kita/src/libkita/thread.h
+++ b/kita/src/libkita/thread.h
@@ -33,10 +33,10 @@ namespace Kita
     class Thread
     {
         Thread( const QString& datURL, const QString& threadName = QString::null );
-        Thread();
         friend class ThreadAccess;
         friend class ThreadXmlParser;
     public:
+        Thread();
         ~Thread();
 
         const QString& datURL() const;