LRQA-27618 SF

michaelhashimoto · Sep 12, 2016 · a56aae1 · a56aae1
1 parent 924b641
commit a56aae1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 33 deletions.
diff --git a/build-test-apacheds.xml b/build-test-apacheds.xml
@@ -28,61 +28,48 @@
 	</macrodef>
 
 	<macrodef name="unzip-apacheds-instance-custom">
-		<sequential>
-			<if>
-				<not>
-					<available file="${apacheds.dir}/instances/${apacheds.instance.custom.zip.name}" />
-				</not>
-				<then>
-					<mirrors-get
-						dest="${apacheds.dir}/instances/${apacheds.instance.custom.zip.name}"
-						src="http://files.liferay.com/private/apps/apache/apacheds/${apacheds.instance.custom.zip.name}"
-						verbose="true"
-					/>
-				</then>
-			</if>
-
-			<unzip
-				dest="${apacheds.dir}/instances"
-				src="${apacheds.dir}/instances/${apacheds.instance.custom.zip.name}"
-			/>
-		</sequential>
-	</macrodef>
+		<attribute default="" name="apacheds.instance.custom.zip.name" />
+		<attribute default="" name="apacheds.instance.custom.zip.source" />
 
-	<macrodef name="unzip-apacheds-instance-custom-blank-password">
 		<sequential>
 			<if>
 				<not>
-					<available file="${apacheds.dir}/instances/${apacheds.instance.blank.password.custom.zip.name}" />
+					<available file="${apacheds.dir}/instances/@{apacheds.instance.custom.zip.name}" />
 				</not>
 				<then>
 					<mirrors-get
-						dest="${apacheds.dir}/instances/${apacheds.instance.blank.password.custom.zip.name}"
-						src="http://files.liferay.com/private/apps/apache/apacheds/${apacheds.instance.blank.password.custom.zip.name}"
+						dest="${apacheds.dir}/instances/@{apacheds.instance.custom.zip.name}"
+						src="@{apacheds.instance.custom.zip.source}"
 						verbose="true"
 					/>
 				</then>
 			</if>
 
 			<unzip
 				dest="${apacheds.dir}/instances"
-				src="${apacheds.dir}/instances/${apacheds.instance.blank.password.custom.zip.name}"
+				src="${apacheds.dir}/instances/@{apacheds.instance.custom.zip.name}"
 			/>
 		</sequential>
 	</macrodef>
 
 	<target name="start-apacheds">
 		<unzip-apacheds />
 
-		<get-testcase-property property.name="apacheds.blank.password.enabled" />
+		<get-testcase-property property.name="apacheds.blank.user.password.enabled" />
 
 		<if>
-			<equals arg1="${apacheds.blank.password.enabled}" arg2="true" />
+			<equals arg1="${apacheds.blank.user.password.enabled}" arg2="true" />
 			<then>
-				<unzip-apacheds-instance-custom-blank-password />
+				<unzip-apacheds-instance-custom
+					apacheds.instance.custom.zip.name="${apacheds.instance.blank.user.password.custom.zip.name}"
+					apacheds.instance.custom.zip.source="http://files.liferay.com/private/apps/apache/apacheds/${apacheds.instance.blank.user.password.custom.zip.name}"
+				/>
 			</then>
 			<else>
-				<unzip-apacheds-instance-custom />
+				<unzip-apacheds-instance-custom
+					apacheds.instance.custom.zip.name="${apacheds.instance.custom.zip.name}"
+					apacheds.instance.custom.zip.source="http://files.liferay.com/private/apps/apache/apacheds/${apacheds.instance.custom.zip.name}"
+				/>
 			</else>
 		</if>
 

diff --git a/build-test.xml b/build-test.xml
@@ -8352,13 +8352,13 @@ jdbc.default.password=${database.mysql.password}</echo>
 			</then>
 		</if>
 
+		<get-testcase-property property.name="apacheds.blank.user.password.enabled" />
 		<get-testcase-property property.name="apacheds.enabled" />
-		<get-testcase-property property.name="apacheds.blank.password.enabled" />
 
 		<if>
 			<or>
+				<equals arg1="${apacheds.blank.user.password.enabled}" arg2="true" />
 				<equals arg1="${apacheds.enabled}" arg2="true" />
-				<equals arg1="${apacheds.blank.password.enabled}" arg2="true" />
 			</or>
 			<then>
 				<ant antfile="build-test-apacheds.xml" target="start-apacheds" />

diff --git a/test.properties b/test.properties
@@ -12,7 +12,7 @@
     apacheds.version=2.0.0-M23
     apacheds.dir=${app.server.parent.dir}/apacheds-${apacheds.version}
     apacheds.instance.custom.zip.name=apacheds-${apacheds.version}-instance.zip
-    apacheds.instance.blank.password.custom.zip.name=apacheds-${apacheds.version}-instance-blank-password.zip
+    apacheds.instance.blank.user.password.custom.zip.name=apacheds-${apacheds.version}-instance-blank-user-password.zip
     apacheds.zip.name=apacheds-${apacheds.version}.zip
     apacheds.zip.url=http://mirrors.sonic.net/apache//directory/apacheds/dist/${apacheds.version}/${apacheds.zip.name}
 
@@ -1072,8 +1072,8 @@
     test.case.available.property.names=\
         ${test.case.required.property.names},\
         \
+        apacheds.blank.user.password.enabled,\
         apacheds.enabled,\
-        apacheds.blank.password.enabled,\
         app.server.bundles.size,\
         browser.type,\
         captcha.max.challenges,\