Kaydet (Commit) ef48f2fd authored tarafından Markus Mohrhard's avatar Markus Mohrhard

add a unit test for new method in ScRangeList

Change-Id: Id27973cc82c71daffec62cbaccba30777c08612b
üst 7c528f40
...@@ -38,6 +38,7 @@ public: ...@@ -38,6 +38,7 @@ public:
void testDeleteArea_0Ranges(); void testDeleteArea_0Ranges();
void testJoin_Case1(); void testJoin_Case1();
void testJoin_Case2(); void testJoin_Case2();
void testGetIntersectedRange();
void testUpdateReference_DeleteRow(); void testUpdateReference_DeleteRow();
void testUpdateReference_DeleteCol(); void testUpdateReference_DeleteCol();
...@@ -63,6 +64,7 @@ public: ...@@ -63,6 +64,7 @@ public:
CPPUNIT_TEST(testJoin_Case2); CPPUNIT_TEST(testJoin_Case2);
CPPUNIT_TEST(testUpdateReference_DeleteRow); CPPUNIT_TEST(testUpdateReference_DeleteRow);
CPPUNIT_TEST(testUpdateReference_DeleteCol); CPPUNIT_TEST(testUpdateReference_DeleteCol);
CPPUNIT_TEST(testGetIntersectedRange);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
...@@ -71,6 +73,30 @@ private: ...@@ -71,6 +73,30 @@ private:
ScDocShellRef m_xDocShRef; ScDocShellRef m_xDocShRef;
}; };
namespace {
std::ostream& operator<<(std::ostream& rStrm, const ScAddress& rAddr)
{
rStrm << "Col: " << rAddr.Col() << " Row: " << rAddr.Row() << " Tab: " << rAddr.Tab() << "\n";
return rStrm;
}
std::ostream& operator<<(std::ostream& rStrm, const ScRange& rRange)
{
rStrm << "ScRange: " << rRange.aStart << rRange.aEnd << "\n";
return rStrm;
}
std::ostream& operator<<(std::ostream& rStrm, const ScRangeList& rList)
{
rStrm << "ScRangeList: \n";
for(size_t i = 0; i < rList.size(); ++i)
rStrm << *rList[i];
return rStrm;
}
}
void Test::setUp() void Test::setUp()
{ {
...@@ -449,6 +475,13 @@ void Test::testUpdateReference_DeleteCol() ...@@ -449,6 +475,13 @@ void Test::testUpdateReference_DeleteCol()
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(12), aList.GetCellCount()); CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(12), aList.GetCellCount());
} }
void Test::testGetIntersectedRange()
{
ScRangeList aList(ScRange(2, 2, 0, 5, 5, 0));
ScRangeList aIntersecting = aList.GetIntersectedRange(ScRange(0, 0, 0, 3, 3, 0));
CPPUNIT_ASSERT_EQUAL(ScRangeList(ScRange(2,2,0,3,3,0)), aIntersecting);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment