-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
issue-183: Use tags instead of suites to separate tests
- Loading branch information
1 parent
9ceb965
commit c6abda9
Showing
24 changed files
with
474 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
src/test/java/org/carlspring/cloud/storage/s3fs/junit/annotations/BaseAnnotationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package org.carlspring.cloud.storage.s3fs.junit.annotations; | ||
|
|
||
| public abstract class BaseAnnotationTest | ||
| { | ||
|
|
||
| /** | ||
| * Check if there is an {@link S3IntegrationTest} annotation at a class level. | ||
| * | ||
| * @param clazz | ||
| * @return | ||
| */ | ||
| protected static boolean hasS3Annotation(Class<?> clazz) | ||
| { | ||
| return clazz.getAnnotation(S3IntegrationTest.class) != null; | ||
| } | ||
|
|
||
| /** | ||
| * Check if there is an {@link S3IntegrationTest} annotation at a method level (and pick-up class level) | ||
| * | ||
| * @param clazz | ||
| * @param methodName | ||
| * @return | ||
| * @throws NoSuchMethodException | ||
| */ | ||
| protected static boolean hasS3Annotation(Class<?> clazz, | ||
| String methodName) | ||
| throws NoSuchMethodException | ||
| { | ||
| return hasS3Annotation(clazz) || clazz.getMethod(methodName).getAnnotation(S3IntegrationTest.class) != null; | ||
| } | ||
|
|
||
| /** | ||
| * Check if there is an {@link MinioIntegrationTest} annotation at a class level. | ||
| * | ||
| * @param clazz | ||
| * @return | ||
| */ | ||
| protected static boolean hasMinioAnnotation(Class<?> clazz) | ||
| { | ||
| return clazz.getAnnotation(MinioIntegrationTest.class) != null; | ||
| } | ||
|
|
||
| /** | ||
| * Check if there is an {@link MinioIntegrationTest} annotation at a method level (and pick-up class level) | ||
| * | ||
| * @param clazz | ||
| * @param methodName | ||
| * @return | ||
| * @throws NoSuchMethodException | ||
| */ | ||
| protected static boolean hasMinioAnnotation(Class<?> clazz, | ||
| String methodName) | ||
| throws NoSuchMethodException | ||
| { | ||
| return hasMinioAnnotation(clazz) || clazz.getMethod(methodName).getAnnotation(MinioIntegrationTest.class) != null; | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
src/test/java/org/carlspring/cloud/storage/s3fs/junit/annotations/MinioIntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package org.carlspring.cloud.storage.s3fs.junit.annotations; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| import org.junit.jupiter.api.Tag; | ||
|
|
||
| /** | ||
| * This annotation should be used for integration tests which are specific to MinIO. | ||
| * It is possible to combine it with {@link S3IntegrationTest} for test cases which are compatible with both (i.e. can | ||
| * run on S3 and MinIO) | ||
| */ | ||
| @Target({ ElementType.TYPE, ElementType.METHOD }) | ||
| @Retention(RetentionPolicy.RUNTIME) | ||
| @Tag("it-minio") | ||
| public @interface MinioIntegrationTest | ||
| { | ||
|
|
||
| } |
41 changes: 41 additions & 0 deletions
41
...g/carlspring/cloud/storage/s3fs/junit/annotations/MinioIntegrationTestAnnotationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package org.carlspring.cloud.storage.s3fs.junit.annotations; | ||
|
|
||
|
|
||
| import org.carlspring.cloud.storage.s3fs.junit.examples.*; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| public class MinioIntegrationTestAnnotationTest | ||
| extends BaseAnnotationTest | ||
| { | ||
|
|
||
| @Test | ||
| public void testClassLevelAnnotation() | ||
| { | ||
| assertTrue(hasMinioAnnotation(MinioClassAnnotationIT.class)); | ||
| assertTrue(hasMinioAnnotation(CombinedMinioS3IT.class)); | ||
|
|
||
| assertFalse(hasMinioAnnotation(S3ClassAnnotationIT.class)); | ||
| assertFalse(hasMinioAnnotation(CombinedS3MinioIT.class)); | ||
|
|
||
| assertTrue(hasMinioAnnotation(CombinedIT.class)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMethodLevelAnnotation() | ||
| throws NoSuchMethodException | ||
| { | ||
| assertTrue(hasMinioAnnotation(MinioMethodAnnotationIT.class, "testShouldExecuteBecauseOfMethodAnnotation")); | ||
|
|
||
| assertTrue(hasMinioAnnotation(CombinedIT.class, "testMinioMethodShouldExecuteBecauseOfClassLevelAnnotation")); | ||
| assertTrue(hasMinioAnnotation(CombinedIT.class, "testMinioMethodShouldExecuteBecauseOfClassLevelAnnotation")); | ||
|
|
||
| assertTrue(hasMinioAnnotation(CombinedS3MinioIT.class, "testMinioMethodShouldExecuteBecauseOfMethodLevelAnnotation")); | ||
| assertTrue(hasMinioAnnotation(CombinedMinioS3IT.class, "testMinioMethodShouldExecuteBecauseOfClassLevelAnnotation")); | ||
|
|
||
| assertFalse(hasS3Annotation(MinioMethodAnnotationIT.class, "testShouldExecuteBecauseOfMethodAnnotation")); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.