[sword-cvs] sword/tests Makefile.am,1.14,1.15 keycast.cpp,1.4,1.5 xmltest.cpp,1.2,1.3

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/tests
In directory www:/tmp/cvs-serv6069/tests

Modified Files:
	Makefile.am keycast.cpp xmltest.cpp 
Log Message:

dglassey: fix tests - compile keycast again and change it and xmltest to use StringList


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/tests/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	8 Jul 2003 08:08:42 -0000	1.14
+++ Makefile.am	8 Jul 2003 12:08:08 -0000	1.15
@@ -1,16 +1,13 @@
 AUTOMAKE_OPTIONS = 1.6
 INCLUDES = -I $(top_srcdir)/include
-#LDADD = -L$(top_builddir)/lib -lsword 
 LDADD = $(top_builddir)/lib/libsword.la 
 
 
 noinst_PROGRAMS = keytest mgrtest parsekey listtest casttest modtest \
-compnone complzss localetest introtest indextest configtest \
+compnone complzss localetest introtest indextest configtest keycast \
 romantest testblocks filtertest rawldidxtest lextest swaptest genbooktest treeidxtest \
 swbuftest xmltest webiftest
 
-#keycast deprecated as it uses OptionsList which doesn't exist any more
-
 if ICU
 ICUPROG = icutest translittest tlitmgrtest
 else
@@ -48,7 +45,7 @@
 compnone_SOURCES = compnone.cpp
 complzss_SOURCES = complzss.cpp
 localetest_SOURCES = localetest.cpp
-#keycast_SOURCES = keycast.cpp
+keycast_SOURCES = keycast.cpp
 introtest_SOURCES = introtest.cpp
 indextest_SOURCES = indextest.cpp
 configtest_SOURCES = configtest.cpp

Index: keycast.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/tests/keycast.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- keycast.cpp	1 Oct 2002 19:52:41 -0000	1.4
+++ keycast.cpp	8 Jul 2003 12:08:08 -0000	1.5
@@ -9,20 +9,20 @@
 
 //the commented out code works
 /* 
-        OptionsList globalOptions = mgr.getGlobalOptions();
-        for (OptionsList::iterator it = globalOptions.begin(); it != globalOptions.end(); it++) {
+        StringList globalOptions = mgr.getGlobalOptions();
+        for (StringList::iterator it = globalOptions.begin(); it != globalOptions.end(); it++) {
                 std::cout << *it << std::endl;
 
-                OptionsList values = mgr.getGlobalOptionValues((*it).c_str());
-                for (OptionsList::iterator it2 = values.begin(); it2 != values.end(); it2++) {
+                StringList values = mgr.getGlobalOptionValues((*it).c_str());
+                for (StringList::iterator it2 = values.begin(); it2 != values.end(); it2++) {
                         std::cout << "\t"<< *it2 << std::endl;
                 }
         }
 */
 
 //crashes
-	OptionsList values = mgr.getGlobalOptionValues("Footnotes");
-        for (OptionsList::iterator it2 = values.begin(); it2 != values.end(); it2++) {
+	StringList values = mgr.getGlobalOptionValues("Footnotes");
+        for (StringList::iterator it2 = values.begin(); it2 != values.end(); it2++) {
               std::cout << "\t"<< *it2 << std::endl;
         }    
 };

Index: xmltest.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/tests/xmltest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmltest.cpp	25 Jun 2003 22:09:15 -0000	1.2
+++ xmltest.cpp	8 Jul 2003 12:08:08 -0000	1.3
@@ -9,8 +9,8 @@
 //	x.setAttribute("newOne", "oneValue");
 	cout << x.toString() << "\n";
 	cout << "Tag name: [" << x.getName() << "]\n";
-	ListString attributes = x.getAttributeNames();
-	for (ListString::iterator it = attributes.begin(); it != attributes.end(); it++) {
+	StringList attributes = x.getAttributeNames();
+	for (StringList::iterator it = attributes.begin(); it != attributes.end(); it++) {
 		const char *name = it->c_str();
 		cout << " - attribute: [" << name << "] = [";
 		cout << x.getAttribute(name) << "]\n";