Skip to content

Commit 09bdf4d

Browse files
committed
PR review comment changes
1 parent 4f5bfff commit 09bdf4d

File tree

1 file changed

+26
-10
lines changed

1 file changed

+26
-10
lines changed

src/csharp/Microsoft.Spark.E2ETest/IpcTests/Sql/SparkSessionTests.cs

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public void TestCreateDataFrame()
8686
new StructField("Name", new StringType()),
8787
new StructField("Age", new IntegerType())
8888
});
89-
DataFrame df = _spark.CreateDataFrame(data, schema);
90-
ValidateDataFrame<object[]>(data.ConvertAll(a => a.Values), df, schema);
89+
DataFrame df = _spark.CreateDataFrame(data, schema);
90+
ValidateDataFrame(data.Select(a => a.Values), df, schema);
9191
}
9292

9393
// Calling CreateDataFrame(IEnumerable<string> _) without schema
@@ -99,7 +99,7 @@ public void TestCreateDataFrame()
9999
});
100100

101101
DataFrame df = _spark.CreateDataFrame(data);
102-
ValidateDataFrame<object[]>(data.ConvertAll(a => new object[] { a }), df, schema);
102+
ValidateDataFrame(data.Select(a => new object[] { a }), df, schema);
103103
}
104104

105105
// Calling CreateDataFrame(IEnumerable<int> _) without schema
@@ -111,7 +111,7 @@ public void TestCreateDataFrame()
111111
});
112112

113113
DataFrame df = _spark.CreateDataFrame(data);
114-
ValidateDataFrame<object[]>(data.ConvertAll(a => new object[] { a }), df, schema);
114+
ValidateDataFrame(data.Select(a => new object[] { a }), df, schema);
115115
}
116116

117117
// Calling CreateDataFrame(IEnumerable<double> _) without schema
@@ -123,7 +123,7 @@ public void TestCreateDataFrame()
123123
});
124124

125125
DataFrame df = _spark.CreateDataFrame(data);
126-
ValidateDataFrame<object[]>(data.ConvertAll(a => new object[] { a }), df, schema);
126+
ValidateDataFrame(data.Select(a => new object[] { a }), df, schema);
127127
}
128128

129129
// Calling CreateDataFrame(IEnumerable<bool> _) without schema
@@ -135,7 +135,19 @@ public void TestCreateDataFrame()
135135
});
136136

137137
DataFrame df = _spark.CreateDataFrame(data);
138-
ValidateDataFrame<object[]>(data.ConvertAll(a => new object[] { a }), df, schema);
138+
ValidateDataFrame(data.Select(a => new object[] { a }), df, schema);
139+
}
140+
141+
// Calling CreateDataFrame(IEnumerable<long> _) without schema
142+
{
143+
var data = new List<long>(new long[] { 2L, 3L });
144+
var schema = new StructType(new List<StructField>()
145+
{
146+
new StructField("_1", new LongType())
147+
});
148+
149+
DataFrame df = _spark.CreateDataFrame(data);
150+
ValidateDataFrame(data.Select(a => new object[] { a }), df, schema);
139151
}
140152
}
141153

@@ -146,14 +158,18 @@ public void TestCreateDataFrame()
146158
/// <param name="data">Given data for the dataframe</param>
147159
/// <param name="df">Dataframe Object to validate</param>
148160
/// <param name="schema">Expected schema of the dataframe</param>
149-
internal void ValidateDataFrame<T>(List<object[]> data, DataFrame df, StructType schema)
161+
private void ValidateDataFrame(IEnumerable<object[]> data, DataFrame df, StructType schema)
150162
{
151163
Assert.Equal(schema, df.Schema());
152164
Row[] rows = df.Collect().ToArray();
153-
Assert.Equal(data.Count, rows.Length);
154-
for (int i = 0; i < rows.Length; ++i)
165+
Assert.Equal(data.Count(), rows.Length);
166+
int i = 0;
167+
foreach (object[] expectedValues in data)
155168
{
156-
Assert.Equal(data[i], rows[i].Values);
169+
object[] actualValues = rows[i].Values;
170+
Assert.Equal(expectedValues.Length, actualValues.Length);
171+
Assert.True(actualValues.SequenceEqual(expectedValues));
172+
++i;
157173
}
158174
}
159175
}

0 commit comments

Comments
 (0)