From d92fded3a94b7b41ed67301ccca5a22f20a4e405 Mon Sep 17 00:00:00 2001 From: Manodnya Jaydeep Bhoite Date: Thu, 17 Oct 2024 14:12:14 -0700 Subject: [PATCH 1/5] Add an extra . before the file extensions --- .../jetbrains/services/telemetry/OpenedFileTypesMetrics.kt | 3 ++- .../jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypesMetrics.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypesMetrics.kt index 43065a43a5a..79a9e7ef39e 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypesMetrics.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypesMetrics.kt @@ -52,7 +52,8 @@ class OpenedFileTypesMetricsService : Disposable { @Synchronized fun addToExistingTelemetryBatch(fileExt: String) { if (fileExt in ALLOWED_CODE_EXTENSIONS) { - currentOpenedFileTypes.add(fileExt) + val extension = ".$fileExt" + currentOpenedFileTypes.add(extension) } } diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt index 21aa8bd481c..8190985b71f 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt @@ -25,7 +25,7 @@ class OpenedFileTypeMetricsTest { @Test fun `test addToExistingTelemetryBatch with allowed extension`() { service.addToExistingTelemetryBatch("kt") - assert(service.getOpenedFileTypes().contains("kt")) + assert(service.getOpenedFileTypes().contains(".kt")) } @Test From 1d07ce869f0e84c5b0ed4b724a39e819bc82b812 Mon Sep 17 00:00:00 2001 From: Manodnya Jaydeep Bhoite Date: Thu, 24 Oct 2024 19:49:46 -0700 Subject: [PATCH 2/5] addressed feedback --- .../services/telemetry/OpenedFileTypeMetricsTest.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt index 8190985b71f..7a526432e12 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt @@ -3,10 +3,12 @@ package software.aws.toolkits.jetbrains.services.telemetry +import org.assertj.core.api.Assertions.assertThat import org.junit.After import org.junit.Before import org.junit.Test -import org.mockito.kotlin.times +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue class OpenedFileTypeMetricsTest { @@ -25,12 +27,12 @@ class OpenedFileTypeMetricsTest { @Test fun `test addToExistingTelemetryBatch with allowed extension`() { service.addToExistingTelemetryBatch("kt") - assert(service.getOpenedFileTypes().contains(".kt")) + assertTrue(service.getOpenedFileTypes().contains(".kt") ) } @Test fun `test addToExistingTelemetryBatch with disallowed extension`() { service.addToExistingTelemetryBatch("txt") - assert(service.getOpenedFileTypes().isEmpty()) + assertEquals(service.getOpenedFileTypes(), emptySet()) } } From d2d541224b07851779ba26d5e48147efff72b722 Mon Sep 17 00:00:00 2001 From: Manodnya Jaydeep Bhoite Date: Thu, 24 Oct 2024 19:55:04 -0700 Subject: [PATCH 3/5] detekt --- .../jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt index 7a526432e12..22b5ab3a93e 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt @@ -3,7 +3,6 @@ package software.aws.toolkits.jetbrains.services.telemetry -import org.assertj.core.api.Assertions.assertThat import org.junit.After import org.junit.Before import org.junit.Test @@ -27,7 +26,7 @@ class OpenedFileTypeMetricsTest { @Test fun `test addToExistingTelemetryBatch with allowed extension`() { service.addToExistingTelemetryBatch("kt") - assertTrue(service.getOpenedFileTypes().contains(".kt") ) + assertTrue(service.getOpenedFileTypes().contains(".kt")) } @Test From 3ab0029bd43505f7b2cf138225961dceae1a7f50 Mon Sep 17 00:00:00 2001 From: Manodnya Jaydeep Bhoite Date: Fri, 25 Oct 2024 13:53:01 -0700 Subject: [PATCH 4/5] feedback --- .../telemetry/OpenedFileTypeMetricsTest.kt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt index 22b5ab3a93e..d2999aed33b 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt @@ -3,22 +3,21 @@ package software.aws.toolkits.jetbrains.services.telemetry -import org.junit.After -import org.junit.Before -import org.junit.Test -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertTrue +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test class OpenedFileTypeMetricsTest { private lateinit var service: OpenedFileTypesMetricsService - @Before + @BeforeEach fun setup() { service = OpenedFileTypesMetricsService() } - @After + @AfterEach fun teardown() { service.dispose() } @@ -26,12 +25,12 @@ class OpenedFileTypeMetricsTest { @Test fun `test addToExistingTelemetryBatch with allowed extension`() { service.addToExistingTelemetryBatch("kt") - assertTrue(service.getOpenedFileTypes().contains(".kt")) + assertThat(service.getOpenedFileTypes().contains(".kt")) } @Test fun `test addToExistingTelemetryBatch with disallowed extension`() { service.addToExistingTelemetryBatch("txt") - assertEquals(service.getOpenedFileTypes(), emptySet()) + assertThat(service.getOpenedFileTypes().isEmpty()) } } From b88fd07551f6c26cb64363acb65ecd407c19e44e Mon Sep 17 00:00:00 2001 From: Manodnya Jaydeep Bhoite Date: Mon, 28 Oct 2024 10:42:32 -0700 Subject: [PATCH 5/5] Updated tests --- .../jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt index d2999aed33b..c5afffb3c28 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt @@ -25,12 +25,12 @@ class OpenedFileTypeMetricsTest { @Test fun `test addToExistingTelemetryBatch with allowed extension`() { service.addToExistingTelemetryBatch("kt") - assertThat(service.getOpenedFileTypes().contains(".kt")) + assertThat(service.getOpenedFileTypes()).contains(".kt") } @Test fun `test addToExistingTelemetryBatch with disallowed extension`() { service.addToExistingTelemetryBatch("txt") - assertThat(service.getOpenedFileTypes().isEmpty()) + assertThat(service.getOpenedFileTypes()).isEmpty() } }