svn commit: samba r17657 - in branches/SOC/sree: .
sree at samba.org
sree at samba.org
Mon Aug 21 06:57:17 GMT 2006
Author: sree
Date: 2006-08-21 06:57:17 +0000 (Mon, 21 Aug 2006)
New Revision: 17657
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17657
Log:
Bring testsuite in test.js in line with those in testprogs/ejs/
Modified:
branches/SOC/sree/test.js
Changeset:
Modified: branches/SOC/sree/test.js
===================================================================
--- branches/SOC/sree/test.js 2006-08-21 06:06:02 UTC (rev 17656)
+++ branches/SOC/sree/test.js 2006-08-21 06:57:17 UTC (rev 17657)
@@ -1,68 +1,154 @@
#!/usr/local/samba/bin/smbscript
+/*
+ Test Suite for usermgmt.esp
+*/
+var options = GetOptions(ARGV, "POPT_COMMON_CREDENTIALS");
+if (options == undefined) {
+ println("Failed to parse options");
+ return -1;
+}
+
+var system_session = system_session();
+var creds = options.get_credentials();
+
libinclude("usermgmt.js");
-// --- MAIN ---
+function test_user_get(sam)
+{
+ print("Testing user_get ... ");
-var options = GetOptions(ARGV, "POPT_COMMON_CREDENTIALS");
+ var user = user_get(sam, "administrator", new Array("name", "unixName"));
+ assert(user['dn']);
+ assert(user['name']);
+ assert(user['unixName']);
+ print("OK.\n");
+}
-var system_session = system_session();
-var creds = options.get_credentials();
+function test_user_add(sam)
+{
+ print("Testing user_add ... ");
-sam = user_init(system_session, creds);
+ var ok = user_add(sam, "jrandomuser", "J. Random User",
+ "A Random Test User", "simple", 0, OUF_CHANGE_PASSWORD_ON_LOGON, "jru");
+ assert(ok);
+ var props = user_get(sam, "jrandomuser", new Array("name", "displayname", "description", "unixName"));
+ assert(props['name'] == "jrandomuser");
+ assert(props['displayName'] == "J. Random User");
+ assert(props['description'] == "A Random Test User");
+ assert(props['unixName'] == "jru");
-if(user_add(sam, "sree", "Sreepathi Pai",
- "First Test User", "simple", 0, OUF_CHANGE_PASSWORD_ON_LOGON, "sree"))
- print("User successfully added!\n");
-else
- print("Failed to add user!\n");
+ print("OK.\n");
+}
-printVars(user_get(sam, "sree", new Array("useraccountcontrol", "pwdLastSet")));
+function test_user_rename(sam)
+{
+ print("Testing user_rename ... ");
+
+ var ok = user_rename(sam, "jrandomuser", "jrurenamed");
+ assert(ok);
+ assert(user_rename(sam, "jrurenamed", "jrandomuser"));
-if(user_rename(sam, "sree", "sreetest"))
- print("User successfully renamed!\n");
-else
- print("User rename failed!\n")
+ print("OK.\n");
+}
-printVars(user_get(sam, "sreetest", new Array("useraccountcontrol")));
+function test_user_profile_set(sam)
+{
+ print("Testing user_profile_set ... ");
+
+ var ok = user_profile_set(sam, "jrandomuser", "\\\\profiles\\jru", "\\\\someserver\\logon.bat", "\\\\homes\\jru", "y:");
+ assert(ok);
+ var props = user_get(sam, "jrandomuser", new Array("profilePath", "scriptPath", "homeDirectory", "homeDrive"));
-if(user_profile_set(sam, "sreetest", "\\\\profiles\\sreetest", "\\\\someserver\\logon.bat", "\\\\homes\\sreetest", "z:")){
- print("Successfully set profile parameters\n");
+ assert(props['profilePath'] == "\\\\profiles\\jru");
+ assert(props['scriptPath'] == "\\\\someserver\\logon.bat");
+ assert(props['homeDirectory'] == "\\\\homes\\jru");
+ assert(props['homeDrive'] == "y:");
+
+ print("OK.\n");
+}
+
+function test_user_general_set(sam)
+{
+ print("Testing user_general_set ... ");
- printVars(user_get(sam, "sreetest", new Array("profilePath", "scriptPath", "homeDirectory", "homeDrive")));
+ var ok = user_general_set(sam, "jrandomuser", "J R User", "Tests going on...", 0x202, "other_jru");
+ assert(ok);
+ var props = user_get(sam, "jrandomuser", new Array("displayName", "description", "userAccountControl", "unixName"));
+ assert(props['displayName'] == "J R User");
+ assert(props['description'] == "Tests going on...");
+ assert(props['userAccountControl'] == 0x202);
+ assert(props['unixName'] == "other_jru");
+
+ print("OK.\n");
}
-else
- print("Failed to set user profile properties");
-if(user_general_set(sam, "sreetest", "Pai Sreepathi", "Still testing...", 0x202, "another_sree"))
+function test_user_group_get(sam)
{
- print("Set user's general properties!");
- printVars(user_get(sam, "sreetest", new Array("displayName", "description", "userAccountControl", "unixName")));
+ print("Testing user_group_get ... ");
+
+ var groups = user_group_get(sam, "jrandomuser");
+ assert(groups != false);
+
+ print("OK.\n");
}
-else
- print("Failed to set user's general properties");
-if(user_group_add(sam, "sreetest", "Domain Admins"))
+function test_user_group_add(sam)
{
- print("Successfully added to group Domain Admins\n");
- printVars(user_group_get(sam, "sreetest"));
+ print("Testing user_group_add ... ");
+
+ var group_dn = sprintf("CN=Domain Admins,CN=Users,%s", sam.domain_dn);
+ var ok = user_group_add(sam, "jrandomuser", group_dn);
+ assert(ok);
+
+ print("OK.\n");
}
-else
- print("Failed to add to group!");
-if(user_group_remove(sam, "sreetest", "Domain Admins"))
+function test_user_group_remove(sam)
{
- print("Successfully removed from group Domain Admins\n");
- printVars(user_group_get(sam, "sreetest"));
+ print("Testing user_group_remove ... ");
+
+ var group_dn = sprintf("CN=Domain Admins,CN=Users,%s", sam.domain_dn);
+ var ok = user_group_remove(sam, "jrandomuser", group_dn);
+ assert(ok);
+
+ print("OK.\n");
}
-else
- print("Failed to remove from group!");
-if(user_delete(sam, "sreetest"))
- print("User successfully deleted!\n");
-else
- print("Failed to delete user!\n");
+function test_user_remove(sam)
+{
+ print("Testing user_remove ... ");
-print("\n");
+ var ok = user_delete(sam, "jrandomuser");
+ assert(ok);
+ print("OK.\n");
+}
+
+function test_user_password_set(sam)
+{
+ print("Testing user_password_set ... ");
+
+ var ok = user_password_set(sam, "jrandomuser", "randompasswd");
+ assert(ok);
+
+ print("OK.\n");
+}
+
+print("Testing intialization ... ");
+sam = user_init(system_session, creds);
+assert(sam != null);
+print("OK.\n");
+
+test_user_get(sam);
+test_user_add(sam);
+test_user_general_set(sam);
+test_user_profile_set(sam);
+test_user_group_get(sam);
+test_user_group_add(sam);
+test_user_group_remove(sam);
+test_user_rename(sam);
+test_user_password_set(sam);
+test_user_remove(sam);
+
user_deinit(sam);
More information about the samba-cvs
mailing list