Skip to content

Commit ffeddfd

Browse files
authored
Fix tests in Face SDK (#45865)
1 parent bfe7581 commit ffeddfd

File tree

6 files changed

+15
-41
lines changed

6 files changed

+15
-41
lines changed

sdk/face/azure-ai-vision-face/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949
<checkstyle.suppressionsLocation>checkstyle-suppressions.xml</checkstyle.suppressionsLocation>
5050
<spotbugs.skip>false</spotbugs.skip>
5151
<spotbugs.excludeFilterFile>spotbugs-exclude.xml</spotbugs.excludeFilterFile>
52+
53+
<javaModulesSurefireArgLine>
54+
--add-exports com.azure.ai.vision.face/com.azure.ai.vision.face.tests.utils=ALL-UNNAMED
55+
--add-exports com.azure.ai.vision.face/com.azure.ai.vision.face.tests.utils.http=ALL-UNNAMED
56+
</javaModulesSurefireArgLine>
5257
</properties>
5358
<dependencies>
5459
<dependency>
@@ -69,7 +74,7 @@
6974
<dependency>
7075
<groupId>com.azure</groupId>
7176
<artifactId>azure-core-test</artifactId>
72-
<version>1.27.0-beta.9</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
77+
<version>1.27.0-beta.10</version> <!-- {x-version-update;unreleased_com.azure:azure-core-test;dependency} -->
7378
<scope>test</scope>
7479
</dependency>
7580
<dependency>

sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/DetectionTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import com.azure.ai.vision.face.samples.utils.Resources;
1313
import com.azure.ai.vision.face.tests.commands.detection.DetectSyncFunction;
1414
import com.azure.ai.vision.face.tests.commands.detection.DetectionFunctionProvider;
15-
import com.azure.ai.vision.face.tests.utils.FaceDisplayNameGenerator;
1615
import com.azure.ai.vision.face.tests.utils.TestUtils;
1716
import com.azure.core.test.annotation.RecordWithoutRequestBody;
1817
import org.junit.jupiter.api.Assertions;
1918
import org.junit.jupiter.api.DisplayNameGeneration;
19+
import org.junit.jupiter.api.DisplayNameGenerator;
2020
import org.junit.jupiter.api.TestInstance;
2121
import org.junit.jupiter.params.ParameterizedTest;
2222
import org.junit.jupiter.params.provider.Arguments;
@@ -27,7 +27,7 @@
2727
import java.util.function.Supplier;
2828
import java.util.stream.Stream;
2929

30-
@DisplayNameGeneration(FaceDisplayNameGenerator.class)
30+
@DisplayNameGeneration(DisplayNameGenerator.Standard.class)
3131
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
3232
@RecordWithoutRequestBody
3333
public class DetectionTest extends FaceClientTestBase {
@@ -46,7 +46,7 @@ public void testDetectFaceReturnFaceIdAndReturnRecognitionModel(String httpClien
4646

4747
Assertions.assertNotNull(detectResults);
4848

49-
Assertions.assertEquals(detectResults.size(), 1);
49+
Assertions.assertEquals(1, detectResults.size());
5050
FaceDetectionResult result = detectResults.get(0);
5151

5252
Assertions.assertEquals(returnFaceId, result.getFaceId() != null);

sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/LivenessSessionTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import com.azure.ai.vision.face.models.LivenessSession;
1313
import com.azure.ai.vision.face.tests.commands.liveness.ILivenessSessionSyncCommands;
1414
import com.azure.ai.vision.face.tests.commands.liveness.LivenessSessionCommandsProvider;
15-
import com.azure.ai.vision.face.tests.utils.FaceDisplayNameGenerator;
1615
import com.azure.ai.vision.face.tests.utils.TestUtils;
1716
import org.junit.jupiter.api.AfterEach;
1817
import org.junit.jupiter.api.Assertions;
1918
import org.junit.jupiter.api.BeforeEach;
2019
import org.junit.jupiter.api.DisplayNameGeneration;
20+
import org.junit.jupiter.api.DisplayNameGenerator;
2121
import org.junit.jupiter.api.TestInstance;
2222
import org.junit.jupiter.params.ParameterizedTest;
2323
import org.junit.jupiter.params.provider.Arguments;
@@ -28,7 +28,7 @@
2828
import java.util.function.Supplier;
2929
import java.util.stream.Stream;
3030

31-
@DisplayNameGeneration(FaceDisplayNameGenerator.class)
31+
@DisplayNameGeneration(DisplayNameGenerator.Standard.class)
3232
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
3333
public class LivenessSessionTest extends FaceClientTestBase {
3434
private ILivenessSessionSyncCommands mCurrentCommand;
@@ -68,7 +68,7 @@ public void testCreateSessionWithTokenTTL(String httpClientName, FaceServiceVers
6868
CreateLivenessSessionResult result = createSessionAndVerify(livenessCommands, content);
6969
LivenessSession livenessSession = livenessCommands.getLivenessSessionResultSync(result.getSessionId());
7070
Assertions.assertNotNull(livenessSession);
71-
Assertions.assertEquals(livenessSession.getAuthTokenTimeToLiveInSeconds(), authTokenTimeToLiveInSeconds);
71+
Assertions.assertEquals(authTokenTimeToLiveInSeconds, livenessSession.getAuthTokenTimeToLiveInSeconds());
7272
}
7373

7474
@BeforeEach

sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/LivenessSessionWithVerifyTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
import com.azure.ai.vision.face.samples.utils.Utils;
1616
import com.azure.ai.vision.face.tests.commands.liveness.ILivenessWithVerifySessionSyncCommands;
1717
import com.azure.ai.vision.face.tests.commands.liveness.LivenessSessionWithVerifyCommandsProvider;
18-
import com.azure.ai.vision.face.tests.utils.FaceDisplayNameGenerator;
1918
import com.azure.ai.vision.face.tests.utils.TestUtils;
2019
import com.azure.core.test.annotation.RecordWithoutRequestBody;
2120
import com.azure.core.util.BinaryData;
2221
import org.junit.jupiter.api.AfterEach;
2322
import org.junit.jupiter.api.Assertions;
2423
import org.junit.jupiter.api.BeforeEach;
2524
import org.junit.jupiter.api.DisplayNameGeneration;
25+
import org.junit.jupiter.api.DisplayNameGenerator;
2626
import org.junit.jupiter.api.TestInstance;
2727
import org.junit.jupiter.params.ParameterizedTest;
2828
import org.junit.jupiter.params.provider.Arguments;
@@ -33,7 +33,7 @@
3333
import java.util.function.Supplier;
3434
import java.util.stream.Stream;
3535

36-
@DisplayNameGeneration(FaceDisplayNameGenerator.class)
36+
@DisplayNameGeneration(DisplayNameGenerator.Standard.class)
3737
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
3838
@RecordWithoutRequestBody
3939
public class LivenessSessionWithVerifyTest extends FaceClientTestBase {
@@ -77,7 +77,7 @@ public void testCreateSessionWithTokenTTL(String httpClientName, FaceServiceVers
7777
LivenessWithVerifySession livenessSession
7878
= livenessCommands.getLivenessWithVerifySessionResultSync(result.getSessionId());
7979
Assertions.assertNotNull(livenessSession);
80-
Assertions.assertEquals(livenessSession.getAuthTokenTimeToLiveInSeconds(), authTokenTimeToLiveInSeconds);
80+
Assertions.assertEquals(authTokenTimeToLiveInSeconds, livenessSession.getAuthTokenTimeToLiveInSeconds());
8181
}
8282

8383
@BeforeEach

sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/utils/FaceDisplayNameGenerator.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/utils/TestUtils.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44
package com.azure.ai.vision.face.tests.utils;
55

66
import com.azure.ai.vision.face.FaceServiceVersion;
7-
import org.junit.jupiter.params.ParameterizedTest;
87
import org.junit.jupiter.params.provider.Arguments;
98
import reactor.util.function.Tuple3;
109

1110
import java.util.Arrays;
1211
import java.util.stream.Stream;
1312

1413
public class TestUtils {
15-
public static final String DISPLAY_NAME_WITH_ARGUMENTS
16-
= "[" + ParameterizedTest.INDEX_PLACEHOLDER + "] " + ParameterizedTest.ARGUMENTS_WITH_NAMES_PLACEHOLDER;
1714

1815
public static final String EMPTY_UUID = "00000000-0000-0000-0000-000000000000";
1916
public static final String FAKE_TOKEN = "FAKE_TOKEN";

0 commit comments

Comments
 (0)