Skip to content

Commit 1330816

Browse files
committed
Switch to distinct class name for Java version of test
1 parent 01b3ef8 commit 1330816

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

src/test/pre-2.0/java/com/holdenkarau/spark/testing/MagicTime.java renamed to src/test/pre-2.0/java/com/holdenkarau/spark/testing/JavaMagicTime.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.sql.Timestamp;
66

7-
public class MagicTime implements Serializable {
7+
public class JavaMagicTime implements Serializable {
88
private String name;
99
private Timestamp t;
1010

@@ -15,10 +15,10 @@ public Timestamp getT() {
1515
return this.t;
1616
}
1717

18-
public MagicTime() {
18+
public JavaMagicTime() {
1919
}
2020

21-
public MagicTime(String newName, Timestamp nt) {
21+
public JavaMagicTime(String newName, Timestamp nt) {
2222
this.name = newName;
2323
this.t = nt;
2424
}

src/test/pre-2.0/java/com/holdenkarau/spark/testing/SampleJavaDataFrameTest.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,33 +84,33 @@ public void testApproximateEqualRows() {
8484
}
8585

8686
public void testApproximateEqualTimestamp() {
87-
List<MagicTime> magics1 = Arrays.asList(
88-
new MagicTime("Holden", Timestamp.valueOf("2018-01-12 19:17:32")),
89-
new MagicTime("Shakanti", Timestamp.valueOf("2018-01-12 19:17:32")));
87+
List<JavaMagicTime> magics1 = Arrays.asList(
88+
new JavaMagicTime("Holden", Timestamp.valueOf("2018-01-12 19:17:32")),
89+
new JavaMagicTime("Shakanti", Timestamp.valueOf("2018-01-12 19:17:32")));
9090

91-
List<MagicTime> magics2 = Arrays.asList(
92-
new MagicTime("Holden", Timestamp.valueOf("2018-01-12 19:17:35")),
93-
new MagicTime("Shakanti", Timestamp.valueOf("2018-01-12 19:18:40")));
91+
List<JavaMagicTime> magics2 = Arrays.asList(
92+
new JavaMagicTime("Holden", Timestamp.valueOf("2018-01-12 19:17:35")),
93+
new JavaMagicTime("Shakanti", Timestamp.valueOf("2018-01-12 19:18:40")));
9494

9595
assertDataFrameApproximateEquals(timeDF(magics1), timeDF(magics2), 75000);
9696
}
9797

9898
@Test (expected = java.lang.AssertionError.class)
9999
public void testApproximateNotEqualTimestamp() {
100-
List<MagicTime> magics1 = Arrays.asList(new MagicTime("Holden", Timestamp.valueOf("2018-01-12 19:17:32")),
101-
new MagicTime("Shakanti", Timestamp.valueOf("2018-01-12 19:17:32")));
100+
List<JavaMagicTime> magics1 = Arrays.asList(new JavaMagicTime("Holden", Timestamp.valueOf("2018-01-12 19:17:32")),
101+
new JavaMagicTime("Shakanti", Timestamp.valueOf("2018-01-12 19:17:32")));
102102

103-
List<MagicTime> magics2 = Arrays.asList(new MagicTime("Holden", Timestamp.valueOf("2018-01-12 19:17:35")),
104-
new MagicTime("Shakanti", Timestamp.valueOf("2018-01-12 19:18:40")));
103+
List<JavaMagicTime> magics2 = Arrays.asList(new JavaMagicTime("Holden", Timestamp.valueOf("2018-01-12 19:17:35")),
104+
new JavaMagicTime("Shakanti", Timestamp.valueOf("2018-01-12 19:18:40")));
105105

106106
assertDataFrameApproximateEquals(timeDF(magics1), timeDF(magics2), 59000);
107107
}
108108

109109
@Test
110110
public void testApproximateEqualTimeRows() {
111-
List<MagicTime> magics = Arrays.asList(
112-
new MagicTime("Shakanti", Timestamp.valueOf("2018-01-12 20:49:32")),
113-
new MagicTime("Shakanti", Timestamp.valueOf("2018-01-12 20:50:02")));
111+
List<JavaMagicTime> magics = Arrays.asList(
112+
new JavaMagicTime("Shakanti", Timestamp.valueOf("2018-01-12 20:49:32")),
113+
new JavaMagicTime("Shakanti", Timestamp.valueOf("2018-01-12 20:50:02")));
114114

115115
DataFrame df = timeDF(magics);
116116

@@ -122,9 +122,9 @@ public void testApproximateEqualTimeRows() {
122122
assertFalse(approxEquals(row1, row2, 0));
123123
}
124124

125-
private DataFrame timeDF(List<MagicTime> list) {
126-
JavaRDD<MagicTime> rdd = jsc().parallelize(list);
127-
return sqlContext().createDataFrame(rdd, MagicTime.class);
125+
private DataFrame timeDF(List<JavaMagicTime> list) {
126+
JavaRDD<JavaMagicTime> rdd = jsc().parallelize(list);
127+
return sqlContext().createDataFrame(rdd, JavaMagicTime.class);
128128
}
129129

130130
private DataFrame toDF(List<BasicMagic> list) {

0 commit comments

Comments
 (0)