1 files changed, 14 insertions, 106 deletions
diff --git a/src/tests/hash.cpp b/src/tests/hash.cpp
index 2fc6968..73cfb27 100644
--- a/src/tests/hash.cpp
+++ b/src/tests/hash.cpp
@@ -1,116 +1,24 @@
-#include "hash.h"
+#include "bu/hash.h"
-#include "staticstring.h"
+#include "bu/sptr.h"
-int main()
+typedef struct Bob
 {
-        const char *names[]={
+        int nID;
-                "Homer the Great",
+} Bob;
-                "And Maggie Makes Three",
-                "Bart's Comet",
-                "Homie The Clown",
-                "Bart Vs Australia",
-                "Homer vs Patty and Selma",
-                "A star is burns",
-                "Lisa's Wedding",
-                "Two Dozen and One Greyhounds",
-                "The PTA Disbands",
-                "Round Springfield",
-                "The Springfield connection",
-                "Lemon of Troy",
-                "Who Shot Mr. Burns (Pt. 1)",
-                "Who Shot Mr. Burns (pt. 2)",
-                "Radioactive Man",
-                "Home Sweet Homediddly-dum-doodly",
-                "Bart Sells His Soul",
-                "Lisa the Vegetarian",
-                "Treehouse of horror VI",
-                "King Size Homer",
-                "Mother Simpson",
-                "Sideshow Bob's Last Gleaming",
-                "The Simpson's 138th Show Spectacular",
-                "Marge Be Not Proud",
-                "Team Homer",
-                "Two Bad Neighbors",
-                "Scenes From the Class Struggle in Springfield",
-                "Bart the Fink",
-                "Lisa the Iconoclast",
-                "Homer the Smithers",
-                "The Day the Violence Died",
-                "A Fish Called Selma",
-                "Bart on the road",
-                "22 Short Films about Springfield",
-                "The Curse of the Flying Hellfish",
-                "Much Apu about Nothing",
-                "Homerpalooza",
-                "The Summer of 4 Ft 2",
-                "Treehouse of Horror VII",
-                "You Only Move Twice",
-                "The Homer They Fall",
-                "Burns Baby Burns",
-                "Bart After Dark",
-                "A Millhouse Divided",
-                "Lisas Date With Destiny",
-                "Hurricane Neddy",
-                "The Mysterious Voyage of Our Homer",
-                "The Springfield Files",
-                "The Twisted World of Marge Simpson",
-                "Mountain of Madness",
-                NULL
-        };
-        Hash<const char *, int> sTest;
-        printf("Inserting\n-------------------\n\n");
-        for( int j = 0; j < 33; j++ )
-        {
-                sTest[names[j]] = j;
-        }
-        
-        printf("Test1: %d, Test2: %d\n", sTest.has("Lemon of Troy"), sTest.has(std::string("Lemon of Troy").c_str() ) );
-        sTest.has(std::string("Lemon of Troy").c_str() );
-        printf("Getting\n-------------------\n\n");
-        sTest.erase("Homer the Great");
-        sTest["Bart's Comet"].erase();
-        for( Hash<const char *, int>::iterator i = sTest.begin();
+int main()
-                 i != sTest.end(); i++ )
+{
-        {
+        Bu::Hash<int, Bu::SPtr<const Bob> > lb;
-                Hash<const char *, int>::iterator j = i;
+        for( int j = 0; j < 10; j++ )
-                printf("%d: %s\n", (*j).second, (*j).first );
-        }
-        printf("Testing\n-------------------\n\n");
-        for( int j = 0; j < 33; j++ )
        {
-                if( sTest.has(names[j]) )
+                Bob *b = new Bob;
-                {
+                b->nID = j;
-                        if( sTest[names[j]] != j )
+                lb.insert( j, b );
-                        {
-                                printf("'%s' should be %d, is %d\n",
-                                        names[j], j,
-                                        sTest[names[j]].value()
-                                        );
-                        }
-                }
-                else
-                {
-                        printf("Missing element %d, '%s'\n", j, names[j] );
-                }
        }
-        printf("Clearing\n-------------------\n\n");
+        for( int j = 0; j < 10; j++ )
-        sTest.clear();
-        
-        for( Hash<const char *, int>::iterator i = sTest.begin();
-                 i != sTest.end(); i++ )
        {
-                Hash<const char *, int>::iterator j = i;
+                printf("%d\n", lb[j].value()->nID );
-                printf("%d: %s\n", (*j).second, (*j).first );
        }
 }

diff --git a/src/tests/hash.cpp b/src/tests/hash.cpp index 2fc6968..73cfb27 100644 --- a/src/tests/hash.cpp +++ b/src/tests/hash.cpp
@@ -1,116 +1,24 @@
1	#include "hash.h"	1	#include "bu/hash.h"
2	#include "staticstring.h"	2	#include "bu/sptr.h"
3		3
4	int main()	4	typedef struct Bob
5	{	5	{
6	const char *names[]={	6	int nID;
7	"Homer the Great",	7	} Bob;
8	"And Maggie Makes Three",
9	"Bart's Comet",
10	"Homie The Clown",
11	"Bart Vs Australia",
12	"Homer vs Patty and Selma",
13	"A star is burns",
14	"Lisa's Wedding",
15	"Two Dozen and One Greyhounds",
16	"The PTA Disbands",
17	"Round Springfield",
18	"The Springfield connection",
19	"Lemon of Troy",
20	"Who Shot Mr. Burns (Pt. 1)",
21	"Who Shot Mr. Burns (pt. 2)",
22	"Radioactive Man",
23	"Home Sweet Homediddly-dum-doodly",
24	"Bart Sells His Soul",
25	"Lisa the Vegetarian",
26	"Treehouse of horror VI",
27	"King Size Homer",
28	"Mother Simpson",
29	"Sideshow Bob's Last Gleaming",
30	"The Simpson's 138th Show Spectacular",
31	"Marge Be Not Proud",
32	"Team Homer",
33	"Two Bad Neighbors",
34	"Scenes From the Class Struggle in Springfield",
35	"Bart the Fink",
36	"Lisa the Iconoclast",
37	"Homer the Smithers",
38	"The Day the Violence Died",
39	"A Fish Called Selma",
40	"Bart on the road",
41	"22 Short Films about Springfield",
42	"The Curse of the Flying Hellfish",
43	"Much Apu about Nothing",
44	"Homerpalooza",
45	"The Summer of 4 Ft 2",
46	"Treehouse of Horror VII",
47	"You Only Move Twice",
48	"The Homer They Fall",
49	"Burns Baby Burns",
50	"Bart After Dark",
51	"A Millhouse Divided",
52	"Lisas Date With Destiny",
53	"Hurricane Neddy",
54	"The Mysterious Voyage of Our Homer",
55	"The Springfield Files",
56	"The Twisted World of Marge Simpson",
57	"Mountain of Madness",
58	NULL
59	};
60
61	Hash<const char *, int> sTest;
62
63	printf("Inserting\n-------------------\n\n");
64	for( int j = 0; j < 33; j++ )
65	{
66	sTest[names[j]] = j;
67	}
68
69	printf("Test1: %d, Test2: %d\n", sTest.has("Lemon of Troy"), sTest.has(std::string("Lemon of Troy").c_str() ) );
70
71	sTest.has(std::string("Lemon of Troy").c_str() );
72
73	printf("Getting\n-------------------\n\n");
74
75	sTest.erase("Homer the Great");
76	sTest["Bart's Comet"].erase();
77		8
78	for( Hash<const char *, int>::iterator i = sTest.begin();	9	int main()
79	i != sTest.end(); i++ )	10	{
80	{	11	Bu::Hash<int, Bu::SPtr<const Bob> > lb;
81	Hash<const char *, int>::iterator j = i;	12	for( int j = 0; j < 10; j++ )
82	printf("%d: %s\n", (j).second, (j).first );
83	}
84
85	printf("Testing\n-------------------\n\n");
86	for( int j = 0; j < 33; j++ )
87	{	13	{
88	if( sTest.has(names[j]) )	14	Bob *b = new Bob;
89	{	15	b->nID = j;
90	if( sTest[names[j]] != j )	16	lb.insert( j, b );
91	{
92	printf("'%s' should be %d, is %d\n",
93	names[j], j,
94	sTest[names[j]].value()
95	);
96	}
97	}
98	else
99	{
100	printf("Missing element %d, '%s'\n", j, names[j] );
101	}
102	}	17	}
103		18
104	printf("Clearing\n-------------------\n\n");	19	for( int j = 0; j < 10; j++ )
105
106	sTest.clear();
107
108	for( Hash<const char *, int>::iterator i = sTest.begin();
109	i != sTest.end(); i++ )
110	{	20	{
111	Hash<const char *, int>::iterator j = i;	21	printf("%d\n", lb[j].value()->nID );
112	printf("%d: %s\n", (j).second, (j).first );
113	}	22	}
114
115	}	23	}
116		24