Bring testing files up-to-date in preparation to test new svg code.

(bzr r5610)

3 files changed, 17 insertions, 24 deletions

diff --git a/src/dom/Makefile.mingw b/src/dom/Makefile.mingw
index 1266bb71c..4d382c8c0 100644
--- a/src/dom/Makefile.mingw
+++ b/src/dom/Makefile.mingw
@@ -81,8 +81,8 @@ else
 # NATIVE COMPILER SETTINGS
 ##########################################################################
 
-CC      = i686-pc-mingw32-gcc
-CXX     = i686-pc-mingw32-g++
+CC      = mingw32-gcc
+CXX     = mingw32-g++
 AS      = as
 AR      = mingw32-ar
 RANLIB  = ranlib
@@ -115,16 +115,16 @@ RMDIRREC = cd inkscape & $(RMDIR) /s
 RMDIRREC1 = & cd ..
 
 #######  Where is your GTK directory?
-GTK=c:/gtk28
+GTK=c:/devlibs
 
 ####### Same thing, DOS style
-GTKDOS=c:\gtk28
+GTKDOS=c:\devlibs
 
 ####### Command to process .po files --> .mo
 MSGFMT = $(GTKDOS)$(S)bin$(S)msgfmt
 
 ####### change me!!
-DTG := 20050626
+DTG := 20080515
 
 endif
 ##########################################################################
@@ -135,16 +135,14 @@ endif
 
 
 INC = -I. -I..
-CFLAGS = -Wall -g -DXP_WIN 
+CFLAGS = -Wall -g
 LIBS = -lws2_32
 
 DOMOBJ = \
-cssparser.o       \
+cssreader.o       \
 domimpl.o         \
 domptr.o          \
 domstring.o       \
-jsengine.o        \
-jsdombind.o       \
 lsimpl.o          \
 smilimpl.o        \
 uri.o             \
@@ -162,7 +160,7 @@ io/uristream.o    \
 io/socket.o       \
 odf/odfdocument.o \
 svgimpl.o         \
-svgparser.o       \
+svgreader.o       \
 ucd.o             \
 util/thread.o     \
 util/ziptool.o
@@ -179,7 +177,7 @@ work/testzip.o
 
 OBJ = $(DOMOBJ)
 
-all: testdom.exe testhttp.exe testjs.exe \
+all: testdom.exe testhttp.exe  \
 testsvg.exe testuri.exe testxpath.exe testzip.exe
 
 testdom.exe: libdom.a work/testdom.o
@@ -188,9 +186,6 @@ testdom.exe: libdom.a work/testdom.o
 testhttp.exe: libdom.a work/testhttp.o
 	$(CXX) -o $@ work/testhttp.o libdom.a $(LIBS)
 
-testjs.exe: libdom.a work/testjs.o
-	$(CXX) -o $@ work/testjs.o libdom.a $(LIBS)
-
 testodf.exe: libdom.a work/testodf.o
 	$(CXX) -o $@ work/testodf.o libdom.a $(LIBS)
 
@@ -221,8 +216,6 @@ clean:
 	-$(RM) *.gch
 	-$(RM) testdom
 	-$(RM) testdom.exe
-	-$(RM) testjs
-	-$(RM) testjs.exe
 	-$(RM) testsvg
 	-$(RM) testsvg.exe
 	-$(RM) testuri
diff --git a/src/dom/work/testuri.cpp b/src/dom/work/testuri.cpp
index eed2aba5a..cd412fd51 100644
--- a/src/dom/work/testuri.cpp
+++ b/src/dom/work/testuri.cpp
@@ -10,7 +10,7 @@
  * Authors:
  *   Bob Jamison
  *
- * Copyright (C) 2006-2007 Bob Jamison
+ * Copyright (C) 2006-2008 Bob Jamison
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,7 @@
 
 typedef org::w3c::dom::URI URI;
 
-static bool doURI(char *uristr)
+static bool doURI(const char *uristr)
 {
     org::w3c::dom::URI uri(uristr);
     printf("##################################\n");
@@ -56,7 +56,7 @@ static bool test1()
     printf("########################################\n");
     printf("## TEST 1\n");
     printf("########################################\n");
-    char *uristr = "http://www.mit.edu:80/index.html?test=good#hello";
+    const char *uristr = "http://www.mit.edu:80/index.html?test=good#hello";
     doURI(uristr);
     uristr = "http://www.mit.edu:80";
     doURI(uristr);
diff --git a/src/dom/work/testxpath.cpp b/src/dom/work/testxpath.cpp
index 626176920..1014d4742 100644
--- a/src/dom/work/testxpath.cpp
+++ b/src/dom/work/testxpath.cpp
@@ -10,7 +10,7 @@
  * Authors:
  *   Bob Jamison
  *
- * Copyright (C) 2006 Bob Jamison
+ * Copyright (C) 2006-2008 Bob Jamison
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -54,9 +54,9 @@ typedef org::w3c::dom::xpath::XPathParser XPathParser;
 
 typedef struct
 {
-    char *xpathStr;
-    char *desc;
-    char *xml;
+    const char *xpathStr;
+    const char *desc;
+    const char *xml;
 } XpathTest;
 
 XpathTest xpathTests[] =
@@ -1333,7 +1333,7 @@ NULL,
 
 
 
-bool doStringTest(char *str)
+bool doStringTest(const char *str)
 {
     XPathParser xp;
     xp.setDebug(true);