diff options
Diffstat (limited to 'bindings/objc/test/SwordModuleTest.m')
| -rw-r--r-- | bindings/objc/test/SwordModuleTest.m | 92 |
1 files changed, 18 insertions, 74 deletions
diff --git a/bindings/objc/test/SwordModuleTest.m b/bindings/objc/test/SwordModuleTest.m index 7debcc1..a308513 100644 --- a/bindings/objc/test/SwordModuleTest.m +++ b/bindings/objc/test/SwordModuleTest.m @@ -6,20 +6,19 @@ // Copyright 2010 Software by MABE. All rights reserved. // +#import <ObjCSword/ObjCSword.h> #import "SwordModuleTest.h" -#import "ObjCSword/ObjCSword.h" -#import "ObjCSword/SwordModule+Index.h" - @implementation SwordModuleTest - (void)setUp { - [[Configuration config] setClass:[OSXConfiguration class]]; - mod = [[SwordManager defaultManager] moduleWithName:@"GerNeUe"]; + [Configuration configWithImpl:[[[OSXConfiguration alloc] init] autorelease]]; + mgr = [SwordManager managerWithPath:[[Configuration config] defaultModulePath]]; + mod = [mgr moduleWithName:@"GerNeUe"]; } - (void)testLoopRenderedVerses { - SwordBible *bible = (SwordBible *)[[SwordManager defaultManager] moduleWithName:@"GerSch"]; + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"]; STAssertNotNil(bible, @"Module is nil"); NSArray *verses = [bible renderedTextEntriesForRef:@"Gen"]; @@ -28,7 +27,7 @@ } - (void)testRenderedVerseText { - SwordBible *bible = (SwordBible *)[[SwordManager defaultManager] moduleWithName:@"GerSch"]; + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"]; STAssertNotNil(bible, @"Module is nil"); SwordModuleTextEntry *text = [bible textEntryForKeyString:@"gen1.1" textType:TextTypeRendered]; @@ -37,7 +36,7 @@ } - (void)testCloneModule { - SwordBible *bible = (SwordBible *)[[SwordManager defaultManager] moduleWithName:@"GerSch"]; + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"]; STAssertNotNil(bible, @"Module is nil"); /* @@ -49,7 +48,7 @@ - (void)testLoopWithModulePos { SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen" v11n:[mod versification]]; [lk setPersist:YES]; - [mod setKey:lk]; + [mod setSwordKey:lk]; NSString *ref = nil; NSString *rendered = nil; while(![mod error]) { @@ -67,7 +66,7 @@ NSString *rendered = nil; while(![lk error]) { ref = [lk keyText]; - [mod setKey:lk]; + [mod setSwordKey:lk]; rendered = [mod renderedText]; //NSLog(@"%@:%@", ref, rendered); [lk increment]; @@ -77,7 +76,7 @@ - (void)testLoopWithModulePosWithHeadings { SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen" headings:YES v11n:[mod versification]]; [lk setPersist:YES]; - [mod setKey:lk]; + [mod setSwordKey:lk]; NSString *ref = nil; NSString *rendered = nil; while(![mod error]) { @@ -90,7 +89,7 @@ - (void)testLoopWithModulePosWithDiverseReference { SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:1;4:5-8" v11n:[mod versification]]; [lk setPersist:YES]; - [mod setKey:lk]; + [mod setSwordKey:lk]; NSString *ref = nil; NSString *rendered = nil; while(![mod error]) { @@ -109,7 +108,7 @@ NSString *rendered = nil; while(![lk error]) { ref = [lk keyText]; - [mod setKey:lk]; + [mod setSwordKey:lk]; rendered = [mod renderedText]; NSLog(@"%@:%@", ref, rendered); [lk increment]; @@ -122,7 +121,7 @@ [vk setPersist:YES]; SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:1;4:5;8:4;10:2-5" v11n:[mod versification]]; [lk setPersist:YES]; - [mod setKey:lk]; + [mod setSwordKey:lk]; NSString *ref = nil; NSString *rendered = nil; while(![mod error]) { @@ -131,7 +130,7 @@ long lowVerse = [vk verse] - context; long highVerse = lowVerse + (context * 2); [vk setVerse:lowVerse]; - [mod setKey:vk]; + [mod setSwordKey:vk]; for(;lowVerse <= highVerse;lowVerse++) { ref = [vk keyText]; rendered = [mod renderedText]; @@ -139,7 +138,7 @@ [mod incKeyPosition]; } // set back list key - [mod setKey:lk]; + [mod setSwordKey:lk]; [mod incKeyPosition]; } else { ref = [lk keyText]; @@ -152,66 +151,11 @@ - (void)testStrippedTextForRef { SwordVerseKey *vk = [SwordVerseKey verseKeyWithRef:@"1Mo 1:2"]; - NSLog(@"start position: %s", [vk keyText]); + NSLog(@"start position: %@", [vk keyText]); [vk decrement]; - NSLog(@"decrement position: %s", [vk keyText]); + NSLog(@"decrement position: %@", [vk keyText]); [vk setVerse:[vk verse] + 3]; - NSLog(@"verse + 3: %s", [vk keyText]); + NSLog(@"verse + 3: %@", [vk keyText]); } -/* - #ifdef __cplusplus - #include <swtext.h> - #include <versekey.h> - #include <regex.h> - #include <swmodule.h> - class sword::SWModule; - #include <iostream> - #include <versekey.h> - #include <rawtext.h> - #include <rawcom.h> - #include <echomod.h> - #include <stdlib.h> - using namespace sword; - #endif - - - (void)testHeadings { - mod = [[SwordManager defaultManager] moduleWithName:@"KJV"]; - STAssertNotNil(mod, @"No Mod"); - - // enable headings - [[SwordManager defaultManager] setGlobalOption:SW_OPTION_HEADINGS value:SW_ON]; - [[SwordManager defaultManager] setGlobalOption:SW_OPTION_STRONGS value:SW_ON]; - [[SwordManager defaultManager] setGlobalOption:SW_OPTION_FOOTNOTES value:SW_ON]; - - SWModule *target; - target = [mod swModule]; - target->setKey("gen 1:1"); - target->RenderText(); // force an entry lookup to resolve key to something in the index - - std::cout << "==Raw=Entry===============\n"; - std::cout << target->getKeyText() << ":\n"; - std::cout << target->getRawEntry(); - std::cout << "\n"; - std::cout << "==Render=Entry============\n"; - std::cout << target->RenderText(); - std::cout << "\n"; - std::cout << "==========================\n"; - std::cout << "Entry Attributes:\n\n"; - AttributeTypeList::iterator i1; - AttributeList::iterator i2; - AttributeValue::iterator i3; - for (i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); i1++) { - std::cout << "[ " << i1->first << " ]\n"; - for (i2 = i1->second.begin(); i2 != i1->second.end(); i2++) { - std::cout << "\t[ " << i2->first << " ]\n"; - for (i3 = i2->second.begin(); i3 != i2->second.end(); i3++) { - std::cout << "\t\t" << i3->first << " = " << i3->second << "\n"; - } - } - } - std::cout << std::endl; - } - */ - @end |