8000 Since we need to work with 1.3 remove the ByteArray from the Java sam… · randomf/spark-testing-base@276734e · GitHub
[go: up one dir, main page]
Skip to content

Commit 276734e

Browse files
holdenkholdenk
committed
Since we need to work with 1.3 remove the ByteArray from the Java sample DataFrame test (wasn't supported correctly inside of Spark)
1 parent 4da2b08 commit 276734e

File tree

2 files changed

+53
-70
lines changed

2 files changed

+53
-70
lines changed

‎src/test/1.3/java/com/holdenkarau/spark/testing/BasicMagic.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.holdenkarau.spark.testing;
2+
3+
import java.io.Serializable;
4+
5+
public class BasicMagic implements Serializable {
6+
private String name;
7+
private double power;
8+
9+
public BasicMagic(String name, double power) {
10+
this.name = name;
11+
this.power = power;
12+
}
13+
14+
public String getName() {
15+
return name;
16+
}
17+
18+
public void setName(String name) {
19+
this.name = name;
20+
}
21+
22+
public double getPower() {
23+
return power;
24+
}
25+
26+
public void setPower(double power) {
27+
this.power = power;
28+
}
29+
}

‎src/test/1.3/java/com/holdenkarau/spark/testing/SampleJavaDataFrameTest.java

Lines changed: 24 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -13,78 +13,67 @@
1313
import java.util.List;
1414

1515
public class SampleJavaDataFrameTest extends JavaDataFrameSuiteBase implements Serializable {
16-
private static final byte[] byteArray1 = {1, 2};
17-
private static final byte[] byteArray2 = {100, 120};
18-
1916
@Test
2017
public void testEqualDataFrameWithItSelf() {
21-
List<Magic> list = Arrays.asList(new Magic("holden", 30, byteArray1),
22-
new Magic("mahmoud", 23, byteArray1));
18+
List<BasicMagic> list = Arrays.asList(new BasicMagic("holden", 30),
19+
new BasicMagic("mahmoud", 23));
2320

2421
DataFrame personsDataFrame = toDF(list);
2522
equalDataFrames(personsDataFrame, personsDataFrame);
2623

27-
List<Magic> emptyList = Arrays.asList();
24+
List<BasicMagic> emptyList = Arrays.asList();
2825
DataFrame emptyDataFrame = toDF(emptyList);
2926
equalDataFrames(emptyDataFrame, emptyDataFrame);
3027
}
3128

3229
@Test
3330
public void testEqualDataFrames() {
34-
List<Magic> magics1 = Arrays.asList(new Magic("holden", 30, byteArray1),
35-
new Magic("mahmoud", 23, byteArray1));
31+
List<BasicMagic> magics1 = Arrays.asList(new BasicMagic("holden", 30),
32+
new BasicMagic("mahmoud", 23));
3633

37-
List<Magic> magics2 = Arrays.asList(new Magic("holden", 30, byteArray1),
38-
new Magic("mahmoud", 23, byteArray1));
34+
List<BasicMagic> magics2 = Arrays.asList(new BasicMagic("holden", 30),
35+
new BasicMagic("mahmoud", 23));
3936

4037
equalDataFrames(toDF(magics1), toDF(magics2));
4138
}
4239

4340
@Test (expected = java.lang.AssertionError.class)
4441
public void testNotEqualInteger() {
45-
List<Magic> magics1 = Arrays.asList(new Magic("mahmoud", 20, byteArray1),
46-
new Magic("Holden", 25, byteArray1));
42+
List<BasicMagic> magics1 = Arrays.asList(new BasicMagic("mahmoud", 20),
43+
new BasicMagic("Holden", 25));
4744

48-
List<Magic> magics2 = Arrays.asList(new Magic("mahmoud", 40, byteArray1),
49-
new Magic("Holden", 25, byteArray1));
50-
51-
equalDataFrames(toDF(magics1), toDF(magics2));
52-
}
53-
54-
@Test (expected = java.lang.AssertionError.class)
55-
public void testNotEqualByteArray() {
56-
List<Magic> magics1 = Arrays.asList(new Magic("Holden", 20, byteArray1));
57-
List<Magic> magics2 = Arrays.asList(new Magic("Holden", 20, byteArray2));
45+
List<BasicMagic> magics2 = Arrays.asList(new BasicMagic("mahmoud", 40),
46+
new BasicMagic("Holden", 25));
5847

5948
equalDataFrames(toDF(magics1), toDF(magics2));
6049
}
6150

6251
@Test
6352
public void testApproximateEqual() {
64-
List<Magic> magics1 = Arrays.asList(new Magic("Holden", 10.0, byteArray1),
65-
new Magic("Mahmoud", 9.9, byteArray1));
53+
List<BasicMagic> magics1 = Arrays.asList(new BasicMagic("Holden", 10.0),
54+
new BasicMagic("Mahmoud", 9.9));
6655

67-
List<Magic> magics2 = Arrays.asList(new Magic("Holden", 10.1, byteArray1),
68-
new Magic("Mahmoud", 10.0, byteArray1));
56+
List<BasicMagic> magics2 = Arrays.asList(new BasicMagic("Holden", 10.1),
57+
new BasicMagic("Mahmoud", 10.0));
6958

7059
approxEqualDataFrames(toDF(magics1), toDF(magics2), 0.1);
7160
}
7261

7362
@Test (expected = java.lang.AssertionError.class)
7463
public void testApproximateNotEqual() {
75-
List<Magic> magics1 = Arrays.asList(new Magic("Holden", 10.0, byteArray1),
76-
new Magic("Mahmoud", 9.9, byteArray1));
64+
List<BasicMagic> magics1 = Arrays.asList(new BasicMagic("Holden", 10.0),
65+
new BasicMagic("Mahmoud", 9.9));
7766

78-
List<Magic> magics2 = Arrays.asList(new Magic("Holden", 10.2, byteArray1),
79-
new Magic("Mahmoud", 10.0, byteArray1));
67+
List<BasicMagic> magics2 = Arrays.asList(new BasicMagic("Holden", 10.2),
68+
new BasicMagic("Mahmoud", 10.0));
8069

8170
approxEqualDataFrames(toDF(magics1), toDF(magics2), 0.1);
8271
}
8372

8473
@Test
8574
public void testApproximateEqualRows() {
86-
List<Magic> magics = Arrays.asList(new Magic("Holden", 10.0, byteArray1),
87-
new Magic("Mahmoud", 9.9, byteArray1));
75+
List<BasicMagic> magics = Arrays.asList(new BasicMagic("Holden", 10.0),
76+
new BasicMagic("Mahmoud", 9.9));
8877

8978
Row row1 = toDF(magics).collect()[0];
9079
Row row2 = toDF(magics).collect()[1];
@@ -93,44 +82,9 @@ public void testApproximateEqualRows() {
9382
assertFalse(approxEquals(row1, row2, 0));
9483
}
9584

96-
private DataFrame toDF(List<Magic> list) {
97-
JavaRDD<Magic> rdd = jsc().parallelize(list);
98-
return sqlContext().createDataFrame(rdd, Magic.class);
85+
private DataFrame toDF(List<BasicMagic> list) {
86+
JavaRDD<BasicMagic> rdd = jsc().parallelize(list);
87+
return sqlContext().createDataFrame(rdd, BasicMagic.class);
9988
}
10089

101-
public static class Magic implements Serializable {
102-
private String name;
103-
private double power;
104-
private byte[] byteArray;
105-
106-
public Magic(String name, double power, byte[] byteArray) {
107-
this.name = name;
108-
this.power = power;
109-
this.byteArray = byteArray;
110-
}
111-
112-
public String getName() {
113-
return name;
114-
}
115-
116-
public void setName(String name) {
117-
this.name = name;
118-
}
119-
120-
public double getPower() {
121-
return power;
122-
}
123-
124-
public void setPower(double power) {
125-
this.power = power;
126-
}
127-
128-
public void setByteArray(byte[] arr) {
129-
this.byteArray = arr;
130-
}
131-
132-
public byte[] getByteArray() {
133-
return byteArray;
134-
}
135-
}
13690
}

0 commit comments

Comments
 (0)
0