[Kst] extragear/graphics/kst/tests

[George Staikos]

SVN commit 488600 by staikos:

make the tests compile


 M  +1 -1      Makefile.am  
 M  +0 -20     testlabelparser.cpp  


--- trunk/extragear/graphics/kst/tests/Makefile.am #488599:488600
@@ -10,7 +10,7 @@
 
 METASOURCES=AUTO
 
-INCLUDES=-I$(top_srcdir)/kst/kst $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/kst -I$(top_srcdir)/kst/kst/extdate $(all_includes)
 
 AM_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
 LDADD = $(LIB_KDECORE) ../kst/libkstmath.la ../kst/libkst.la ../kst/libkstnonguiapp.la
--- trunk/extragear/graphics/kst/tests/testlabelparser.cpp #488599:488600
@@ -33,7 +33,6 @@
   doTest(parsed->chunk->next == 0L);
   doTest(parsed->chunk->text == QString::null);
   doTest(parsed->chunk->vOffset == Label::Chunk::None);
-  doTest(parsed->chunk->symbol == false);
   delete parsed;
 
   parsed = Label::parse("a");
@@ -42,7 +41,6 @@
   doTest(parsed->chunk->next == 0L);
   doTest(parsed->chunk->text == "a");
   doTest(parsed->chunk->vOffset == Label::Chunk::None);
-  doTest(parsed->chunk->symbol == false);
   delete parsed;
 
   parsed = Label::parse("\\]");
@@ -51,7 +49,6 @@
   doTest(parsed->chunk->next == 0L);
   doTest(parsed->chunk->text == "]");
   doTest(parsed->chunk->vOffset == Label::Chunk::None);
-  doTest(parsed->chunk->symbol == false);
   delete parsed;
 
   parsed = Label::parse("\\\\");
@@ -60,7 +57,6 @@
   doTest(parsed->chunk->next == 0L);
   doTest(parsed->chunk->text == "\\");
   doTest(parsed->chunk->vOffset == Label::Chunk::None);
-  doTest(parsed->chunk->symbol == false);
   delete parsed;
 
   parsed = Label::parse("\\tau");
@@ -69,7 +65,6 @@
   doTest(parsed->chunk->next == 0L);
   doTest(parsed->chunk->text == "t");
   doTest(parsed->chunk->vOffset == Label::Chunk::None);
-  doTest(parsed->chunk->symbol == true);
   delete parsed;
 
   parsed = Label::parse("\\t");
@@ -77,7 +72,6 @@
   doTest(parsed->chunk->text == "");
   doTest(parsed->chunk->tab == true);
   doTest(parsed->chunk->vOffset == Label::Chunk::None);
-  doTest(parsed->chunk->symbol == false);
   delete parsed;
 
   parsed = Label::parse("\\n");
@@ -85,14 +79,12 @@
   doTest(parsed->chunk->text == "");
   doTest(parsed->chunk->linebreak == true);
   doTest(parsed->chunk->vOffset == Label::Chunk::None);
-  doTest(parsed->chunk->symbol == false);
   delete parsed;
 
   parsed = Label::parse("\\tau\\Theta");
   doTest(parsed != 0L);
   doTest(parsed->chunk->next == 0L);
   doTest(parsed->chunk->text == "tQ");
-  doTest(parsed->chunk->symbol == true);
   delete parsed;
 
   Label::Chunk *c = 0L;
@@ -102,23 +94,19 @@
   c = parsed->chunk;
   doTest(c->next != 0L);
   doTest(c->text == "t");
-  doTest(c->symbol == true);
   c = c->next;
   doTest(c->prev != 0L);
   doTest(c->next != 0L);
   doTest(c->text == "foo bar");
-  doTest(c->symbol == false);
   c = c->next;
   doTest(c->prev != 0L);
   doTest(c->next != 0L);
   doTest(c->text == "");
-  doTest(c->symbol == false);
   doTest(c->linebreak == true);
   c = c->next;
   doTest(c->prev != 0L);
   doTest(c->next == 0L);
   doTest(c->text == "Q");
-  doTest(c->symbol == true);
   delete parsed;
 
   parsed = Label::parse("x^y^z");
@@ -135,7 +123,6 @@
   doTest(c->up != 0L);
   doTest(c->down != 0L);
   doTest(c->text == "x");
-  doTest(c->symbol == false);
   doTest(c->vOffset == Label::Chunk::None);
   c = c->up;
   doTest(c->prev != 0L);
@@ -143,7 +130,6 @@
   doTest(c->up == 0L);
   doTest(c->down == 0L);
   doTest(c->text == "y");
-  doTest(c->symbol == false);
   doTest(c->vOffset == Label::Chunk::Up);
   c = c->prev->down;
   doTest(c->prev != 0L);
@@ -151,7 +137,6 @@
   doTest(c->up == 0L);
   doTest(c->down == 0L);
   doTest(c->text == "z");
-  doTest(c->symbol == false);
   doTest(c->vOffset == Label::Chunk::Down);
   delete parsed;
 
@@ -163,7 +148,6 @@
   doTest(c->up != 0L);
   doTest(c->down == 0L);
   doTest(c->text == "x");
-  doTest(c->symbol == false);
   doTest(c->vOffset == Label::Chunk::None);
   c = c->up;
   doTest(c->prev != 0L);
@@ -178,7 +162,6 @@
   doTest(c->next == 0L);
   doTest(c->up == 0L);
   doTest(c->down == 0L);
-  doTest(c->symbol == false);
   doTest(c->vOffset == Label::Chunk::None);
   delete parsed;
 
@@ -190,7 +173,6 @@
   doTest(c->up != 0L);
   doTest(c->down != 0L);
   doTest(c->text == "x");
-  doTest(c->symbol == false);
   doTest(c->vOffset == Label::Chunk::None);
   c = c->up;
   doTest(c->prev != 0L);
@@ -200,7 +182,6 @@
   doTest(c->vOffset == Label::Chunk::Up);
   c = c->next;
   doTest(c->text == "y+1");
-  doTest(c->symbol == false);
   doTest(c->vOffset == Label::Chunk::None);
   c = c->prev->prev->down;
   doTest(c->prev != 0L);
@@ -210,7 +191,6 @@
   doTest(c->vOffset == Label::Chunk::Down);
   c = c->next;
   doTest(c->text == "z-1");
-  doTest(c->symbol == false);
   doTest(c->vOffset == Label::Chunk::None);
   delete parsed;