From: Carsten Niehaus <cniehaus@gmx.de>
Date: Wed, 7 Jun 2006 11:52:27 +0000 (+0000)
Subject: * The test doesn't link the other was broken
X-Git-Tag: v3.80.2~80
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=0a180b2b829cf7a85f13a16dc6fb0dd05ca9e639;p=libqmvoc.git

* The test doesn't link the other was broken

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=549089
---

diff --git a/libscience/cml/xml_cml.h b/libscience/cml/xml_cml.h
index f82fe1a..77b20dd 100644
--- a/libscience/cml/xml_cml.h
+++ b/libscience/cml/xml_cml.h
@@ -34,7 +34,11 @@ class QString;
 class CMLParser : public QXmlDefaultHandler
 {
 	public:
-		CMLParser( )
+		CMLParser()
+		{
+		};
+
+		~CMLParser()
 		{
 		};
 	
diff --git a/libscience/tests/CMakeLists.txt b/libscience/tests/CMakeLists.txt
index 6b33e39..1068de3 100644
--- a/libscience/tests/CMakeLists.txt
+++ b/libscience/tests/CMakeLists.txt
@@ -18,17 +18,17 @@ endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
-set(isotopereadingtest_SRCS isotopereadingtest.cpp )
+#set(isotopereadingtest_SRCS isotopereadingtest.cpp )
 
-kde4_automoc(${isotopereadingtest_SRCS})
+#kde4_automoc(${isotopereadingtest_SRCS})
 
-if(KDE4_BUILD_TESTS)
+#if(KDE4_BUILD_TESTS)
 
-kde4_add_executable(isotopereadingtest ${isotopereadingtest_SRCS})
+#kde4_add_executable(isotopereadingtest ${isotopereadingtest_SRCS})
 
-target_link_libraries(isotopereadingtest  ${KDE4_KDECORE_LIBS} science )
+#target_link_libraries(isotopereadingtest  ${KDE4_KDECORE_LIBS} science )
 
-endif(KDE4_BUILD_TESTS)
+#endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
diff --git a/libscience/tests/cml2test.cpp b/libscience/tests/cml2test.cpp
index b9a89f8..cf2af28 100644
--- a/libscience/tests/cml2test.cpp
+++ b/libscience/tests/cml2test.cpp
@@ -1,10 +1,14 @@
-/* Sample parsing with QT's SAX2 by Riku Leino <tsoots@gmail.com> */
-
-#include "../elementparser.h"
-#include "../element.h"
 #include <kdebug.h>
 #include <iostream>
 
+#include <qtextstream.h>
+#include <qfile.h>
+#include <qdatetime.h>
+#include <qxml.h>
+
+#include "../cml/xml_cml.h"
+#include "../cml/cmlclasses.h"
+
 int main(int argc, char *argv[])
 {
 	if (argc < 2 || argc > 2) {
@@ -12,45 +16,22 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	ElementSaxParser * parser = new ElementSaxParser();
-	QFile xmlFile(argv[1]);
-	QXmlInputSource source(xmlFile);
-	QXmlSimpleReader reader;
-
-	reader.setContentHandler(parser);
-	reader.parse(source);
-
-	QList<Element*> v = parser->getElements();
-
-	foreach( Element* e, v ){
-		if ( e )
-		{
-			QList<ChemicalDataObject*> list = e->data();
-
-			//Test: Check if the string-comparison works
-//X 			if ( e->data( ChemicalDataObject::name ) == "Helium" )
-//X 				kDebug() << "Mass: " << e->dataAsString( ChemicalDataObject::mass ) << endl;
-			
-			//Test: Check if the double-comparison works
-//X 			if ( e->data( ChemicalDataObject::mass ) == 4.002602 )
-//X 				kDebug() << "Correct mass found" << endl;
-
-			//Test: Give me the name of the element
-//X 			kDebug() << "Name: " << e->dataAsString( ChemicalDataObject::name ) << endl;
-			
-			//Test: give me all data available
-			foreach( ChemicalDataObject*o, list ){
-				if ( o )
-				{
-					QString unit = o->unitAsString();
-					if ( unit == "bo:noUnit" )
-						unit = "";
-					kDebug() << "Name: " << o->dictRef() << " " << o->valueAsString()  <<" "  << unit << endl;
-				}
-			}
-		}
-
-	}
+	CMLParser *handler = new CMLParser();
+	
+ 	QFile xmlFile(argv[1]);
+	
+	if ( !xmlFile.open( IO_ReadOnly ) ) 
+		return false;
+	
+	QTextStream t1( &xmlFile );
+	
+	QXmlInputSource source;
+//	source.setData( t1 );
+	
+	QXmlSimpleReader xmlReader;
+	xmlReader.setContentHandler( handler );
+	
+	xmlReader.parse( source );
 
 	return 0;
 }