[Igarden-commit] Garden/source/Plugins PluginUtils.cpp, 1.18, 1.18.2.1

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/Plugins
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12033

Modified Files:
      Tag: Release_branch_v1
	PluginUtils.cpp 
Log Message:
Add another unit test

Index: PluginUtils.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Plugins/PluginUtils.cpp,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** PluginUtils.cpp	27 Jun 2006 01:05:25 -0000	1.18
--- PluginUtils.cpp	29 Dec 2006 15:45:40 -0000	1.18.2.1
***************
*** 288,292 ****
  	if(*ptr == '\'')
  	{
! 		while(*ptr != ' \'' && *ptr != '\0')
  			ptr++;
  		token.SetCString(start, ptr-start);
--- 288,292 ----
  	if(*ptr == '\'')
  	{
! 		while(*ptr != '\'' && *ptr != '\0')
  			ptr++;
  		token.SetCString(start, ptr-start);
***************
*** 303,349 ****
  }
  
- #if UNIT_TEST
- static void PrintResult(char *name1, char *name2)
- {
- 	String	nameStr1, nameStr2;
- 	
- 	nameStr1 = String(name1);
- 	nameStr2 = String(name2);
- 	switch(ComparePlantNames(nameStr1, nameStr2))
- 	{
- 		case kExactNameMatch:
- 			printf("%30s vs. %30s        exact match\n", name1, name2);
- 			break;
- 		case kPartialNameMatch:
- 			printf("%30s vs. %30s        partial match\n", name1, name2);
- 			break;
- 		case kNoNameMatch:
- 			printf("%30s vs. %30s        NO match\n", name1, name2);
- 			break;
- 	}
- }
- 
- void TestNameMatches()
- {
- 	// Test name matches
- 	PrintResult("malus", "malus");								// One name match
- 	PrintResult("malus", "acer");								// One name no match
- 	PrintResult("acer rubrum", "acer rubrum");					// Two name
- 	PrintResult("acer rubrum", "acer saccarum");				// Two name no match
- 	PrintResult("acer sp.", "acer saccarum");					// 1.5 name partial match
- 	PrintResult("acer rubrum", "acer sp.");						// 1.5 name partial match
- 	PrintResult("acer rubrum", "acer");							// 1.5 name partial match
- 	PrintResult("acer", "acer sp.");							// 1.5 name partial match
- 	PrintResult("acer", "acer rubrum");							// 1.5 name partial match
- 	PrintResult("malus 'red jade'", "malus 'red jade'");		// One name variety match
- 	PrintResult("malus 'red jade'", "malus var. 'red jade'");	// One name variety match
- 	PrintResult("acer rubrum 'red jade'", "acer rubrum 'red jade'");	// Two name variety match
- 	PrintResult("acer rubrum 'red jade'", "acer rubrum red jade");	// Two name variety match
- 	PrintResult("acer rubrum 'red jade'", "acer rubrum var. red jade");	// Two name variety match
- 	PrintResult("acer rubrum 'red jade'", "acer rubrum var. 'red jade'");	// Two name variety match
- 	PrintResult("acer x rubrum", "acer    x   rubrum");			// Two name variety match
- }
- #endif
- 
  static void SplitPlantName(char *txt, String &genus, String &epithet, String &variety)
  {
--- 303,306 ----
***************
*** 388,391 ****
--- 345,350 ----
  		}
  	}
+ 	if(variety == String("L."))
+ 		variety.SetCString("");
  }