This is an automated email from the ASF dual-hosted git repository.
abhishek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 161d12eb44 Fix unit tests for java 17 (#14207)
161d12eb44 is described below
commit 161d12eb445e3f2123020a7d82beea9cd5bb7182
Author: George Shiqi Wu <[email protected]>
AuthorDate: Tue May 9 10:32:31 2023 -0400
Fix unit tests for java 17 (#14207)
Fix a unit test that fails in java 17
---
.../common/PodTemplateTaskAdapterTest.java | 27 +++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateTaskAdapterTest.java
b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateTaskAdapterTest.java
index a0bacf2d65..1e35b90a53 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateTaskAdapterTest.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateTaskAdapterTest.java
@@ -43,6 +43,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
+import java.util.Map;
import java.util.Properties;
public class PodTemplateTaskAdapterTest
@@ -137,7 +138,7 @@ public class PodTemplateTaskAdapterTest
Job actual = adapter.fromTask(task);
Job expected = K8sTestUtils.fileToResource("expectedNoopJob.yaml",
Job.class);
- Assertions.assertEquals(expected, actual);
+ assertJobSpecsEqual(actual, expected);
}
@Test
@@ -179,7 +180,7 @@ public class PodTemplateTaskAdapterTest
Job actual = adapter.fromTask(task);
Job expected =
K8sTestUtils.fileToResource("expectedNoopJobTlsEnabled.yaml", Job.class);
- Assertions.assertEquals(expected, actual);
+ assertJobSpecsEqual(actual, expected);
}
@Test
@@ -234,7 +235,7 @@ public class PodTemplateTaskAdapterTest
Job actual = adapter.fromTask(task);
Job expected = K8sTestUtils.fileToResource("expectedNoopJob.yaml",
Job.class);
- Assertions.assertEquals(expected, actual);
+ assertJobSpecsEqual(actual, expected);
}
@Test
@@ -314,4 +315,24 @@ public class PodTemplateTaskAdapterTest
Assertions.assertEquals(expected, actual);
}
+
+
+ private void assertJobSpecsEqual(Job actual, Job expected) throws IOException
+ {
+ Map<String, String> actualAnnotations =
actual.getSpec().getTemplate().getMetadata().getAnnotations();
+ String actualTaskAnnotation =
actualAnnotations.get(DruidK8sConstants.TASK);
+ actualAnnotations.remove(DruidK8sConstants.TASK);
+
actual.getSpec().getTemplate().getMetadata().setAnnotations(actualAnnotations);
+
+ Map<String, String> expectedAnnotations =
expected.getSpec().getTemplate().getMetadata().getAnnotations();
+ String expectedTaskAnnotation =
expectedAnnotations.get(DruidK8sConstants.TASK);
+ expectedAnnotations.remove(DruidK8sConstants.TASK);
+
expected.getSpec().getTemplate().getMetadata().setAnnotations(expectedAnnotations);
+
+ Assertions.assertEquals(actual, expected);
+ Assertions.assertEquals(
+ Base64Compression.decompressBase64(actualTaskAnnotation),
+ Base64Compression.decompressBase64(expectedTaskAnnotation)
+ );
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
