change tests

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

diff --git a/kita/src/libkita/tests/boardtest.cpp b/kita/src/libkita/tests/boardtest.cpp
index d4811ed..2a2f86a 100644 (file)
--- a/kita/src/libkita/tests/boardtest.cpp
+++ b/kita/src/libkita/tests/boardtest.cpp
@@ -15,8 +15,14 @@ void BoardTest::setUp()
 {
     m_normal = new Board( KURL( "http://pc.2ch.net/linux/"), "Linux" );
 
-    m_share1 = Board::getByURL( "http://pc.2ch.net/linux/", "Linux" );
-    m_share2 = Board::getByURL( "http://pc.2ch.net/linux/", "Linux" );
+    Board::setName( "http://pc.2ch.net/linux/", "Linux" );
+    m_share1 = Board::getByURL( "http://pc.2ch.net/linux/" );
+
+    Board::setName( "http://pc.2ch.net/unix/", "U**x" );
+    m_share2 = Board::getByURL( "http://pc.2ch.net/unix/" );
+
+    Board::setName( "http://pc.2ch.net/unix/", "Unix" );
+    m_share3 = Board::getByURL( "http://pc.2ch.net/unix/" );
 
     m_null = Board::getByURL( QString::null );
 }
@@ -30,7 +36,8 @@ void BoardTest::testID()
 {
     CPPUNIT_ASSERT_EQUAL( QString( "linux" ), m_normal->id() );
     CPPUNIT_ASSERT_EQUAL( QString( "linux" ), m_share1->id() );
-    CPPUNIT_ASSERT_EQUAL( QString( "linux" ), m_share2->id() );
+    CPPUNIT_ASSERT_EQUAL( QString( "unix" ), m_share2->id() );
+    CPPUNIT_ASSERT_EQUAL( QString( "unix" ), m_share3->id() );
     CPPUNIT_ASSERT_EQUAL( QString::null, m_null->id() );
 }
 
@@ -38,7 +45,8 @@ void BoardTest::testName()
 {
     CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_normal->name() );
     CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_share1->name() );
-    CPPUNIT_ASSERT_EQUAL( QString( "Linux" ), m_share2->name() );
+    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() );
 }
 
@@ -48,8 +56,10 @@ void BoardTest::testSubjectTxtURL()
                           m_normal->subjectTxtURL().url() );
     CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/subject.txt" ),
                           m_share1->subjectTxtURL().url() );
-    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/subject.txt" ),
+    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/unix/subject.txt" ),
                           m_share2->subjectTxtURL().url() );
+    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/unix/subject.txt" ),
+                          m_share3->subjectTxtURL().url() );
     CPPUNIT_ASSERT_EQUAL( QString::null, m_null->subjectTxtURL().url() );
 }
 
@@ -59,7 +69,9 @@ void BoardTest::testURL()
                           m_normal->url().url() );
     CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/"),
                           m_share1->url().url() );
-    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/linux/"),
+    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/unix/"),
                           m_share2->url().url() );
+    CPPUNIT_ASSERT_EQUAL( QString( "http://pc.2ch.net/unix/"),
+                          m_share3->url().url() );
     CPPUNIT_ASSERT_EQUAL( QString::null, m_null->url().url() );
 }

diff --git a/kita/src/libkita/tests/boardtest.h b/kita/src/libkita/tests/boardtest.h
index 62d3d07..14a5380 100644 (file)
--- a/kita/src/libkita/tests/boardtest.h
+++ b/kita/src/libkita/tests/boardtest.h
@@ -24,7 +24,7 @@ class BoardTest : public CppUnit::TestFixture {
     CPPUNIT_TEST( testURL );
     CPPUNIT_TEST_SUITE_END();
 
-    Kita::Board *m_normal, *m_share1, *m_share2, *m_null;
+    Kita::Board *m_normal, *m_share1, *m_share2, *m_share3, *m_null;
 public:
     void setUp();
     void tearDown();