move tests

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

diff --git a/kita/src/libkita/board.cpp b/kita/src/libkita/board.cpp
index 80c8849..c9c789f 100644 (file)
--- a/kita/src/libkita/board.cpp
+++ b/kita/src/libkita/board.cpp
@@ -139,28 +139,6 @@ Board Board::fromXml( const QString& xml )
   return board;
 }
 
-bool Board::test()
-{
-  kdDebug() << "Board::test()" << endl;
-  Board board = Board::fromXml( "<board>\n<url>http://pc.2ch.net/linux/</url>\n<name>Linux</name>\n</board>\n" );
-  if( board.url().url() != "http://pc.2ch.net/linux/" ) {
-    kdError() << "inValid: line=" << __LINE__ << endl;
-  }
-  if( board.name() != "Linux" ) {
-    kdError() << "inValid: line=" << __LINE__ << endl;
-  }
-
-  board = Board::fromXml( "  <board>\n    <url>http://pc.2ch.net/linux/</url>\n    <name>Linux</name>\n  </board>\n" );
-  if( board.url().url() != "http://pc.2ch.net/linux/" ) {
-    kdError() << "inValid: line=" << __LINE__ << endl;
-  }
-  if( board.name() != "Linux" ) {
-    kdError() << "inValid: line=" << __LINE__ << endl;
-  }
-
-  return true;
-}
-
 Board* Board::getByURL( const QString& boardURL )
 {
     // FIXME: null¥ª¥Ö¥¸¥§¥¯¥È¤òÍ×µá¤Î¤¿¤Ó¤Ëºî¤Ã¤Æ¤¤¤ë¡£

diff --git a/kita/src/libkita/board.h b/kita/src/libkita/board.h
index bd600db..4971283 100644 (file)
--- a/kita/src/libkita/board.h
+++ b/kita/src/libkita/board.h
@@ -44,8 +44,6 @@ namespace Kita {
     const QString toXmlFragment() const;
     static Board fromXml( const QString& xml );
 
-    static bool test();
-
     // Factory method
     static Board* getByURL( const QString& boardURL );
     static void setName( const QString& boardURL, const QString& boardName );

diff --git a/kita/src/libkita/tests/boardtest.cpp b/kita/src/libkita/tests/boardtest.cpp
index 2a2f86a..776c0d8 100644 (file)
--- a/kita/src/libkita/tests/boardtest.cpp
+++ b/kita/src/libkita/tests/boardtest.cpp
@@ -25,6 +25,12 @@ void BoardTest::setUp()
     m_share3 = Board::getByURL( "http://pc.2ch.net/unix/" );
 
     m_null = Board::getByURL( QString::null );
+
+    m_fromxml = Board::fromXml( "<board>\n<url>http://pc.2ch.net/linux/</url>\n<name>Linux</name>\n</board>\n" );
+    m_fromxml2 = Board::fromXml( "  <board>\n"
+    "    <url>http://pc.2ch.net/linux/</url>\n"
+    "    <name>Linux</name>\n"
+    "  </board>\n"  );
 }
 
 void BoardTest::tearDown()
@@ -39,6 +45,8 @@ void BoardTest::testID()
     CPPUNIT_ASSERT_EQUAL( QString( "unix" ), m_share2->id() );
     CPPUNIT_ASSERT_EQUAL( QString( "unix" ), m_share3->id() );
     CPPUNIT_ASSERT_EQUAL( QString::null, m_null->id() );
+    CPPUNIT_ASSERT_EQUAL( QString( "linux" ), m_fromxml.id() );
+    CPPUNIT_ASSERT_EQUAL( QString( "linux" ), m_fromxml2.id() );
 }
 
 void BoardTest::testName()
@@ -48,6 +56,8 @@ void BoardTest::testName()
     CPPUNIT_ASSERT_EQUAL( QString( "U**x" ), m_share2->name() );
     CPPUNIT_ASSERT_EQUAL( QString( "Unix" ), m_share3->name() );
     CPPUNIT_ASSERT_EQUAL( QString::null, m_null->name() );
+    CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_fromxml.name() );
+    CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_fromxml2.name() );
 }
 
 void BoardTest::testSubjectTxtURL()
@@ -61,6 +71,10 @@ void BoardTest::testSubjectTxtURL()
     CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/unix/subject.txt" ),
                           m_share3->subjectTxtURL().url() );
     CPPUNIT_ASSERT_EQUAL( QString::null, m_null->subjectTxtURL().url() );
+    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/subject.txt" ),
+                          m_fromxml.subjectTxtURL().url() );
+    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/subject.txt" ),
+                          m_fromxml2.subjectTxtURL().url() );
 }
 
 void BoardTest::testURL()
@@ -74,4 +88,8 @@ void BoardTest::testURL()
     CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/unix/"),
                           m_share3->url().url() );
     CPPUNIT_ASSERT_EQUAL( QString::null, m_null->url().url() );
+    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/"),
+                          m_fromxml.url().url() );
+    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/"),
+                          m_fromxml2.url().url() );
 }

diff --git a/kita/src/libkita/tests/boardtest.h b/kita/src/libkita/tests/boardtest.h
index 14a5380..5afc75a 100644 (file)
--- a/kita/src/libkita/tests/boardtest.h
+++ b/kita/src/libkita/tests/boardtest.h
@@ -25,6 +25,7 @@ class BoardTest : public CppUnit::TestFixture {
     CPPUNIT_TEST_SUITE_END();
 
     Kita::Board *m_normal, *m_share1, *m_share2, *m_share3, *m_null;
+    Kita::Board m_fromxml, m_fromxml2; // FIXME: should use pointer.
 public:
     void setUp();
     void tearDown();

diff --git a/kita/src/libkita/tests/threadtest.cpp b/kita/src/libkita/tests/threadtest.cpp
index 63f85e9..16e3193 100644 (file)
--- a/kita/src/libkita/tests/threadtest.cpp
+++ b/kita/src/libkita/tests/threadtest.cpp
@@ -115,7 +115,8 @@ void ThreadTest::testName()
 void ThreadTest::testBoardName()
 {
     CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_normal->boardName() );
-    CPPUNIT_ASSERT_EQUAL( QString::null, m_noboard->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() );