From 43402ca7112cc6d00fda2754872bf7154a38cc9b Mon Sep 17 00:00:00 2001 From: Siddhant085 Date: Mon, 15 Aug 2016 18:39:27 +0530 Subject: [PATCH 1/7] Fixed test.pike and userPermission.pike to use all the objects as TestUser --- tests/coal-pike/test.pike | 31 +++++++++++++++++------------ tests/coal-pike/userPermission.pike | 15 ++++++++++---- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/tests/coal-pike/test.pike b/tests/coal-pike/test.pike index 46be486..d444687 100644 --- a/tests/coal-pike/test.pike +++ b/tests/coal-pike/test.pike @@ -30,10 +30,9 @@ class Test{ //Delete the objects created by the test suite and exit void destroy(){ - me->move(OBJ("/home/steam")); - object obj = OBJ("/TestRoom"); - if(obj!=0) - obj->delete(); + conn->login("root","steam",1); + me->move(OBJ("/home/steam")); + _Server->get_module("users")->get_user("TestUser")->delete(); // write("===============================\n"); } @@ -51,9 +50,14 @@ class Test{ conn->connect_server(host,port); conn->login("root","steam",1); _Server = conn->SteamObj(0); - me = _Server->get_module("users")->lookup("root"); - _Server->get_factory("Room")->execute((["name":"TestRoom"]))->move(OBJ("/")); - me->move(OBJ("/TestRoom")); + object x = _Server->get_module("users")->get_user("TestUser"); + if(x) x->delete(); + _Server->get_factory("User")->execute((["name":"TestUser","pw":"password"])); + _Server->get_module("users")->get_user("TestUser")->activate_user(); + conn->login("TestUser","password",1); + me = _Server->get_module("users")->lookup("TestUser"); + _Server->get_factory("Room")->execute((["name":"TestRoom"]))->move(OBJ("/home/TestUser")); + me->move(OBJ("/home/TestUser")); write("===============================\n"); } @@ -78,13 +82,14 @@ class Test{ int main(){ - Test move = Test("move",4); - move->run(); - Test create = Test("create",3); - create->run(); - Test getEnv = Test("getEnv",1); - getEnv->run(); +// Test move = Test("move",4); +// move->run(); +// Test create = Test("create",3); +// create->run(); +// Test getEnv = Test("getEnv",1); +// getEnv->run(); Test perm = Test("userPermission",1); perm->run(); } +//test diff --git a/tests/coal-pike/userPermission.pike b/tests/coal-pike/userPermission.pike index a6cee87..8b2600f 100644 --- a/tests/coal-pike/userPermission.pike +++ b/tests/coal-pike/userPermission.pike @@ -4,10 +4,16 @@ int test(object me,object _Server,object...args) { int pass = 0; - _Server->get_factory("User")->execute((["name":"testUser1","pw":"password1"])); - _Server->get_factory("User")->execute((["name":"testUser2","pw":"password2"])); - object user1 = _Server->get_module("users")->get_user("testUser1"); + args[0]->login("root","steam",1); + object user1 = _Server->get_module("users")->get_user("testUser1"); object user2 = _Server->get_module("users")->get_user("testUser2"); + if(user1)user1->delete(); + if(user2)user2->delete(); + _Server->get_factory("User")->execute((["name":"testUser1","pw":"password1"])); + _Server->get_factory("User")->execute((["name":"testUser2","pw":"password2"])); + user1 = _Server->get_module("users")->get_user("testUser1"); + user2 = _Server->get_module("users")->get_user("testUser2"); + user1->activate_user(); user2->activate_user(); args[0]->login("testUser1","password1",1); @@ -23,5 +29,6 @@ int test(object me,object _Server,object...args) args[0]->login("root","steam",1); user1->delete(); user2->delete(); - return pass; + args[0]->login("TestUser","password",1); + return pass; } From ebc631919e098f7e4b3b376f16b09cf5446d11b0 Mon Sep 17 00:00:00 2001 From: Siddhant085 Date: Mon, 15 Aug 2016 19:26:26 +0530 Subject: [PATCH 2/7] Fixed move.pike to use all objects as TestUser --- tests/coal-pike/move.pike | 36 ++++++++++++++++++++---------------- tests/coal-pike/test.pike | 6 +++--- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/tests/coal-pike/move.pike b/tests/coal-pike/move.pike index 13ac18a..8947760 100644 --- a/tests/coal-pike/move.pike +++ b/tests/coal-pike/move.pike @@ -4,14 +4,14 @@ int testcase1(object me,object _Server,object...args) { int pass = 0; - _Server->get_factory("Room")->execute((["name":"TestsubRoom"]))->move(OBJ("/TestRoom")); - object obj = OBJ("/TestRoom/TestsubRoom"); + _Server->get_factory("Room")->execute((["name":"TestsubRoom"]))->move(OBJ("/home/TestUser/TestRoom")); + object obj = OBJ("/home/TestUser/TestRoom/TestsubRoom"); mixed result = catch{me->move(obj);}; write("Moving user: "); if(result == 0)pass=1; if(pass==1)write("passed\n"); else write("failed\n"); - me->move(OBJ("/TestRoom")); + me->move(OBJ("/home/TestUser/TestRoom")); if(obj!=0)obj->delete(); return pass; } @@ -23,16 +23,18 @@ int testcase2(object me,object _Server,object...args) int pass = 1; object code = ((program)"move_nonexistential.pike")(); //imports the file containing the generalized test case array(function) foo = values(code); - _Server->get_factory("Room")->execute((["name":"move2Room"]))->move(OBJ("/TestRoom")); //Test Room to move + _Server->get_factory("Room")->execute((["name":"move2Room"]))->move(OBJ("/home/TestUser/TestRoom")); //Test Room to move + object test = _Server->get_module("users")->get_user("move2User"); + args[0]->login("root","steam",1); + if(test)test->delete(); + args[0]->login("TestUser","password",1); _Server->get_factory("User")->execute((["name":"move2User","pw":"testpass","email":"abc@example.com"])); //Test User to move + args[0]->login("root","steam",1); _Server->get_module("users")->get_user("move2User")->activate_user(); + args[0]->login("TestUser","password",1); array(object) testObjects = allocate(2); -// do{ - testObjects[0]=OBJ("/TestRoom/move2Room"); -// }while(testObjects[0]==0); -// do{ + testObjects[0]=OBJ("/home/TestUser/TestRoom/move2Room"); testObjects[1]=_Server->get_module("users")->get_user("move2User"); -// }while(testObjects[1]==0); int success = 1; for(int i = 0;iget_class()+ " to a non existential path: "); @@ -43,9 +45,11 @@ int testcase2(object me,object _Server,object...args) } if(success==0)pass=0; + args[0]->login("root","steam",1); if(testObjects[1]!=0) testObjects[1]->delete(); - return pass; + args[0]->login("TestUser","password",1); + return pass; } //Moving user into a container @@ -53,8 +57,8 @@ int testcase3(object me,object _Server,object...args) { int pass = 0; mixed result = 0; - int res =_Server->get_factory("Container")->execute((["name":"Testmove3"]))->move(OBJ("/TestRoom")); - object obj = OBJ("/TestRoom/Testmove3"); + int res =_Server->get_factory("Container")->execute((["name":"Testmove3"]))->move(OBJ("/home/TestUser/TestRoom")); + object obj = OBJ("/home/TestUser/TestRoom/Testmove3"); result = catch{me->move(obj);}; write("Moving user into a container: "); if(result != 0)pass=1; @@ -68,10 +72,10 @@ int testcase3(object me,object _Server,object...args) int testcase4(object me,object _Server,object...args) { int pass = 0; - _Server->get_factory("Room")->execute((["name":"Testmove4"]))->move(OBJ("/TestRoom")); - _Server->get_factory("Container")->execute((["name":"Testcontmove4"]))->move(OBJ("/TestRoom")); - object room = OBJ("/TestRoom/Testmove4"); - object container = OBJ("/TestRoom/Testcontmove4"); + _Server->get_factory("Room")->execute((["name":"Testmove4"]))->move(OBJ("/home/TestUser/TestRoom")); + _Server->get_factory("Container")->execute((["name":"Testcontmove4"]))->move(OBJ("/home/TestUser/TestRoom")); + object room = OBJ("/home/TestUser/TestRoom/Testmove4"); + object container = OBJ("/home/TestUser/TestRoom/Testcontmove4"); mixed result = catch{room->move(container);}; write("Moving room inside container: "); if(result!=0)pass=1; diff --git a/tests/coal-pike/test.pike b/tests/coal-pike/test.pike index d444687..60fe209 100644 --- a/tests/coal-pike/test.pike +++ b/tests/coal-pike/test.pike @@ -33,6 +33,7 @@ class Test{ conn->login("root","steam",1); me->move(OBJ("/home/steam")); _Server->get_module("users")->get_user("TestUser")->delete(); + conn->logout(); // write("===============================\n"); } @@ -82,8 +83,8 @@ class Test{ int main(){ -// Test move = Test("move",4); -// move->run(); + Test move = Test("move",4); + move->run(); // Test create = Test("create",3); // create->run(); // Test getEnv = Test("getEnv",1); @@ -92,4 +93,3 @@ int main(){ Test perm = Test("userPermission",1); perm->run(); } -//test From 8098563b7c3c7f228a317ab560e2b7e814e729bf Mon Sep 17 00:00:00 2001 From: Siddhant085 Date: Mon, 15 Aug 2016 19:38:27 +0530 Subject: [PATCH 3/7] Fixed getEnv.pike to access all objects as TestUser --- tests/coal-pike/getEnv.pike | 4 ++-- tests/coal-pike/test.pike | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/coal-pike/getEnv.pike b/tests/coal-pike/getEnv.pike index cf2deae..7bd9e9d 100644 --- a/tests/coal-pike/getEnv.pike +++ b/tests/coal-pike/getEnv.pike @@ -3,9 +3,9 @@ // Tests the function getEnvironment int callingFunction(object me,object _Server,object...args) { - object parent = OBJ("/TestRoom"); + object parent = OBJ("/home/TestUser/TestRoom"); _Server->get_factory("Room")->execute((["name":"getEnv"]))->move(parent); - object obj = OBJ("/TestRoom/getEnv"); + object obj = OBJ("/home/TestUser/TestRoom/getEnv"); int pass = 0; write("Calling get_environment: "); if(parent==obj->get_environment()) pass=1; diff --git a/tests/coal-pike/test.pike b/tests/coal-pike/test.pike index 60fe209..820aef1 100644 --- a/tests/coal-pike/test.pike +++ b/tests/coal-pike/test.pike @@ -87,8 +87,8 @@ int main(){ move->run(); // Test create = Test("create",3); // create->run(); -// Test getEnv = Test("getEnv",1); -// getEnv->run(); + Test getEnv = Test("getEnv",1); + getEnv->run(); Test perm = Test("userPermission",1); perm->run(); From 8e11c735171730ca2d16ede9a8a539d0716d8629 Mon Sep 17 00:00:00 2001 From: Siddhant085 Date: Tue, 16 Aug 2016 00:58:30 +0530 Subject: [PATCH 4/7] Fixed create.pike and removed unnecessary delete statements --- tests/coal-pike/create.pike | 4 ++-- tests/coal-pike/create_object.pike | 4 +--- tests/coal-pike/move.pike | 5 ----- tests/coal-pike/test.pike | 4 ++-- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/tests/coal-pike/create.pike b/tests/coal-pike/create.pike index ed85a3c..091f04e 100644 --- a/tests/coal-pike/create.pike +++ b/tests/coal-pike/create.pike @@ -26,7 +26,7 @@ int invalidClass(object me,object _Server,object...args) if(result == 0) pass =1; return pass; } - +/* //Creating user int createUser(object me,object _Server,object...args) { @@ -42,4 +42,4 @@ int createUser(object me,object _Server,object...args) else write("failed\n"); return pass; } - +*/ diff --git a/tests/coal-pike/create_object.pike b/tests/coal-pike/create_object.pike index 0603d77..abbcfdc 100644 --- a/tests/coal-pike/create_object.pike +++ b/tests/coal-pike/create_object.pike @@ -4,12 +4,10 @@ int testcase(object me,object _Server,string type) { int pass = 0; - object room = OBJ("/TestRoom"); + object room = OBJ("/home/TestUser/TestRoom"); mixed result =catch{ _Server->get_factory(type)->execute((["name":"TestObj"+type]))->move(room); }; if(result ==0)pass=1; else if((type=="User")&& result!=0)pass=1; - object ref = OBJ("/TestRoom/TestObj"+type); - if(ref!=0)ref->delete(); return pass; } diff --git a/tests/coal-pike/move.pike b/tests/coal-pike/move.pike index 8947760..90474a5 100644 --- a/tests/coal-pike/move.pike +++ b/tests/coal-pike/move.pike @@ -64,7 +64,6 @@ int testcase3(object me,object _Server,object...args) if(result != 0)pass=1; if(pass==1)write("passed\n"); else write("failed\n"); - if(obj!=0)obj->delete(); return pass; } @@ -81,9 +80,5 @@ int testcase4(object me,object _Server,object...args) if(result!=0)pass=1; if(pass==1)write("passed\n"); else write("failed\n"); - if(room!=0) - room->delete(); - if(container!=0) - container->delete(); return pass; } diff --git a/tests/coal-pike/test.pike b/tests/coal-pike/test.pike index 820aef1..8fc4b48 100644 --- a/tests/coal-pike/test.pike +++ b/tests/coal-pike/test.pike @@ -85,8 +85,8 @@ class Test{ int main(){ Test move = Test("move",4); move->run(); -// Test create = Test("create",3); -// create->run(); + Test create = Test("create",2); + create->run(); Test getEnv = Test("getEnv",1); getEnv->run(); From a7311ad049d514046d4a8cd391c76fe3d9d86ee0 Mon Sep 17 00:00:00 2001 From: Siddhant085 Date: Tue, 16 Aug 2016 17:32:08 +0530 Subject: [PATCH 5/7] Added the createUser function to use to connection object logged in as root to create a new user --- tests/coal-pike/test.pike | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tests/coal-pike/test.pike b/tests/coal-pike/test.pike index 8fc4b48..0364ba8 100644 --- a/tests/coal-pike/test.pike +++ b/tests/coal-pike/test.pike @@ -15,7 +15,8 @@ class Test{ object _Server; object me; object conn; - + object _ServerRoot; + object connRoot; //array(Testcase) cases; int cases; @@ -49,12 +50,12 @@ class Test{ master()->add_program_path(server_path+"/server/net/coal/"); conn = ((program)"../spm/client_base.pike")(); conn->connect_server(host,port); - conn->login("root","steam",1); + connRoot = ((program)"../spm/client_base.pike")(); + connRoot->connect_server(host,port); + connRoot->login("root","steam",1); + _ServerRoot = connRoot->SteamObj(0); _Server = conn->SteamObj(0); - object x = _Server->get_module("users")->get_user("TestUser"); - if(x) x->delete(); - _Server->get_factory("User")->execute((["name":"TestUser","pw":"password"])); - _Server->get_module("users")->get_user("TestUser")->activate_user(); + createUser("TestUser","password"); conn->login("TestUser","password",1); me = _Server->get_module("users")->lookup("TestUser"); _Server->get_factory("Room")->execute((["name":"TestRoom"]))->move(OBJ("/home/TestUser")); @@ -71,13 +72,25 @@ class Test{ array(function) foo = values(code); int success = 0; for(int i=0;i< cases;i++){ //loop through the cases and execute them one by one - if(foo[i](me,_Server,conn)==1){ + if(foo[i](me,_Server,conn,createUser)==1){ success+=1; } } write("success: "+success+"\nfails: "+(cases-success)+"\n"); } + + int createUser(string name,string password){ + int result = 0; + object user = _ServerRoot->get_module("users")->get_user(name); + if(user)user->delete(); + mixed res = catch{ + _ServerRoot->get_factory("User")->execute((["name":name,"pw":password])); + _ServerRoot->get_module("users")->get_user(name)->activate_user(); + }; + if (res=0){write("Error creating user");return 0;} + else return 1; + } } From bc6674d2269f5e21a2dd779115f5d3d6bd5d9774 Mon Sep 17 00:00:00 2001 From: Siddhant085 Date: Tue, 16 Aug 2016 17:45:56 +0530 Subject: [PATCH 6/7] Changed the test cases to use createUser function to create new users --- tests/coal-pike/move.pike | 13 +------------ tests/coal-pike/userPermission.pike | 20 +++++--------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/tests/coal-pike/move.pike b/tests/coal-pike/move.pike index 90474a5..2769fa4 100644 --- a/tests/coal-pike/move.pike +++ b/tests/coal-pike/move.pike @@ -24,14 +24,7 @@ int testcase2(object me,object _Server,object...args) object code = ((program)"move_nonexistential.pike")(); //imports the file containing the generalized test case array(function) foo = values(code); _Server->get_factory("Room")->execute((["name":"move2Room"]))->move(OBJ("/home/TestUser/TestRoom")); //Test Room to move - object test = _Server->get_module("users")->get_user("move2User"); - args[0]->login("root","steam",1); - if(test)test->delete(); - args[0]->login("TestUser","password",1); - _Server->get_factory("User")->execute((["name":"move2User","pw":"testpass","email":"abc@example.com"])); //Test User to move - args[0]->login("root","steam",1); - _Server->get_module("users")->get_user("move2User")->activate_user(); - args[0]->login("TestUser","password",1); + args[1]("move2User","testpass"); array(object) testObjects = allocate(2); testObjects[0]=OBJ("/home/TestUser/TestRoom/move2Room"); testObjects[1]=_Server->get_module("users")->get_user("move2User"); @@ -45,10 +38,6 @@ int testcase2(object me,object _Server,object...args) } if(success==0)pass=0; - args[0]->login("root","steam",1); - if(testObjects[1]!=0) - testObjects[1]->delete(); - args[0]->login("TestUser","password",1); return pass; } diff --git a/tests/coal-pike/userPermission.pike b/tests/coal-pike/userPermission.pike index 8b2600f..8f9e46a 100644 --- a/tests/coal-pike/userPermission.pike +++ b/tests/coal-pike/userPermission.pike @@ -4,18 +4,8 @@ int test(object me,object _Server,object...args) { int pass = 0; - args[0]->login("root","steam",1); - object user1 = _Server->get_module("users")->get_user("testUser1"); - object user2 = _Server->get_module("users")->get_user("testUser2"); - if(user1)user1->delete(); - if(user2)user2->delete(); - _Server->get_factory("User")->execute((["name":"testUser1","pw":"password1"])); - _Server->get_factory("User")->execute((["name":"testUser2","pw":"password2"])); - user1 = _Server->get_module("users")->get_user("testUser1"); - user2 = _Server->get_module("users")->get_user("testUser2"); - - user1->activate_user(); - user2->activate_user(); + args[1]("testUser1","password1"); + args[1]("testUser2","password2"); args[0]->login("testUser1","password1",1); _Server->get_factory("Container")->execute((["name":"testCont"]))->move(OBJ("/home/testUser1")); //object being created by user1 and it belongs to user1. args[0]->login("testUser2","password2",1); @@ -26,9 +16,9 @@ int test(object me,object _Server,object...args) write("passed\n"); } else write("failed\n"); - args[0]->login("root","steam",1); - user1->delete(); - user2->delete(); +// args[0]->login("root","steam",1); +// user1->delete(); +// user2->delete(); args[0]->login("TestUser","password",1); return pass; } From 470468a5e94a183bf18fe0b1883c0ccc636867b5 Mon Sep 17 00:00:00 2001 From: Siddhant085 Date: Tue, 16 Aug 2016 18:16:40 +0530 Subject: [PATCH 7/7] Minor bug fixes --- tests/coal-pike/test.pike | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/coal-pike/test.pike b/tests/coal-pike/test.pike index 0364ba8..b7fa422 100644 --- a/tests/coal-pike/test.pike +++ b/tests/coal-pike/test.pike @@ -30,11 +30,11 @@ class Test{ } //Delete the objects created by the test suite and exit - void destroy(){ - conn->login("root","steam",1); - me->move(OBJ("/home/steam")); - _Server->get_module("users")->get_user("TestUser")->delete(); + void clear(){ + object user = _ServerRoot->get_module("users")->get_user("TestUser"); + if(user)user->delete(); conn->logout(); + connRoot->logout(); // write("===============================\n"); } @@ -98,11 +98,14 @@ class Test{ int main(){ Test move = Test("move",4); move->run(); + move->clear(); Test create = Test("create",2); create->run(); + create->clear(); Test getEnv = Test("getEnv",1); getEnv->run(); - + getEnv->clear(); Test perm = Test("userPermission",1); perm->run(); + perm->clear(); }