adding some of the support for saving Annotation files. Trying to add…

… a Unit test for a plugin but having problems. Adding support for CTest and CDash. svn path=/trunk/KDE/kdeedu/marble/; revision=1009661
KDE · Aug 10, 2009 · 1ea40ce · 1ea40ce
1 parent 9e917e9
commit 1ea40ce
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 14 deletions.
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
@@ -1,12 +1,12 @@
 SET(CTEST_PROJECT_NAME "Marble")
-SET(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
+SET(CTEST_NIGHTLY_START_TIME "00:00:00 UTC")
 
 IF(NOT DEFINED CTEST_DROP_METHOD)
   SET(CTEST_DROP_METHOD "http")
 ENDIF(NOT DEFINED CTEST_DROP_METHOD)
 
 IF(CTEST_DROP_METHOD STREQUAL "http")
   SET(CTEST_DROP_SITE "my.cdash.org")
-  SET(CTEST_DROP_LOCATION "/submit.php?project=test")
-  SET(CTEST_TRIGGER_SITE "")
+  SET(CTEST_DROP_LOCATION "/submit.php?project=Marble")
+  set(CTEST_DROP_SITE_CDASH TRUE)
 ENDIF(CTEST_DROP_METHOD STREQUAL "http")
diff --git a/src/plugins/render/osmannotate/CMakeLists.txt b/src/plugins/render/osmannotate/CMakeLists.txt
@@ -8,15 +8,10 @@ INCLUDE_DIRECTORIES(
 INCLUDE(${QT_USE_FILE})
 
 FILE( GLOB geodata_handlers_osm_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} osm/*.cpp )
+FILE( GLOB osmannotate_local_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp )
 
 set( osmannotate_SRCS
-        OsmAnnotatePlugin.cpp
-        PlacemarkTextAnnotation.cpp
-        TmpGraphicsItem.cpp
-        TextAnnotation.cpp
-        AreaAnnotation.cpp
-        GeoWidgetBubble.cpp
-        TextEditor.cpp
+        ${osmannotate_local_SRCS}
         ${geodata_handlers_osm_SRCS} )
 
 marble_add_plugin( OsmAnnotatePlugin ${osmannotate_SRCS} )
diff --git a/src/plugins/render/osmannotate/PlacemarkTextAnnotation.cpp b/src/plugins/render/osmannotate/PlacemarkTextAnnotation.cpp
@@ -13,6 +13,7 @@
 
 #include "AbstractProjection.h"
 #include "GeoDataPlacemark.h"
+#include "GeoDocument.h"
 #include "GeoPainter.h"
 #include "GeoWidgetBubble.h"
 #include "ViewportParams.h"
@@ -136,16 +137,34 @@ QString PlacemarkTextAnnotation::name() const
     return m_textEditor->name();
 }
 
+void PlacemarkTextAnnotation::setName( const QString &name )
+{
+    m_textEditor->setName( name );
+}
+
 QString PlacemarkTextAnnotation::description() const
 {
     return m_textEditor->description();
 }
 
+void PlacemarkTextAnnotation::setDescription( const QString &description )
+{
+    m_textEditor->setDescription( description );
+}
+
 GeoDataGeometry PlacemarkTextAnnotation::geometry() const
 {
     return GeoDataPoint( coordinate() );
 }
 
+void PlacemarkTextAnnotation::setGeometry( const GeoDataGeometry &geometry )
+{
+    //FIXME: undefined reference
+//    if( geometry.nodeType() == GeoDataTypes::GeoDataPointType ) {
+        setCoordinate( GeoDataCoordinates( static_cast<GeoDataPoint>(geometry) ) );
+//    }
+}
+
 
 bool PlacemarkTextAnnotation::mousePressEvent( QMouseEvent* event )
 {

diff --git a/src/plugins/render/osmannotate/PlacemarkTextAnnotation.h b/src/plugins/render/osmannotate/PlacemarkTextAnnotation.h
@@ -34,8 +34,11 @@ class PlacemarkTextAnnotation : public TextAnnotation, public TmpGraphicsItem
 
     //TextAnnotation
     virtual QString name() const;
+    virtual void setName( const QString &name );
     virtual QString description() const;
+    virtual void setDescription( const QString &description );
     virtual GeoDataGeometry geometry() const;
+    virtual void setGeometry( const GeoDataGeometry &geometry );
 
 private:
     GeoWidgetBubble* bubble;

diff --git a/src/plugins/render/osmannotate/TextAnnotation.cpp b/src/plugins/render/osmannotate/TextAnnotation.cpp
@@ -29,6 +29,8 @@ GeoDataPlacemark TextAnnotation::toGeoData() const
 
     placemark.setName( name() );
     placemark.setDescription( description() );
+    //allow for HTML in the description
+    placemark.setDescriptionCDATA( true );
 
     //FIXME: make this work for all geometries and not just points
 //    placemark.setGeometry( geometry() );

diff --git a/src/plugins/render/osmannotate/TextAnnotation.h b/src/plugins/render/osmannotate/TextAnnotation.h
@@ -26,8 +26,11 @@ class TextAnnotation
     virtual ~TextAnnotation();
 
     virtual QString name() const = 0 ;
+    virtual void setName( const QString& name ) = 0;
     virtual QString description() const = 0;
+    virtual void setDescription( const QString& description ) = 0;
     virtual GeoDataGeometry geometry() const = 0;
+    virtual void setGeometry( const GeoDataGeometry &geometry ) = 0;
 
     GeoDataPlacemark toGeoData() const;
 

diff --git a/src/plugins/render/osmannotate/TextEditor.cpp b/src/plugins/render/osmannotate/TextEditor.cpp
@@ -87,9 +87,19 @@ QString TextEditor::name() const
     return m_name->text();
 }
 
+void TextEditor::setName(const QString &name )
+{
+    m_name->setText( name );
+}
+
 QString TextEditor::description() const
 {
     return m_description->toHtml();
 }
 
+void TextEditor::setDescription( const QString &description )
+{
+    m_description->setHtml( description );
+}
+
 }
diff --git a/src/plugins/render/osmannotate/TextEditor.h b/src/plugins/render/osmannotate/TextEditor.h
@@ -29,8 +29,10 @@ class TextEditor : public QWidget
 
     //return the plain text name
     QString name() const;
+    void setName( const QString &name );
     //return the HTML description
     QString description() const;
+    void setDescription( const QString &description );
 
 private:
     QAction* m_boldAction;

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -29,6 +29,27 @@ add_definitions( -DTESTSRCDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
 
 #############################################################
 
+
+#############################################################
+# Add extra Libs for testing Plugins
+#############################################################
+#FIXME: Find a better way to do this!
+set(osmannotate_SRCS
+    ../src/plugins/render/osmannotate/TextAnnotation.cpp
+    ../src/plugins/render/osmannotate/PlacemarkTextAnnotation.cpp
+    ../src/plugins/render/osmannotate/GeoWidgetBubble.cpp
+    ../src/plugins/render/osmannotate/TmpGraphicsItem.cpp
+    ../src/plugins/render/osmannotate/TextEditor.cpp )
+
+add_library(OsmAnnotatePluginTestLib SHARED ${osmannotate_SRCS} )
+target_link_libraries( OsmAnnotatePluginTestLib
+                            ${QT_QTGUI_LIBRARY}
+                            ${QT_QTMAIN_LIBRARY}
+                            ${QT_QTCORE_LIBRARY}
+                            marblewidget )
+
+#############################################################
+
 # MarbleWidget test
 marble_add_test( MarbleWidgetSpeedTest )
 
@@ -71,4 +92,5 @@ marble_add_test( PluginManagerTest )
 marble_add_test( MarbleWidgetTest )
 add_definitions( -DCITIES_PATH="\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../data/placemarks/cityplacemarks.kml\\\"" )
 marble_add_test( KMLTest )
+
 marble_add_test( TestOsmAnnotation )
diff --git a/tests/TestGeoDataWriter.cpp b/tests/TestGeoDataWriter.cpp
@@ -72,7 +72,7 @@ void TestGeoDataWriter::initTestCase()
         QVERIFY( file.open( QIODevice::ReadOnly ) );
 
         //Parser and verify
-        QVERIFY( parser->read( &file ) );
+        QVERIFY2( parser->read( &file ), filename.toAscii() );
 
         parsers.insert( filename, parserPointer );
 

diff --git a/tests/TestOsmAnnotation.cpp b/tests/TestOsmAnnotation.cpp
@@ -24,12 +24,15 @@ private slots:
     void saveAnnotations_data();
     void saveAnnotations();
 private:
-    QList<QSharedPointer<TextAnnotation> > textAnnotations;
+    QMap< QString, QSharedPointer<TextAnnotation> > textAnnotations;
 };
 
 void TestOsmAnnotation::initTestCase()
 {
-
+    PlacemarkTextAnnotation* standard;
+//    uncomment the following to get the Undefined references
+//    standard = new PlacemarkTextAnnotation();
+//    standard->setName( "Standard Annon" );
 }
 
 void TestOsmAnnotation::saveAnnotations_data()

diff --git a/tests/data/CDATATest.kml b/tests/data/CDATATest.kml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
+<kml xmlns="http://earth.google.com/kml/2.2">
 <Document>
 <Placemark>
   <name>Feature.kml</name>