[Libreoffice-commits] core.git: chart2/qa

Markus Mohrhard markus.mohrhard at googlemail.com
Mon Apr 22 05:22:51 PDT 2013


 chart2/qa/extras/chart2import.cxx             |   34 +++++++++++++++++++++++++-
 chart2/qa/extras/data/ods/error_bar_range.ods |binary
 chart2/qa/extras/data/ods/fdo60083.ods        |binary
 dev/null                                      |binary
 4 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 426ed149c998d3482ce339f7655c42b2928abc84
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Apr 22 14:20:51 2013 +0200

    add test case for error bar range import
    
    Change-Id: I6719731d1b142bc49cdd5b93e8bc22520d5db540

diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 251c8a1..b498c69 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -41,6 +41,7 @@ class Chart2ImportTest : public test::BootstrapFixture, public unotest::MacrosTe
 public:
     void Fdo60083();
     void testSteppedLines();
+    void testErrorBarRange();
 
     virtual void setUp();
     virtual void tearDown();
@@ -48,6 +49,7 @@ public:
     CPPUNIT_TEST_SUITE(Chart2ImportTest);
     CPPUNIT_TEST(Fdo60083);
     CPPUNIT_TEST(testSteppedLines);
+    CPPUNIT_TEST(testErrorBarRange);
     CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -66,7 +68,7 @@ private:
 // split method up into smaller chunks for more detailed tests
 void Chart2ImportTest::Fdo60083()
 {
-    load("/chart2/qa/extras/data/ods/", "error_bar_simple.ods");
+    load("/chart2/qa/extras/data/ods/", "fdo60083.ods");
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -114,6 +116,36 @@ void Chart2ImportTest::Fdo60083()
     CPPUNIT_ASSERT(!xErrorBarXProps.is());
 }
 
+void Chart2ImportTest::testErrorBarRange()
+{
+    load("/chart2/qa/extras/data/ods/", "error_bar_range.ods");
+    uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
+    CPPUNIT_ASSERT(xChartDoc.is());
+
+    Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 );
+    CPPUNIT_ASSERT( xDataSeries.is() );
+
+    Reference< beans::XPropertySet > xPropSet( xDataSeries, UNO_QUERY_THROW );
+    CPPUNIT_ASSERT( xPropSet.is() );
+
+    // test that y error bars are there
+    Reference< beans::XPropertySet > xErrorBarYProps;
+    xPropSet->getPropertyValue("ErrorBarY") >>= xErrorBarYProps;
+    CPPUNIT_ASSERT(xErrorBarYProps.is());
+
+    sal_Int32 nErrorBarStyle;
+    CPPUNIT_ASSERT(
+            xErrorBarYProps->getPropertyValue("ErrorBarStyle")
+            >>= nErrorBarStyle);
+    CPPUNIT_ASSERT_EQUAL(
+            static_cast<sal_Int32>(chart::ErrorBarStyle::FROM_DATA),
+            nErrorBarStyle);
+
+    OUString aRangePos;
+    CPPUNIT_ASSERT(xErrorBarYProps->getPropertyValue("ErrorBarRangePositive") >>= aRangePos);
+    CPPUNIT_ASSERT_EQUAL(aRangePos, OUString("$Sheet1.$C$2:$C$4"));
+}
+
 
 // stepped line interpolation
 void Chart2ImportTest::testSteppedLines()
diff --git a/chart2/qa/extras/data/ods/error_bar_range.ods b/chart2/qa/extras/data/ods/error_bar_range.ods
new file mode 100644
index 0000000..27a0103
Binary files /dev/null and b/chart2/qa/extras/data/ods/error_bar_range.ods differ
diff --git a/chart2/qa/extras/data/ods/error_bar_simple.ods b/chart2/qa/extras/data/ods/fdo60083.ods
similarity index 100%
rename from chart2/qa/extras/data/ods/error_bar_simple.ods
rename to chart2/qa/extras/data/ods/fdo60083.ods


More information about the Libreoffice-commits mailing list