updated based on cr

Author: rluvaton

arrow-select/src/zip.rs

@@ -296,10 +296,9 @@ mod test {
     }
 
     #[test]
-    fn test_zip_kernel_primitive_scalar_with_boolean_array_mask_with_nulls_should_be_treated_as_false()
-     {
-        let scalar_truthy = Scalar::new(Int32Array::from_value(42, 1));
-        let scalar_falsy = Scalar::new(Int32Array::from_value(123, 1));
+    fn test_zip_primitive_array_with_nulls_is_mask_should_be_treated_as_false() {
+        let truthy = Int32Array::from_iter_values(vec![1, 2, 3, 4, 5, 6]);
+        let falsy = Int32Array::from_iter_values(vec![7, 8, 9, 10, 11, 12]);
 
         let mask = {
             let booleans = BooleanBuffer::from(vec![true, true, false, true, false, false]);
@@ -310,23 +309,24 @@ mod test {
             ]);
             BooleanArray::new(booleans, Some(nulls))
         };
-        let out = zip(&mask, &scalar_truthy, &scalar_falsy).unwrap();
+        let out = zip(&mask, &truthy, &falsy).unwrap();
         let actual = out.as_any().downcast_ref::<Int32Array>().unwrap();
         let expected = Int32Array::from(vec![
-            Some(42),
-            Some(42),
-            Some(123),
-            Some(123), // true in mask but null
-            Some(123),
-            Some(123),
+            Some(1),
+            Some(2),
+            Some(9),
+            Some(10), // true in mask but null
+            Some(11),
+            Some(12),
         ]);
         assert_eq!(actual, &expected);
     }
 
     #[test]
-    fn test_zip_primitive_array_with_nulls_is_mask_should_be_treated_as_false() {
-        let scalar_truthy = Int32Array::from_iter_values(vec![1, 2, 3, 4, 5, 6]);
-        let scalar_falsy = Int32Array::from_iter_values(vec![7, 8, 9, 10, 11, 12]);
+    fn test_zip_kernel_primitive_scalar_with_boolean_array_mask_with_nulls_should_be_treated_as_false()
+     {
+        let scalar_truthy = Scalar::new(Int32Array::from_value(42, 1));
+        let scalar_falsy = Scalar::new(Int32Array::from_value(123, 1));
 
         let mask = {
             let booleans = BooleanBuffer::from(vec![true, true, false, true, false, false]);
@@ -340,20 +340,20 @@ mod test {
         let out = zip(&mask, &scalar_truthy, &scalar_falsy).unwrap();
         let actual = out.as_any().downcast_ref::<Int32Array>().unwrap();
         let expected = Int32Array::from(vec![
-            Some(1),
-            Some(2),
-            Some(9),
-            Some(10), // true in mask but null
-            Some(11),
-            Some(12),
+            Some(42),
+            Some(42),
+            Some(123),
+            Some(123), // true in mask but null
+            Some(123),
+            Some(123),
         ]);
         assert_eq!(actual, &expected);
     }
 
     #[test]
     fn test_zip_string_array_with_nulls_is_mask_should_be_treated_as_false() {
-        let scalar_truthy = StringArray::from_iter_values(vec!["1", "2", "3", "4", "5", "6"]);
-        let scalar_falsy = StringArray::from_iter_values(vec!["7", "8", "9", "10", "11", "12"]);
+        let truthy = StringArray::from_iter_values(vec!["1", "2", "3", "4", "5", "6"]);
+        let falsy = StringArray::from_iter_values(vec!["7", "8", "9", "10", "11", "12"]);
 
         let mask = {
             let booleans = BooleanBuffer::from(vec![true, true, false, true, false, false]);
@@ -364,7 +364,7 @@ mod test {
             ]);
             BooleanArray::new(booleans, Some(nulls))
         };
-        let out = zip(&mask, &scalar_truthy, &scalar_falsy).unwrap();
+        let out = zip(&mask, &truthy, &falsy).unwrap();
         let actual = out.as_string::<i32>();
         let expected = StringArray::from_iter_values(vec![
             "1", "2", "9", "10", // true in mask but null