Author: doogie
Date: Tue Jun 1 21:58:42 2010
New Revision: 950272
URL:
http://svn.apache.org/viewvc?rev=950272&view=revLog:
Revert wrongly committed 950263
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTests.xml
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTests.xml?rev=950272&r1=950271&r2=950272&view=diff==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTests.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTests.xml Tue Jun 1 21:58:42 2010
@@ -122,9 +122,15 @@ under the License.
<field-map field-name="userLoginId" from-field="partyUserLogin.userLoginId"/>
<field-map field-name="partyId" from-field="partyId"/>
</entity-one>
+ <!-- get the encrypted password -->
+ <call-class-method method-name="getHashType" class-name="org.ofbiz.common.login.LoginServices" ret-field="hashType"/>
+ <call-class-method method-name="getDigestHash" class-name="org.ofbiz.base.crypto.HashCrypt" ret-field="newPasswordHash">
+ <field field="serviceCtx.newPassword" type="java.lang.String"/>
+ <field field="hashType" type="java.lang.String"/>
+ </call-class-method>
<assert>
<not><if-empty field="partyAndUserLogin"/></not>
- <if-compare-field field="partyUserLogin.currentPassword" to-field="partyAndUserLogin.currentPassword" operator="not-equals"/>
+ <if-compare-field field="partyAndUserLogin.currentPassword" to-field="newPasswordHash" operator="equals"/>
<if-compare-field field="partyAndUserLogin.userLoginId" to-field="userLoginId" operator="equals"/>
</assert>
<check-errors/>
@@ -293,4 +299,4 @@ under the License.
</assert>
<check-errors/>
</simple-method>
-</simple-methods>
+</simple-methods>
\ No newline at end of file