From 593440d1f6423bf6eb71294a81ebec835b6c1c1c Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Fri, 10 Jul 2020 10:49:54 -0700 Subject: [PATCH] Move AzureTestWatcher into azure-core-test (#12989) * Move azure-test-watcher into azure-core-test * Remove references to azure-test-watcher --- common/azure-test-watcher/README.md | 43 ---------- common/azure-test-watcher/pom.xml | 81 ------------------- .../java/com/azure/testing/package-info.java | 7 -- .../org.junit.jupiter.api.extension.Extension | 1 - eng/versioning/version_client.txt | 1 - pom.xml | 1 - .../azure/core/test}/AzureTestWatcher.java | 2 +- .../org.junit.jupiter.api.extension.Extension | 1 + sdk/parents/azure-client-sdk-parent/pom.xml | 10 --- 9 files changed, 2 insertions(+), 145 deletions(-) delete mode 100644 common/azure-test-watcher/README.md delete mode 100644 common/azure-test-watcher/pom.xml delete mode 100644 common/azure-test-watcher/src/main/java/com/azure/testing/package-info.java delete mode 100644 common/azure-test-watcher/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension rename {common/azure-test-watcher/src/main/java/com/azure/testing => sdk/core/azure-core-test/src/main/java/com/azure/core/test}/AzureTestWatcher.java (98%) create mode 100644 sdk/core/azure-core-test/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension diff --git a/common/azure-test-watcher/README.md b/common/azure-test-watcher/README.md deleted file mode 100644 index 9c783341d4afc..0000000000000 --- a/common/azure-test-watcher/README.md +++ /dev/null @@ -1,43 +0,0 @@ -# Azure Test Watcher client library for Java - -Azure Test Watcher client library adds an implementations of JUnit 5's before and after test extensions and creates an SPI that will be loaded during the test run - -## Getting started - -### Prerequisites - -- Java Development Kit (JDK) with version 8 or above - -### Adding the package to your product - -[//]: # ({x-version-update-start;com.azure:azure-test-watcher;current}) -```xml - - com.azure - azure-test-watcher - 1.0.0-beta.1 - -``` -[//]: # ({x-version-update-end}) - -## Key concepts - - -## Examples - -## Troubleshooting - -## Next steps - -## Contributing - -If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft -Azure Projects Contribution Guidelines](http://azure.github.io/guidelines.html). - -1. Fork it -1. Create your feature branch (`git checkout -b my-new-feature`) -1. Commit your changes (`git commit -am 'Add some feature'`) -1. Push to the branch (`git push origin my-new-feature`) -1. Create new Pull Request - -![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fcommon%2Fazure-test-watcher%2FREADME.png) diff --git a/common/azure-test-watcher/pom.xml b/common/azure-test-watcher/pom.xml deleted file mode 100644 index 3210abbfa5a4d..0000000000000 --- a/common/azure-test-watcher/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - 4.0.0 - - com.azure - azure-test-watcher - 1.0.0-beta.1 - - - com.azure - azure-client-sdk-parent - 1.7.0 - ../../sdk/parents/azure-client-sdk-parent - - - - UTF-8 - - https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java - - 1.8 - 1.8 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - - - com.azure:* - - - org.junit.jupiter:junit-jupiter:[5.6.2] - org.junit.jupiter:junit-jupiter-api:[5.6.2] - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - ${packageOutputDirectory} - - - - default-jar - test - - jar - - - - - - - - - - org.junit.jupiter - junit-jupiter - 5.6.2 - - - org.junit.jupiter - junit-jupiter-api - 5.6.2 - - - diff --git a/common/azure-test-watcher/src/main/java/com/azure/testing/package-info.java b/common/azure-test-watcher/src/main/java/com/azure/testing/package-info.java deleted file mode 100644 index 295ed604e6709..0000000000000 --- a/common/azure-test-watcher/src/main/java/com/azure/testing/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -/** - * Package containing JUnit 5 testing extensions. - */ -package com.azure.testing; diff --git a/common/azure-test-watcher/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/common/azure-test-watcher/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension deleted file mode 100644 index 3fa30aa817c75..0000000000000 --- a/common/azure-test-watcher/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension +++ /dev/null @@ -1 +0,0 @@ -com.azure.testing.AzureTestWatcher diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 277a78335fb18..ca739e6b6f004 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -49,7 +49,6 @@ com.azure:azure-storage-internal-avro;12.0.0-beta.1;12.0.0-beta.2 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-storage-queue;12.6.0-beta.1;12.6.0-beta.2 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-spring-boot-test-aad;1.0.0;1.0.0 com.azure:azure-spring-boot-test-core;1.0.0;1.0.0 com.azure:azure-spring-boot-test-cosmosdb;1.0.0;1.0.0 diff --git a/pom.xml b/pom.xml index 807e0f82055ce..677664e21ce65 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,6 @@ pom 1.0.0 - common/azure-test-watcher common/perf-test-core eng/jacoco-test-coverage eng/code-quality-reports diff --git a/common/azure-test-watcher/src/main/java/com/azure/testing/AzureTestWatcher.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/AzureTestWatcher.java similarity index 98% rename from common/azure-test-watcher/src/main/java/com/azure/testing/AzureTestWatcher.java rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/AzureTestWatcher.java index ee79b70406651..551c6abc5b436 100644 --- a/common/azure-test-watcher/src/main/java/com/azure/testing/AzureTestWatcher.java +++ b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/AzureTestWatcher.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.testing; +package com.azure.core.test; import org.junit.jupiter.api.extension.AfterTestExecutionCallback; import org.junit.jupiter.api.extension.BeforeTestExecutionCallback; diff --git a/sdk/core/azure-core-test/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/sdk/core/azure-core-test/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension new file mode 100644 index 0000000000000..19d1b79f06c19 --- /dev/null +++ b/sdk/core/azure-core-test/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension @@ -0,0 +1 @@ +com.azure.core.test.AzureTestWatcher diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml index 8276bdfb8eb76..ad31d3479c60d 100644 --- a/sdk/parents/azure-client-sdk-parent/pom.xml +++ b/sdk/parents/azure-client-sdk-parent/pom.xml @@ -731,17 +731,7 @@ org.apache.maven.plugins maven-surefire-plugin 3.0.0-M3 - - - com.azure - azure-test-watcher - 1.0.0-beta.1 - - - - ../../../common/azure-test-watcher/target/azure-test-watcher-1.0.0-beta.1.jar - alphabetical false