From d4bbaf405d2e0b6be0e3c82cf23f41393cebeb0d Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Wed, 21 Jul 2021 13:41:59 +0900 Subject: [PATCH] Add containsEntry overload that accepts int (#3412) --- .../apidiffs/current_vs_latest/opentelemetry-sdk-testing.txt | 3 +++ .../opentelemetry/sdk/testing/assertj/AttributesAssert.java | 5 +++++ .../sdk/testing/assertj/OpenTelemetryAssertionsTest.java | 2 ++ 3 files changed, 10 insertions(+) diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-testing.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-testing.txt index e0f92c9d45..6a27943f7d 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-testing.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-testing.txt @@ -1,4 +1,7 @@ Comparing source compatibility of against +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.testing.assertj.AttributesAssert (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.testing.assertj.AttributesAssert containsEntry(io.opentelemetry.api.common.AttributeKey, int) *** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.testing.assertj.SpanDataAssert (not serializable) === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.testing.assertj.SpanDataAssert hasException(java.lang.Throwable) diff --git a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/AttributesAssert.java b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/AttributesAssert.java index bb19d51007..f164d6b53e 100644 --- a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/AttributesAssert.java +++ b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/AttributesAssert.java @@ -38,6 +38,11 @@ public final class AttributesAssert extends AbstractAssert key, int value) { + return containsEntry(key, (long) value); + } + /** Asserts the attributes have the given key and string value. */ public AttributesAssert containsEntry(String key, String value) { return containsEntry(AttributeKey.stringKey(key), value); diff --git a/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/assertj/OpenTelemetryAssertionsTest.java b/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/assertj/OpenTelemetryAssertionsTest.java index 980f66c847..8deaa01f9c 100644 --- a/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/assertj/OpenTelemetryAssertionsTest.java +++ b/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/assertj/OpenTelemetryAssertionsTest.java @@ -146,6 +146,8 @@ class OpenTelemetryAssertionsTest { .containsEntry("bear", "mya") .containsEntry("warm", true) .containsEntry("temperature", 30) + .containsEntry(AttributeKey.longKey("temperature"), 30L) + .containsEntry(AttributeKey.longKey("temperature"), 30) .containsEntry("length", 1.2) .containsEntry("colors", "red", "blue") .containsEntryWithStringValuesOf("colors", Arrays.asList("red", "blue"))