Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Azure Remote Rendering tests by adding now missing dependencies and changed conversion error messages #39403

Merged
merged 7 commits into from
Mar 27, 2024
Merged

Fix Azure Remote Rendering tests by adding now missing dependencies and changed conversion error messages #39403

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e97f35a
Add new dependencies
Mar 26, 2024
9dc3fe2
Add test fixes
Mar 26, 2024
2c8f8fd
Add comments for analyzer and jdk 12 profile and fix accountId
Mar 26, 2024
929e03c
Correct versions and tags
Mar 27, 2024
bdb2a6d
Exclude tests for version 1.8
Mar 27, 2024
2760a19
Only add dependency if we are using java12plus
Mar 27, 2024
7cd5f23
Add test scope
Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/remoterendering/azure-mixedreality-remoterendering/assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "java",
"TagPrefix": "java/remoterendering/azure-mixedreality-remoterendering",
"Tag": "java/remoterendering/azure-mixedreality-remoterendering_24a8dbb81a"
"Tag": "java/remoterendering/azure-mixedreality-remoterendering_2fbd5a57df"
}
26 changes: 26 additions & 0 deletions sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@
<version>1.11.19</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-jdk-httpclient</artifactId>
<version>1.0.0-beta.11</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;dependency} -->
</dependency>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To have the tests work properly with Java 8, you'll want to remove this dependency and leave what is added later on with the JDK 12+ profile

Copy link
Member

@mssfang mssfang Mar 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

<profiles>
    <profile>
      <id>java12plus</id>
      <activation>
        <jdk>[12,)</jdk>
      </activation>
      <dependencies>
        <dependency>
          <groupId>com.azure</groupId>
          <artifactId>azure-core-http-jdk-httpclient</artifactId>
          <version>1.0.0-beta.11</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;dependency} -->
          <scope>test</scope>
        </dependency>
      </dependencies>
    </profile>
  </profiles>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-vertx</artifactId>
<version>1.0.0-beta.16</version> <!-- {x-version-update;com.azure:azure-core-http-vertx;dependency} -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is missing test scope

</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down Expand Up @@ -89,4 +99,20 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>java12plus</id>
<activation>
<jdk>[12,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-jdk-httpclient</artifactId>
<version>1.0.0-beta.11</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
7 changes: 4 additions & 3 deletions .../src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingAsyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,10 @@ public void failedConversionMissingAssetTest(HttpClient httpClient) {

assertEquals(AssetConversionStatus.FAILED, conversion.getStatus());
assertNotNull(conversion.getError());
// Invalid input provided. Check logs in output container for details.
assertTrue(conversion.getError().getMessage().toLowerCase(Locale.ROOT).contains("invalid input"));
assertTrue(conversion.getError().getMessage().toLowerCase(Locale.ROOT).contains("logs"));
assertEquals(conversion.getError().getCode(), "InputContainerError");
// Message: "Could not find the asset file in the storage account. Please make sure all paths and names are correct and the file is uploaded to storage."
assertNotNull(conversion.getError().getMessage());
assertTrue(conversion.getError().getMessage().toLowerCase(Locale.ROOT).contains("could not find the asset file in the storage account"));
})
.verifyComplete();
}
Expand Down
7 changes: 4 additions & 3 deletions ...ering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,10 @@ public void failedConversionMissingAssetTest(HttpClient httpClient) {

assertEquals(AssetConversionStatus.FAILED, conversion.getStatus());
assertNotNull(conversion.getError());
// Invalid input provided. Check logs in output container for details.
assertTrue(conversion.getError().getMessage().toLowerCase(Locale.ROOT).contains("invalid input"));
assertTrue(conversion.getError().getMessage().toLowerCase(Locale.ROOT).contains("logs"));
assertEquals(conversion.getError().getCode(), "InputContainerError");
// Message: "Could not find the asset file in the storage account. Please make sure all paths and names are correct and the file is uploaded to storage."
assertNotNull(conversion.getError().getMessage());
assertTrue(conversion.getError().getMessage().toLowerCase(Locale.ROOT).contains("could not find the asset file in the storage account"));
}

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
Expand Down
2 changes: 1 addition & 1 deletion ...ndering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class RemoteRenderingTestBase extends TestProxyTestBase {
private final String serviceEndpoint = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_SERVICE_ENDPOINT");

// NOT REAL ACCOUNT DETAILS
private final String playbackAccountId = "f5b3e69f-1e1b-46a5-a718-aea58a7a0f8e";
private final String playbackAccountId = "40831821-9a8b-4f81-b85f-018809a1f727";
private final String playbackAccountDomain = "mixedreality.azure.com";
private final String playbackAccountKey = "Sanitized";
private final String playbackStorageAccountName = "sdkTest";
Expand Down
2 changes: 2 additions & 0 deletions sdk/remoterendering/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ extends:
- name: azure-mixedreality-remoterendering
groupId: com.azure
safeName: azuremixedrealityremoterendering
MatrixFilters:
- JavaTestVersion=^(?!1.8).*
Loading