Skip to content

Commit 00a8451

Browse files
diana-derosediana-derose
committed
update unit test
1 parent a991df2 commit 00a8451

File tree

3 files changed

+25
-31
lines changed

3 files changed

+25
-31
lines changed

‎ipp-v3-java-devkit/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@
9191
<version>1.25</version>
9292
<scope>test</scope>
9393
</dependency>
94-
<dependency>
95-
<groupId>org.junit.jupiter</groupId>
96-
<artifactId>junit-jupiter-api</artifactId>
97-
<version>5.5.0</version>
98-
<scope>test</scope>
99-
</dependency>
10094

10195
</dependencies>
10296

‎ipp-v3-java-devkit/src/test/java/com/intuit/ipp/query/QueryTest.java‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626

2727

2828

29-
import static org.junit.jupiter.api.Assertions.assertEquals;
29+
//import static org.junit.jupiter.api.Assertions.assertEquals;
30+
import org.testng.Assert;
3031

3132

3233

@@ -64,7 +65,7 @@ public void testQuery_datatypes() {
6465
$(data.isBooleanData()).eq(true), $(data.getDateData()).eq(calendar.getTime()), $(data.getEnumData()).eq(EntityStatusEnum.PENDING))
6566
.generate();
6667
String expectedQuery = "SELECT StringData, IntData, ByteData, ShortData, LongData, FloatData, DoubleData, CalendarData, BooleanData, DateData, EnumData FROM Data WHERE StringData = 'StringValue' AND IntData = '10' AND ByteData = '10' AND ShortData = '10' AND LongData = '10' AND FloatData = '10.0' AND DoubleData = '10.0' AND CalendarData = '" + dateString + "' AND BooleanData = true AND DateData = '" + dateString + "' AND EnumData = 'Pending'";
67-
assertEquals(expectedQuery, query);
68+
Assert.assertEquals(expectedQuery, query);
6869
}
6970

7071
@Test
@@ -77,7 +78,7 @@ public void testQuery_eq() {
7778
.generate();
7879
String expectedQuery = "SELECT * FROM Data WHERE StringData = 'StringValue' AND IntData = '10' AND ByteData = '10' AND ShortData = '10' AND LongData = '10' AND FloatData = '10.0' AND DoubleData = '10.0' AND CalendarData = '" + dateString + "' AND BooleanData = true AND DateData = '" + dateString + "' AND EnumData = 'Pending'";
7980

80-
assertEquals(expectedQuery, query);
81+
Assert.assertEquals(expectedQuery, query);
8182
}
8283

8384
@Test
@@ -90,7 +91,7 @@ public void testQuery_neq() {
9091
$(data.getDateData()).neq(calendar.getTime()), $(data.getEnumData()).neq(EntityStatusEnum.PENDING)).generate();
9192
String expectedQuery = "SELECT * FROM Data WHERE StringData != 'StringValue' AND IntData != '10' AND ByteData != '10' AND ShortData != '10' AND LongData != '10' AND FloatData != '10.0' AND DoubleData != '10.0' AND CalendarData != '" + dateString + "' AND BooleanData != true AND DateData != '" + dateString + "' AND EnumData != 'Pending'";
9293
LOG.debug(query);
93-
assertEquals(expectedQuery, query);
94+
Assert.assertEquals(expectedQuery, query);
9495
}
9596

9697
@Test
@@ -102,7 +103,7 @@ public void testQuery_lt() {
102103
$(data.getDateData()).lt(calendar.getTime()), $(data.getEnumData()).lt(EntityStatusEnum.PENDING)).generate();
103104
String expectedQuery = "SELECT * FROM Data WHERE StringData < 'StringValue' AND IntData < '10' AND ByteData < '10' AND ShortData < '10' AND LongData < '10' AND FloatData < '10.0' AND DoubleData < '10.0' AND CalendarData < '" + dateString + "' AND DateData < '" + dateString + "' AND EnumData < 'Pending'";
104105
LOG.debug(query);
105-
assertEquals(expectedQuery, query);
106+
Assert.assertEquals(expectedQuery, query);
106107
}
107108

108109
@Test
@@ -114,7 +115,7 @@ public void testQuery_lte() {
114115
$(data.getDateData()).lte(calendar.getTime()), $(data.getEnumData()).lte(EntityStatusEnum.PENDING)).generate();
115116
String expectedQuery = "SELECT * FROM Data WHERE StringData <= 'StringValue' AND IntData <= '10' AND ByteData <= '10' AND ShortData <= '10' AND LongData <= '10' AND FloatData <= '10.0' AND DoubleData <= '10.0' AND CalendarData <= '" + dateString + "' AND DateData <= '" + dateString + "' AND EnumData <= 'Pending'";
116117
LOG.debug(query);
117-
assertEquals(expectedQuery, query);
118+
Assert.assertEquals(expectedQuery, query);
118119
}
119120

120121
@Test
@@ -126,7 +127,7 @@ public void testQuery_gt() {
126127
$(data.getDateData()).gt(calendar.getTime()), $(data.getEnumData()).gt(EntityStatusEnum.PENDING)).generate();
127128
String expectedQuery = "SELECT * FROM Data WHERE StringData > 'StringValue' AND IntData > '10' AND ByteData > '10' AND ShortData > '10' AND LongData > '10' AND FloatData > '10.0' AND DoubleData > '10.0' AND CalendarData > '" + dateString + "' AND DateData > '" + dateString + "' AND EnumData > 'Pending'";
128129
LOG.debug(query);
129-
assertEquals(expectedQuery, query);
130+
Assert.assertEquals(expectedQuery, query);
130131
}
131132

132133
@Test
@@ -138,7 +139,7 @@ public void testQuery_gte() {
138139
$(data.getDateData()).gte(calendar.getTime()), $(data.getEnumData()).gte(EntityStatusEnum.PENDING)).generate();
139140
String expectedQuery = "SELECT * FROM Data WHERE StringData >= 'StringValue' AND IntData >= '10' AND ByteData >= '10' AND ShortData >= '10' AND LongData >= '10' AND FloatData >= '10.0' AND DoubleData >= '10.0' AND CalendarData >= '" + dateString + "' AND DateData >= '" + dateString + "' AND EnumData >= 'Pending'";
140141
LOG.debug(query);
141-
assertEquals(expectedQuery, query);
142+
Assert.assertEquals(expectedQuery, query);
142143
}
143144

144145
@Test
@@ -153,7 +154,7 @@ public void testQuery_in() {
153154
$(data.getEnumData()).in(new EntityStatusEnum[] { EntityStatusEnum.PENDING, EntityStatusEnum.DELETED })).generate();
154155
String expectedQuery = "SELECT * FROM Data WHERE StringData IN ('StringValue1', 'StringValue2') AND IntData IN ('10', '20') AND ByteData IN ('10', '20') AND ShortData IN ('10', '20') AND LongData IN ('10', '20') AND FloatData IN ('10.0', '20.0') AND DoubleData IN ('10.0', '20.0') AND BooleanData IN (true, false) AND CalendarData IN ('" + dateString + "', '" + dateString + "') AND DateData IN ('" + dateString + "', '" + dateString + "') AND EnumData IN ('Pending', 'Deleted')";
155156
LOG.debug(query);
156-
assertEquals(expectedQuery, query);
157+
Assert.assertEquals(expectedQuery, query);
157158
}
158159

159160
@Test
@@ -172,7 +173,7 @@ public void testQuery_between() {
172173
).generate();
173174
LOG.debug(query);
174175
String expectedQuery = "SELECT * FROM Data WHERE StringData BETWEEN 'StringValue1' AND 'StringValue2' AND IntData BETWEEN '10' AND '20' AND ByteData BETWEEN '10' AND '20' AND ShortData BETWEEN '10' AND '20' AND LongData BETWEEN '10' AND '20' AND FloatData BETWEEN '10.0' AND '20.0' AND DoubleData BETWEEN '10.0' AND '20.0' AND CalendarData BETWEEN '" + dateString + "Z' AND '" + dateString + "' AND DateData BETWEEN '" + dateString + "' AND '" + dateString.substring(0, dateString.length() - 1) + "'";
175-
assertEquals(expectedQuery, query);
176+
Assert.assertEquals(expectedQuery, query);
176177
}
177178

178179
@Test
@@ -181,17 +182,17 @@ public void testQuery_like() {
181182
String query = select($(data)).where($(data.getStringData()).startsWith("StringValue")).generate();
182183
String expectedQuery = "SELECT * FROM Data WHERE StringData LIKE 'StringValue%'";
183184
LOG.debug(query);
184-
assertEquals(expectedQuery, query);
185+
Assert.assertEquals(expectedQuery, query);
185186

186187
query = select($(data)).where($(data.getStringData()).endsWith("StringValue")).generate();
187188
expectedQuery = "SELECT * FROM Data WHERE StringData LIKE '%StringValue'";
188189
LOG.debug(query);
189-
assertEquals(expectedQuery, query);
190+
Assert.assertEquals(expectedQuery, query);
190191

191192
query = select($(data)).where($(data.getStringData()).contains("StringValue")).generate();
192193
expectedQuery = "SELECT * FROM Data WHERE StringData LIKE '%StringValue%'";
193194
LOG.debug(query);
194-
assertEquals(expectedQuery, query);
195+
Assert.assertEquals(expectedQuery, query);
195196
}
196197

197198
@Test
@@ -200,22 +201,22 @@ public void testQuery_select() {
200201
String query = select($(data.getSubData())).generate();
201202
String expectedQuery = "SELECT SubData.* FROM Data";
202203
LOG.debug(query);
203-
assertEquals(expectedQuery, query);
204+
Assert.assertEquals(expectedQuery, query);
204205
}
205206

206207
@Test
207208
public void testQuery_orderby() {
208209
Data data = GenerateQuery.createQueryEntity(Data.class);
209210
String query = select($(data)).orderByAscending($(data.getStringData()), $(data.getIntData())).generate();
210211
String expectedQuery = "SELECT * FROM Data ORDERBY StringData, IntData ASC";
211-
assertEquals(expectedQuery, query);
212+
Assert.assertEquals(expectedQuery, query);
212213
query = select($(data)).orderByDescending($(data.getStringData()), $(data.getIntData())).generate();
213214
expectedQuery = "SELECT * FROM Data ORDERBY StringData, IntData DESC";
214215
LOG.debug(query);
215-
assertEquals(expectedQuery, query);
216+
Assert.assertEquals(expectedQuery, query);
216217
query = select($(data)).orderBy($(data.getStringData()), $(data.getIntData())).generate();
217218
expectedQuery = "SELECT * FROM Data ORDERBY StringData, IntData";
218-
assertEquals(expectedQuery, query);
219+
Assert.assertEquals(expectedQuery, query);
219220

220221
}
221222

@@ -225,7 +226,7 @@ public void testQuery_not() {
225226
String query = select($(data)).where($(data.getIntData()).eq(10).negate()).generate();
226227
String expectedQuery = "SELECT * FROM Data WHERE NOT IntData = '10'";
227228
LOG.debug(query);
228-
assertEquals(expectedQuery, query);
229+
Assert.assertEquals(expectedQuery, query);
229230
}
230231

231232
@Test
@@ -234,17 +235,17 @@ public void testQuery_pagination() {
234235
String query = select($(data)).skip(10).generate();
235236
String expectedQuery = "SELECT * FROM Data STARTPOSITION 11";
236237
LOG.debug(query);
237-
assertEquals(expectedQuery, query);
238+
Assert.assertEquals(expectedQuery, query);
238239

239240
query = select($(data)).take(10).generate();
240241
expectedQuery = "SELECT * FROM Data MAXRESULTS 10";
241242
LOG.debug(query);
242-
assertEquals(expectedQuery, query);
243+
Assert.assertEquals(expectedQuery, query);
243244

244245
query = select($(data)).skip(10).take(10).generate();
245246
expectedQuery = "SELECT * FROM Data STARTPOSITION 11 MAXRESULTS 10";
246247
LOG.debug(query);
247-
assertEquals(expectedQuery, query);
248+
Assert.assertEquals(expectedQuery, query);
248249
}
249250

250251
@Test
@@ -253,7 +254,7 @@ public void testQuery_count() {
253254
String query = selectCount(data).generate();
254255
String expectedQuery = "SELECT count(*) FROM Data";
255256
LOG.debug(query);
256-
assertEquals(expectedQuery, query);
257+
Assert.assertEquals(expectedQuery, query);
257258
}
258259

259260
@Test
@@ -274,7 +275,7 @@ public void testQuery_calendar() {
274275
$(data.getCalendarData()).between(date, date)).generate();
275276
String expectedQuery = "SELECT * FROM Data WHERE CalendarData = '" + date + "' AND CalendarData != '" + date + "' AND CalendarData > '" + date + "' AND CalendarData >= '" + date + "' AND CalendarData IN ('" + date + "', '" + date + "') AND CalendarData < '" + date + "' AND CalendarData <= '" + date + "' AND CalendarData BETWEEN '" + date + "Z' AND '" + date + "'";
276277
LOG.debug(query);
277-
assertEquals(expectedQuery, query);
278+
Assert.assertEquals(expectedQuery, query);
278279
}
279280

280281
@Test
@@ -283,7 +284,7 @@ public void testQuery_line() {
283284
String query = select($(data.getLine())).generate();
284285
String expectedQuery = "SELECT Line.* FROM Invoice";
285286
LOG.debug(query);
286-
assertEquals(expectedQuery, query);
287+
Assert.assertEquals(expectedQuery, query);
287288
}
288289

289290
private String getCalendarAsString(Calendar cal) {

‎ipp-v3-java-devkit/src/test/java/com/intuit/ipp/services/DataServiceUT.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.intuit.ipp.interceptors.RequestElements;
2222
import com.intuit.ipp.net.OperationType;
2323

24-
import static org.junit.jupiter.api.Assertions.*;
2524

2625
import mockit.Mock;
2726
import mockit.MockUp;

0 commit comments

Comments
 (0)