You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2013/02/15 22:22:34 UTC
svn commit: r1446778 - in /incubator/jspwiki/trunk: ./ src/org/apache/wiki/
src/org/apache/wiki/auth/ tests/org/apache/wiki/auth/
tests/org/apache/wiki/auth/user/
Author: metskem
Date: Fri Feb 15 21:22:34 2013
New Revision: 1446778
URL: http://svn.apache.org/r1446778
Log:
2013-02-15 Harry Metske <me...@apache.org>
* 2.9.1-svn-27
* changed test email addresses from example.com to mailinator.com
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/org/apache/wiki/auth/SecurityVerifier.java
incubator/jspwiki/trunk/tests/org/apache/wiki/auth/UserManagerTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1446778&r1=1446777&r2=1446778&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Fri Feb 15 21:22:34 2013
@@ -1,3 +1,9 @@
+2013-02-15 Harry Metske <me...@apache.org>
+
+ * 2.9.1-svn-27
+
+ * changed test email addresses from example.com to mailinator.com
+
2013-02-14 Harry Metske <me...@apache.org>
* 2.9.1-svn-26
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1446778&r1=1446777&r2=1446778&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Fri Feb 15 21:22:34 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "26";
+ public static final String BUILD = "27";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/SecurityVerifier.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/SecurityVerifier.java?rev=1446778&r1=1446777&r2=1446778&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/SecurityVerifier.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/SecurityVerifier.java Fri Feb 15 21:22:34 2013
@@ -864,7 +864,7 @@ public final class SecurityVerifier
try
{
UserProfile profile = db.newProfile();
- profile.setEmail( "testuser@example.com" );
+ profile.setEmail( "testjspwiki.tests@mailinator.com" );
profile.setLoginName( loginName );
profile.setFullname( "FullName"+loginName );
profile.setPassword( "password" );
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/auth/UserManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/auth/UserManagerTest.java?rev=1446778&r1=1446777&r2=1446778&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/auth/UserManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/auth/UserManagerTest.java Fri Feb 15 21:22:34 2013
@@ -108,7 +108,7 @@ public class UserManagerTest extends Tes
String newLogin = "RenamedLogin" + now;
String newName = "Renamed User " + now;
UserProfile profile = m_db.newProfile();
- profile.setEmail( "testuser@example.com" );
+ profile.setEmail( "jspwiki.tests@mailinator.com" );
profile.setLoginName( oldLogin );
profile.setFullname ( oldName );
profile.setPassword ( "password" );
@@ -150,7 +150,7 @@ public class UserManagerTest extends Tes
// Setup Step 4: change the user name in the profile and see what happens
profile = m_db.newProfile();
- profile.setEmail ( "testuser@example.com" );
+ profile.setEmail ( "jspwiki.tests@mailinator.com" );
profile.setLoginName( oldLogin );
profile.setFullname ( newName );
profile.setPassword ( "password" );
@@ -209,7 +209,7 @@ public class UserManagerTest extends Tes
// Setup Step 8: re-save the profile with the new login name
profile = m_db.newProfile();
- profile.setEmail ( "testuser@example.com" );
+ profile.setEmail ( "jspwiki.tests@mailinator.com" );
profile.setLoginName( newLogin );
profile.setFullname ( oldName );
profile.setPassword ( "password" );
@@ -266,7 +266,7 @@ public class UserManagerTest extends Tes
WikiSession session = m_engine.guestSession();
String loginName = "TestUser" + String.valueOf( System.currentTimeMillis() );
UserProfile profile = m_db.newProfile();
- profile.setEmail( "testuser@example.com" );
+ profile.setEmail( "jspwiki.tests@mailinator.com" );
profile.setLoginName( loginName );
profile.setFullname( "FullName"+loginName );
profile.setPassword( "password");
@@ -293,7 +293,7 @@ public class UserManagerTest extends Tes
WikiSession session = m_engine.guestSession();
String loginName = "TestUser" + String.valueOf( System.currentTimeMillis() );
UserProfile profile = m_db.newProfile();
- profile.setEmail( "testuser@example.com" );
+ profile.setEmail( "jspwiki.tests@mailinator.com" );
profile.setLoginName( loginName );
profile.setFullname( "FullName"+loginName );
profile.setPassword( "password");
@@ -347,7 +347,7 @@ public class UserManagerTest extends Tes
WikiSession session = m_engine.guestSession();
String loginName = "TestUser" + String.valueOf( System.currentTimeMillis() );
UserProfile profile = m_db.newProfile();
- profile.setEmail( "testuser@example.com" );
+ profile.setEmail( "jspwiki.tests@mailinator.com" );
profile.setLoginName( loginName );
profile.setFullname( "FullName"+loginName );
profile.setPassword( "password");
@@ -395,7 +395,7 @@ public class UserManagerTest extends Tes
WikiSession session = m_engine.guestSession();
String loginName = "TestUser" + String.valueOf( System.currentTimeMillis() );
UserProfile profile = m_db.newProfile();
- profile.setEmail( "testuser@example.com" );
+ profile.setEmail( "jspwiki.tests@mailinator.com" );
profile.setLoginName( loginName );
profile.setFullname( "FullName"+loginName );
profile.setPassword( "password");
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java?rev=1446778&r1=1446777&r2=1446778&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java Fri Feb 15 21:22:34 2013
@@ -73,7 +73,7 @@ public class JDBCUserDatabaseTest extend
JDBCUserDatabase.DEFAULT_DB_LOGIN_NAME + "," +
JDBCUserDatabase.DEFAULT_DB_PASSWORD + "," +
JDBCUserDatabase.DEFAULT_DB_CREATED + ") VALUES (" +
- "'-8629747547991531672'," + "'user@example.com'," + "'user'," +
+ "'-8629747547991531672'," + "'jspwiki.tests@mailinator.com'," + "'user'," +
"'{SHA}5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'," +
"'" + new Timestamp( new Timestamp( System.currentTimeMillis() ).getTime() ).toString() + "'" + ");";
@@ -148,7 +148,7 @@ public class JDBCUserDatabaseTest extend
// Create a new user with random name
String loginName = "TestUser" + String.valueOf( System.currentTimeMillis() );
UserProfile profile = m_db.newProfile();
- profile.setEmail("testuser@example.com");
+ profile.setEmail("jspwiki.tests@mailinator.com");
profile.setLoginName( loginName );
profile.setFullname( "FullName"+loginName );
profile.setPassword("password");
@@ -368,7 +368,7 @@ public class JDBCUserDatabaseTest extend
// Create new user & verify it saved ok
UserProfile profile = m_db.newProfile();
- profile.setEmail( "renamed@example.com" );
+ profile.setEmail( "renamed@mailinator.com" );
profile.setFullname( "Renamed User" );
profile.setLoginName( "olduser" );
profile.setPassword( "password" );
@@ -403,7 +403,7 @@ public class JDBCUserDatabaseTest extend
// The new profile should be found, and its properties should match the old ones
profile = m_db.findByLoginName( "renameduser" );
- assertEquals( "renamed@example.com", profile.getEmail() );
+ assertEquals( "renamed@mailinator.com", profile.getEmail() );
assertEquals( "Renamed User", profile.getFullname() );
assertEquals( "renameduser", profile.getLoginName() );
assertTrue( CryptoUtil.verifySaltedPassword( "password".getBytes(), profile.getPassword() ) );
@@ -418,13 +418,13 @@ public class JDBCUserDatabaseTest extend
{
// Overwrite existing user
UserProfile profile = m_db.newProfile();
- profile.setEmail( "user@example.com" );
+ profile.setEmail( "jspwiki.tests@mailinator.com" );
profile.setFullname( "Test User" );
profile.setLoginName( "user" );
profile.setPassword( "password" );
m_db.save( profile );
- profile = m_db.findByEmail( "user@example.com" );
- assertEquals( "user@example.com", profile.getEmail() );
+ profile = m_db.findByEmail( "jspwiki.tests@mailinator.com" );
+ assertEquals( "jspwiki.tests@mailinator.com", profile.getEmail() );
assertEquals( "Test User", profile.getFullname() );
assertEquals( "user", profile.getLoginName() );
assertTrue( CryptoUtil.verifySaltedPassword( "password".getBytes(), profile.getPassword() ) );
@@ -435,13 +435,13 @@ public class JDBCUserDatabaseTest extend
// Create new user
profile = m_db.newProfile();
- profile.setEmail( "user2@example.com" );
+ profile.setEmail( "jspwiki.tests2@mailinator.com" );
profile.setFullname( "Test User 2" );
profile.setLoginName( "user2" );
profile.setPassword( "password" );
m_db.save( profile );
- profile = m_db.findByEmail( "user2@example.com" );
- assertEquals( "user2@example.com", profile.getEmail() );
+ profile = m_db.findByEmail( "jspwiki.tests2@mailinator.com" );
+ assertEquals( "jspwiki.tests2@mailinator.com", profile.getEmail() );
assertEquals( "Test User 2", profile.getFullname() );
assertEquals( "user2", profile.getLoginName() );
assertTrue( CryptoUtil.verifySaltedPassword( "password".getBytes(), profile.getPassword() ) );
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/auth/user/XMLUserDatabaseTest.java?rev=1446778&r1=1446777&r2=1446778&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/auth/user/XMLUserDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/auth/user/XMLUserDatabaseTest.java Fri Feb 15 21:22:34 2013
@@ -65,7 +65,7 @@ public class XMLUserDatabaseTest extends
// Create a new user with random name
String loginName = "TestUser" + String.valueOf( System.currentTimeMillis() );
UserProfile profile = m_db.newProfile();
- profile.setEmail("testuser@example.com");
+ profile.setEmail("jspwiki.tests@mailinator.com");
profile.setLoginName( loginName );
profile.setFullname( "FullName"+loginName );
profile.setPassword("password");
@@ -288,7 +288,7 @@ public class XMLUserDatabaseTest extends
// Create new user & verify it saved ok
UserProfile profile = m_db.newProfile();
- profile.setEmail( "renamed@example.com" );
+ profile.setEmail( "renamed@mailinator.com" );
profile.setFullname( "Renamed User" );
profile.setLoginName( "olduser" );
profile.setPassword( "password" );
@@ -323,7 +323,7 @@ public class XMLUserDatabaseTest extends
// The new profile should be found, and its properties should match the old ones
profile = m_db.findByLoginName( "renameduser" );
- assertEquals( "renamed@example.com", profile.getEmail() );
+ assertEquals( "renamed@mailinator.com", profile.getEmail() );
assertEquals( "Renamed User", profile.getFullname() );
assertEquals( "renameduser", profile.getLoginName() );
assertTrue( CryptoUtil.verifySaltedPassword( "password".getBytes(), profile.getPassword() ) );
@@ -337,12 +337,12 @@ public class XMLUserDatabaseTest extends
try
{
UserProfile profile = m_db.newProfile();
- profile.setEmail("user@example.com");
+ profile.setEmail("jspwiki.tests@mailinator.com");
profile.setLoginName("user");
profile.setPassword("password");
m_db.save(profile);
- profile = m_db.findByEmail("user@example.com");
- assertEquals("user@example.com", profile.getEmail());
+ profile = m_db.findByEmail("jspwiki.tests@mailinator.com");
+ assertEquals("jspwiki.tests@mailinator.com", profile.getEmail());
assertTrue( CryptoUtil.verifySaltedPassword( "password".getBytes(), profile.getPassword() ) );
// Make sure we can find it by uid