108
108
import java .time .Instant ;
109
109
import java .time .temporal .ChronoUnit ;
110
110
import java .util .ArrayList ;
111
+ import java .util .Arrays ;
111
112
import java .util .Comparator ;
112
113
import java .util .LinkedHashMap ;
113
114
import java .util .List ;
@@ -1362,8 +1363,9 @@ void createAndGetByProjectNameAndTraceId() {
1362
1363
List .of ());
1363
1364
}
1364
1365
1365
- @ Test
1366
- void createAndGetByProjectIdAndTraceIdAndType () {
1366
+ @ ParameterizedTest
1367
+ @ EnumSource (SpanType .class )
1368
+ void createAndGetByProjectIdAndTraceIdAndType (SpanType expectedType ) {
1367
1369
String workspaceName = UUID .randomUUID ().toString ();
1368
1370
String workspaceId = UUID .randomUUID ().toString ();
1369
1371
String apiKey = UUID .randomUUID ().toString ();
@@ -1379,7 +1381,7 @@ void createAndGetByProjectIdAndTraceIdAndType() {
1379
1381
.parentSpanId (null )
1380
1382
.projectName (projectName )
1381
1383
.traceId (traceId )
1382
- .type (SpanType . llm )
1384
+ .type (expectedType )
1383
1385
.feedbackScores (null )
1384
1386
.build ())
1385
1387
.toList ();
@@ -1396,7 +1398,7 @@ void createAndGetByProjectIdAndTraceIdAndType() {
1396
1398
.projectName (projectName )
1397
1399
.traceId (traceId )
1398
1400
.parentSpanId (null )
1399
- .type (SpanType . general )
1401
+ .type (findOtherSpanType ( expectedType ) )
1400
1402
.build ());
1401
1403
unexpectedSpans .forEach (
1402
1404
expectedSpan -> SpansResourceTest .this .createAndAssert (expectedSpan , apiKey , workspaceName ));
@@ -1406,7 +1408,7 @@ void createAndGetByProjectIdAndTraceIdAndType() {
1406
1408
null ,
1407
1409
projectId ,
1408
1410
traceId ,
1409
- SpanType . llm ,
1411
+ expectedType ,
1410
1412
null ,
1411
1413
1 ,
1412
1414
pageSize ,
@@ -1420,7 +1422,7 @@ void createAndGetByProjectIdAndTraceIdAndType() {
1420
1422
null ,
1421
1423
projectId ,
1422
1424
traceId ,
1423
- SpanType . llm ,
1425
+ expectedType ,
1424
1426
null ,
1425
1427
2 ,
1426
1428
pageSize ,
@@ -1431,6 +1433,11 @@ void createAndGetByProjectIdAndTraceIdAndType() {
1431
1433
List .of ());
1432
1434
}
1433
1435
1436
+ private SpanType findOtherSpanType (SpanType expectedType ) {
1437
+ return Arrays .stream (SpanType .values ()).filter (type -> type != expectedType ).findFirst ()
1438
+ .orElseThrow (() -> new IllegalArgumentException ("expected to find another span type" ));
1439
+ }
1440
+
1434
1441
@ ParameterizedTest
1435
1442
@ ValueSource (booleans = {true , false })
1436
1443
void whenUsingPagination__thenReturnTracesPaginated (boolean stream ) {
@@ -6338,11 +6345,9 @@ private static int randomNumber(int minValue, int maxValue) {
6338
6345
class GetFeedbackScoreNames {
6339
6346
6340
6347
Stream <Arguments > getFeedbackScoreNames__whenGetFeedbackScoreNames__thenReturnFeedbackScoreNames () {
6341
- return Stream .of (
6342
- arguments (Optional .empty ()),
6343
- arguments (Optional .of (SpanType .llm )),
6344
- arguments (Optional .of (SpanType .general )),
6345
- arguments (Optional .of (SpanType .tool )));
6348
+ return Stream .concat (
6349
+ Stream .of (arguments (Optional .empty ())),
6350
+ Arrays .stream (SpanType .values ()).map (type -> arguments (Optional .of (type ))));
6346
6351
}
6347
6352
6348
6353
@ ParameterizedTest
0 commit comments