Modified:
branches/5.2/MySql.Web/Providers/Source/MembershipProvider.cs
branches/5.2/MySql.Web/Providers/Source/RoleProvider.cs
branches/5.2/MySql.Web/Providers/Source/SchemaManager.cs
branches/5.2/MySql.Web/Tests/App.config
branches/5.2/MySql.Web/Tests/ProfileTests.cs
branches/5.2/MySql.Web/Tests/RoleManagement.cs
branches/5.2/MySql.Web/Tests/UserManagement.cs
Log:
simple fixes to simple bugs in our web providers
Modified: branches/5.2/MySql.Web/Providers/Source/MembershipProvider.cs
===================================================================
--- branches/5.2/MySql.Web/Providers/Source/MembershipProvider.cs 2008-02-25 21:15:55 UTC (rev 1193)
+++ branches/5.2/MySql.Web/Providers/Source/MembershipProvider.cs 2008-02-25 23:57:24 UTC (rev 1194)
@@ -99,7 +99,7 @@
if (string.IsNullOrEmpty(config["description"]))
{
config.Remove("description");
- config.Add("description", "MySQL Membership provider");
+ config.Add("description", "MySQL default application");
}
base.Initialize(name, config);
Modified: branches/5.2/MySql.Web/Providers/Source/RoleProvider.cs
===================================================================
--- branches/5.2/MySql.Web/Providers/Source/RoleProvider.cs 2008-02-25 21:15:55 UTC (rev 1193)
+++ branches/5.2/MySql.Web/Providers/Source/RoleProvider.cs 2008-02-25 23:57:24 UTC (rev 1194)
@@ -575,7 +575,8 @@
connection);
cmd.Parameters.AddWithValue("@name", username);
cmd.Parameters.AddWithValue("@appId", applicationId);
- return (int)cmd.ExecuteScalar();
+ object id = cmd.ExecuteScalar();
+ return Convert.ToInt32(id);
}
private int GetRoleId(MySqlConnection connection, string rolename)
Modified: branches/5.2/MySql.Web/Providers/Source/SchemaManager.cs
===================================================================
--- branches/5.2/MySql.Web/Providers/Source/SchemaManager.cs 2008-02-25 21:15:55 UTC (rev 1193)
+++ branches/5.2/MySql.Web/Providers/Source/SchemaManager.cs 2008-02-25 23:57:24 UTC (rev 1194)
@@ -160,17 +160,22 @@
// no need to create another one
if (applicationId > 0) return;
- MySqlCommand cmd = new MySqlCommand(
- @"INSERT INTO my_aspnet_Applications VALUES (NULL, @appName, @appDesc)",
- connection);
+ MySqlCommand cmd = new MySqlCommand(@"SELECT id FROM my_aspnet_Applications
+ WHERE name = @appName", connection);
cmd.Parameters.AddWithValue("@appName", applicationName);
- cmd.Parameters.AddWithValue("@appDesc", applicationDesc);
- int recordsAffected = cmd.ExecuteNonQuery();
- if (recordsAffected != 1)
- throw new ProviderException(Resources.UnableToCreateApplication);
+ object appId = cmd.ExecuteScalar();
+ if (appId == null)
+ {
+ cmd.CommandText = @"INSERT INTO my_aspnet_Applications VALUES (NULL, @appName, @appDesc)";
+ cmd.Parameters.AddWithValue("@appDesc", applicationDesc);
+ int recordsAffected = cmd.ExecuteNonQuery();
+ if (recordsAffected != 1)
+ throw new ProviderException(Resources.UnableToCreateApplication);
- cmd.CommandText = "SELECT LAST_INSERT_ID()";
- applicationId = Convert.ToInt32(cmd.ExecuteScalar());
+ cmd.CommandText = "SELECT LAST_INSERT_ID()";
+ appId = cmd.ExecuteScalar();
+ }
+ applicationId = Convert.ToInt32(appId);
}
}
Modified: branches/5.2/MySql.Web/Tests/App.config
===================================================================
--- branches/5.2/MySql.Web/Tests/App.config 2008-02-25 21:15:55 UTC (rev 1193)
+++ branches/5.2/MySql.Web/Tests/App.config 2008-02-25 23:57:24 UTC (rev 1194)
@@ -5,7 +5,7 @@
<providers>
<clear/>
<add name="MySqlProfileProvider" connectionStringName="LocalMySqlServer"
- applicationName="/" type="MySql.Web.Profile.MySQLProfileProvider, mysql.web, Version=5.2.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+ applicationName="/" type="MySql.Web.Profile.MySQLProfileProvider, mysql.web, Version=5.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
</providers>
<properties>
<add name="Name"/>
Modified: branches/5.2/MySql.Web/Tests/ProfileTests.cs
===================================================================
--- branches/5.2/MySql.Web/Tests/ProfileTests.cs 2008-02-25 21:15:55 UTC (rev 1193)
+++ branches/5.2/MySql.Web/Tests/ProfileTests.cs 2008-02-25 23:57:24 UTC (rev 1194)
@@ -50,10 +50,6 @@
[Test]
public void SettingValuesCreatesAnAppAndUserId()
{
- // make sure there are no apps currently
- DataTable dt = FillTable("SELECT * FROM my_aspnet_applications");
- Assert.AreEqual(0, dt.Rows.Count);
-
MySQLProfileProvider provider = InitProfileProvider();
SettingsContext ctx = new SettingsContext();
ctx.Add("IsAuthenticated", false);
@@ -69,21 +65,17 @@
provider.SetPropertyValues(ctx, values);
- dt = FillTable("SELECT * FROM my_aspnet_applications");
+ DataTable dt = FillTable("SELECT * FROM my_aspnet_Applications");
Assert.AreEqual(1, dt.Rows.Count);
- dt = FillTable("SELECT * FROM my_aspnet_users");
+ dt = FillTable("SELECT * FROM my_aspnet_Users");
Assert.AreEqual(1, dt.Rows.Count);
- dt = FillTable("SELECT * FROM my_aspnet_profiles");
+ dt = FillTable("SELECT * FROM my_aspnet_Profiles");
Assert.AreEqual(1, dt.Rows.Count);
}
[Test]
public void AnonymousUserSettingNonAnonymousProperties()
{
- // make sure there are no apps currently
- DataTable dt = FillTable("SELECT * FROM my_aspnet_applications");
- Assert.AreEqual(0, dt.Rows.Count);
-
MySQLProfileProvider provider = InitProfileProvider();
SettingsContext ctx = new SettingsContext();
ctx.Add("IsAuthenticated", false);
@@ -99,21 +91,17 @@
provider.SetPropertyValues(ctx, values);
- dt = FillTable("SELECT * FROM my_aspnet_applications");
+ DataTable dt = FillTable("SELECT * FROM my_aspnet_Applications");
Assert.AreEqual(0, dt.Rows.Count);
- dt = FillTable("SELECT * FROM my_aspnet_users");
+ dt = FillTable("SELECT * FROM my_aspnet_Users");
Assert.AreEqual(0, dt.Rows.Count);
- dt = FillTable("SELECT * FROM my_aspnet_profiles");
+ dt = FillTable("SELECT * FROM my_aspnet_Profiles");
Assert.AreEqual(0, dt.Rows.Count);
}
[Test]
public void StringCollectionAsProperty()
{
- // make sure there are no apps currently
- DataTable dt = FillTable("SELECT * FROM my_aspnet_applications");
- Assert.AreEqual(0, dt.Rows.Count);
-
ProfileBase profile = ProfileBase.Create("foo", true);
StringCollection colors = new StringCollection();
colors.Add("red");
@@ -122,11 +110,11 @@
profile["FavoriteColors"] = colors;
profile.Save();
- dt = FillTable("SELECT * FROM my_aspnet_applications");
+ DataTable dt = FillTable("SELECT * FROM my_aspnet_Applications");
Assert.AreEqual(1, dt.Rows.Count);
- dt = FillTable("SELECT * FROM my_aspnet_users");
+ dt = FillTable("SELECT * FROM my_aspnet_Users");
Assert.AreEqual(1, dt.Rows.Count);
- dt = FillTable("SELECT * FROM my_aspnet_profiles");
+ dt = FillTable("SELECT * FROM my_aspnet_Profiles");
Assert.AreEqual(1, dt.Rows.Count);
// now retrieve them
Modified: branches/5.2/MySql.Web/Tests/RoleManagement.cs
===================================================================
--- branches/5.2/MySql.Web/Tests/RoleManagement.cs 2008-02-25 21:15:55 UTC (rev 1193)
+++ branches/5.2/MySql.Web/Tests/RoleManagement.cs 2008-02-25 23:57:24 UTC (rev 1194)
@@ -92,12 +92,11 @@
config.Add("applicationName", "/");
roleProvider.Initialize(null, config);
- AddUser("eve", "eve");
+ AddUser("eve", "eveeve!");
roleProvider.CreateRole("Administrator");
roleProvider.AddUsersToRoles(new string[] { "eve" },
new string[] { "Administrator" });
Assert.IsTrue(roleProvider.IsUserInRole("eve", "Administrator"));
- membershipProvider.DeleteUser("foo", false);
}
}
}
Modified: branches/5.2/MySql.Web/Tests/UserManagement.cs
===================================================================
--- branches/5.2/MySql.Web/Tests/UserManagement.cs 2008-02-25 21:15:55 UTC (rev 1193)
+++ branches/5.2/MySql.Web/Tests/UserManagement.cs 2008-02-25 23:57:24 UTC (rev 1194)
@@ -223,20 +223,13 @@
{
try
{
- // we have to initialize the provider so the db will exist
-/* provider = new MySQLMembershipProvider();
- NameValueCollection config = new NameValueCollection();
- config.Add("connectionStringName", "LocalMySqlServer");
- config.Add("applicationName", "/");
- provider.Initialize(null, config);
-*/
- Membership.CreateUser("foo", "bar");
+ Membership.CreateUser("foo", "barbar!");
int records;
MembershipUserCollection users = Membership.FindUsersByName("F%", 0, 10, out records);
Assert.AreEqual(1, records);
Assert.AreEqual("foo", users["foo"].UserName);
- Membership.CreateUser("test", "bar", "myemail@stripped");
+ Membership.CreateUser("test", "barbar!", "myemail@stripped");
users = Membership.FindUsersByName("T%", 0, 10, out records);
Assert.AreEqual(1, records);
Assert.AreEqual("test", users["test"].UserName);
@@ -253,8 +246,8 @@
int numOnline = Membership.GetNumberOfUsersOnline();
Assert.AreEqual(0, numOnline);
- Membership.CreateUser("foo", "bar");
- Membership.CreateUser("foo2", "bar");
+ Membership.CreateUser("foo", "barbar!");
+ Membership.CreateUser("foo2", "barbar!");
numOnline = Membership.GetNumberOfUsersOnline();
Assert.AreEqual(2, numOnline);
@@ -263,7 +256,7 @@
[Test]
public void UnlockUser()
{
- Membership.CreateUser("foo", "bar");
+ Membership.CreateUser("foo", "barbar!");
Assert.IsFalse(Membership.ValidateUser("foo", "bar2"));
Assert.IsFalse(Membership.ValidateUser("foo", "bar3"));
Assert.IsFalse(Membership.ValidateUser("foo", "bar3"));
@@ -271,7 +264,7 @@
Assert.IsFalse(Membership.ValidateUser("foo", "bar3"));
// the user should be locked now so the right password should fail
- Assert.IsFalse(Membership.ValidateUser("foo", "bar"));
+ Assert.IsFalse(Membership.ValidateUser("foo", "barbar!"));
MembershipUser user = Membership.GetUser("foo");
Assert.IsTrue(user.IsLockedOut);
@@ -280,13 +273,13 @@
user = Membership.GetUser("foo");
Assert.IsFalse(user.IsLockedOut);
- Assert.IsTrue(Membership.ValidateUser("foo", "bar"));
+ Assert.IsTrue(Membership.ValidateUser("foo", "barbar!"));
}
[Test]
public void GetUsernameByEmail()
{
- Membership.CreateUser("foo", "bar", "foo@stripped");
+ Membership.CreateUser("foo", "barbar!", "foo@stripped");
string username = Membership.GetUserNameByEmail("foo@stripped");
Assert.AreEqual("foo", username);
@@ -301,7 +294,7 @@
public void UpdateUser()
{
MembershipCreateStatus status;
- Membership.CreateUser("foo", "bar", "foo@stripped", "color", "blue", true, out status);
+ Membership.CreateUser("foo", "barbar!", "foo@stripped", "color", "blue", true, out status);
Assert.AreEqual(MembershipCreateStatus.Success, status);
MembershipUser user = Membership.GetUser("foo");
@@ -342,16 +335,16 @@
public void ChangePasswordQuestionAndAnswer()
{
MembershipCreateStatus status;
- Membership.CreateUser("foo", "bar", "foo@stripped", "color", "blue", true, out status);
+ Membership.CreateUser("foo", "barbar!", "foo@stripped", "color", "blue", true, out status);
Assert.AreEqual(MembershipCreateStatus.Success, status);
MembershipUser user = Membership.GetUser("foo");
ChangePasswordQAHelper(user, "", "newQ", "newA");
- ChangePasswordQAHelper(user, "bar", "", "newA");
- ChangePasswordQAHelper(user, "bar", "newQ", "");
+ ChangePasswordQAHelper(user, "barbar!", "", "newA");
+ ChangePasswordQAHelper(user, "barbar!", "newQ", "");
ChangePasswordQAHelper(user, null, "newQ", "newA");
- bool result = user.ChangePasswordQuestionAndAnswer("bar", "newQ", "newA");
+ bool result = user.ChangePasswordQuestionAndAnswer("barbar!", "newQ", "newA");
Assert.IsTrue(result);
user = Membership.GetUser("foo");
@@ -363,7 +356,7 @@
{
// first create a bunch of users
for (int i=0; i < 100; i++)
- Membership.CreateUser(String.Format("foo{0}", i), "bar");
+ Membership.CreateUser(String.Format("foo{0}", i), "barbar!");
MembershipUserCollection users = Membership.GetAllUsers();
Assert.AreEqual(100, users.Count);
@@ -392,14 +385,14 @@
config.Add("applicationName", "/");
provider.Initialize(null, config);
- provider.CreateUser("foo", "bar", "foo@stripped", "color", "blue", true, null, out status);
+ provider.CreateUser("foo", "barbar!", "foo@stripped", "color", "blue", true, null, out status);
try
{
string password = provider.GetPassword("foo", answer);
if (!enablePasswordRetrieval)
Assert.Fail("This should have thrown an exception");
- Assert.AreEqual("bar", password);
+ Assert.AreEqual("barbar!", password);
}
catch (ProviderException)
{
@@ -420,7 +413,7 @@
[Test]
public void GetUser()
{
- Membership.CreateUser("foo", "bar");
+ Membership.CreateUser("foo", "barbar!");
MembershipUser user = Membership.GetUser(1);
Assert.AreEqual("foo", user.UserName);
@@ -451,11 +444,11 @@
public void FindUsers()
{
for (int i=0; i < 100; i++)
- Membership.CreateUser(String.Format("boo{0}", i), "bar");
+ Membership.CreateUser(String.Format("boo{0}", i), "barbar!");
for (int i=0; i < 100; i++)
- Membership.CreateUser(String.Format("foo{0}", i), "bar");
+ Membership.CreateUser(String.Format("foo{0}", i), "barbar!");
for (int i=0; i < 100; i++)
- Membership.CreateUser(String.Format("schmoo{0}", i), "bar");
+ Membership.CreateUser(String.Format("schmoo{0}", i), "barbar!");
MembershipUserCollection users = Membership.FindUsersByName("fo%");
| Thread |
|---|
| • Connector/NET commit: r1194 - in branches/5.2/MySql.Web: Providers/Source Tests | rburnett | 26 Feb |
