perltidy

Author: pstaabp

t/db/012_set_versions.t

@@ -91,10 +91,8 @@ my @all_user_sets = loadCSV(
 for my $set (@all_user_sets) {
 	$set->{set_version} = 0 unless defined($set->{set_version});
 	# find the problem set type
-	my $s = (grep {
-		$_->{course_name} eq $set->{course_name} && $_->{set_name} eq $set->{set_name}
-	}
-	@all_problem_sets)[0];
+	my $s =
+		(grep { $_->{course_name} eq $set->{course_name} && $_->{set_name} eq $set->{set_name} } @all_problem_sets)[0];
 	$set->{set_type}   = $s->{set_type};
 	$set->{set_params} = {} unless defined $set->{set_params};
 }
@@ -104,10 +102,8 @@ my @merged_user_sets = @{ clone(\@all_user_sets) };
 # Merge the sets
 
 for my $user_set (@merged_user_sets) {
-	my $set = (grep {
-		$_->{course_name} eq $user_set->{course_name} && $_->{set_name} eq $user_set->{set_name}
-	}
-	@all_problem_sets)[0];
+	my $set = (grep { $_->{course_name} eq $user_set->{course_name} && $_->{set_name} eq $user_set->{set_name} }
+			@all_problem_sets)[0];
 
 	# override problem set dates with userset dates if exist
 	my $dates = clone($set->{set_dates});
@@ -142,12 +138,13 @@ cleanUndef($user_set1);
 
 # Check that it is the same as that from the CSV file
 
-my $user_set1_from_csv = (grep {
-	$_->{course_name} eq $user_set_info1->{course_name}
-		&& $_->{set_name} eq $user_set_info1->{set_name}
-		&& $_->{username} eq $user_set_info1->{username}
-}
-@all_user_sets)[0];
+my $user_set1_from_csv = (
+	grep {
+		$_->{course_name} eq $user_set_info1->{course_name}
+			&& $_->{set_name} eq $user_set_info1->{set_name}
+			&& $_->{username} eq $user_set_info1->{username}
+	} @all_user_sets
+)[0];
 
 # Make a new user set that has a  set_version of 1
 

t/db/013_problem_versions.t

@@ -52,12 +52,15 @@ for my $problem (@problems_from_csv) {
 
 my @merged_problems_from_csv = ();
 for my $user_problem (@user_problems_from_csv) {
-	my $problem = clone((grep {
-		$_->{course_name} eq $user_problem->{course_name}
-			&& $_->{set_name} eq $user_problem->{set_name}
-			&& $_->{problem_number} == $user_problem->{problem_number}
-	}
-	@problems_from_csv)[0]);
+	my $problem = clone(
+		(
+			grep {
+				$_->{course_name} eq $user_problem->{course_name}
+					&& $_->{set_name} eq $user_problem->{set_name}
+					&& $_->{problem_number} == $user_problem->{problem_number}
+			} @problems_from_csv
+		)[0]
+	);
 
 	# Override the following fields from user problems.
 	for my $key (qw/seed status problem_version username/) {
@@ -85,13 +88,16 @@ delete $user_problem1->{set_visible} unless defined $user_problem1->{set_visible
 
 # Check that it is the same as that from the CSV file
 
-my $user_problem1_from_csv = clone((grep {
-	$_->{course_name} eq $user_problem_info->{course_name}
-		&& $_->{set_name} eq $user_problem_info->{set_name}
-		&& $_->{username} eq $user_problem_info->{username}
-		&& $_->{problem_number} == $user_problem_info->{problem_number}
-}
-@user_problems_from_csv)[0]);
+my $user_problem1_from_csv = clone(
+	(
+		grep {
+			$_->{course_name} eq $user_problem_info->{course_name}
+				&& $_->{set_name} eq $user_problem_info->{set_name}
+				&& $_->{username} eq $user_problem_info->{username}
+				&& $_->{problem_number} == $user_problem_info->{problem_number}
+		} @user_problems_from_csv
+	)[0]
+);
 
 # the status needs be returned to a numerical value.
 $user_problem1->{status} += 0;