diff --git a/src/test/java/org/gitlab4j/api/TestAccessToken.java b/src/test/java/org/gitlab4j/api/TestAccessToken.java index 646c60379eb30c2b0559be1f8319b179d4157de4..71f7d5eeeb451a7f2d601450a1014c0f77570e19 100644 --- a/src/test/java/org/gitlab4j/api/TestAccessToken.java +++ b/src/test/java/org/gitlab4j/api/TestAccessToken.java @@ -21,7 +21,7 @@ import org.junit.experimental.categories.Category; * If any of the above are NULL, all tests in this class will be skipped. * */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestAccessToken extends AbstractIntegrationTest { // TEST_ACCESS_TOKEN must be defined to run this test diff --git a/src/test/java/org/gitlab4j/api/TestAvatarUpload.java b/src/test/java/org/gitlab4j/api/TestAvatarUpload.java index d8e90f4a2224d3ae5de58004e43c9b6867f7e380..8e4a5ae466b94e3841e799cc05b84c6d6edf18d5 100644 --- a/src/test/java/org/gitlab4j/api/TestAvatarUpload.java +++ b/src/test/java/org/gitlab4j/api/TestAvatarUpload.java @@ -26,7 +26,7 @@ import org.junit.runners.MethodSorters; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAvatarUpload extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestCommitsApi.java b/src/test/java/org/gitlab4j/api/TestCommitsApi.java index ea3f337c76d8b5ddf896de056eedb71d366211c9..508271e63ec58529abd64beace08462ea0624b9c 100644 --- a/src/test/java/org/gitlab4j/api/TestCommitsApi.java +++ b/src/test/java/org/gitlab4j/api/TestCommitsApi.java @@ -34,7 +34,7 @@ import org.junit.runners.MethodSorters; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestCommitsApi extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestDeployKeysApi.java b/src/test/java/org/gitlab4j/api/TestDeployKeysApi.java index fa1f4416cae660b583768a2ce7995af30f9abae5..e4c70b86b5e0067397eadaee9391103217b1a44f 100644 --- a/src/test/java/org/gitlab4j/api/TestDeployKeysApi.java +++ b/src/test/java/org/gitlab4j/api/TestDeployKeysApi.java @@ -16,7 +16,7 @@ import org.junit.experimental.categories.Category; * If any of the above are NULL, all tests in this class will be skipped. * */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestDeployKeysApi extends AbstractIntegrationTest { // The following needs to be set to your test repository diff --git a/src/test/java/org/gitlab4j/api/TestEventsApi.java b/src/test/java/org/gitlab4j/api/TestEventsApi.java index 10879138d6020551fe1a835f3eab10133a23150f..423e12bec1d0b4c70875c6b933f3292f78feca9d 100644 --- a/src/test/java/org/gitlab4j/api/TestEventsApi.java +++ b/src/test/java/org/gitlab4j/api/TestEventsApi.java @@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestEventsApi extends AbstractIntegrationTest { private static GitLabApi gitLabApi; diff --git a/src/test/java/org/gitlab4j/api/TestFileUpload.java b/src/test/java/org/gitlab4j/api/TestFileUpload.java index 78c632597e9974a28c97ccc9b163603de66cea47..3275f5b93d2050c9ef88f50d32d37a05add987fc 100644 --- a/src/test/java/org/gitlab4j/api/TestFileUpload.java +++ b/src/test/java/org/gitlab4j/api/TestFileUpload.java @@ -26,7 +26,7 @@ import org.junit.runners.MethodSorters; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestFileUpload extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestGitLabApi.java b/src/test/java/org/gitlab4j/api/TestGitLabApi.java index addc607af8f459a0e016eb8729076283d12c891a..27fe65008c2009ef0eb6195c2e62fc93b1906ce0 100644 --- a/src/test/java/org/gitlab4j/api/TestGitLabApi.java +++ b/src/test/java/org/gitlab4j/api/TestGitLabApi.java @@ -21,7 +21,7 @@ import org.junit.experimental.categories.Category; * If any of the above are NULL, all tests in this class will be skipped. * */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestGitLabApi extends AbstractIntegrationTest { // The following needs to be set to your test repository diff --git a/src/test/java/org/gitlab4j/api/TestGitLabApiException.java b/src/test/java/org/gitlab4j/api/TestGitLabApiException.java index b570979f9c17d4f110b6489447dc98884ab198fe..80e4ae21c6617e78429cc6fa9fccb75bacc569ae 100644 --- a/src/test/java/org/gitlab4j/api/TestGitLabApiException.java +++ b/src/test/java/org/gitlab4j/api/TestGitLabApiException.java @@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestGitLabApiException extends AbstractIntegrationTest { private static final String TEST_PROJECT_NAME_DUPLICATE = "test-gitlab4j-create-project-duplicate"; diff --git a/src/test/java/org/gitlab4j/api/TestGitLabLogin.java b/src/test/java/org/gitlab4j/api/TestGitLabLogin.java index 452de24bfbeea4217b9f0ee0f76c01f024e4dc35..b809bf6ef5cfc693b81910fe02dad3426dd84372 100644 --- a/src/test/java/org/gitlab4j/api/TestGitLabLogin.java +++ b/src/test/java/org/gitlab4j/api/TestGitLabLogin.java @@ -22,7 +22,7 @@ import org.junit.experimental.categories.Category; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestGitLabLogin { // The following needs to be set to your test repository diff --git a/src/test/java/org/gitlab4j/api/TestGroupApi.java b/src/test/java/org/gitlab4j/api/TestGroupApi.java index f8695596336721804fbb85fc9045bc51afd5e057..2d1a4078b9055f9c76b5d87c86f9915a7dcb3269 100644 --- a/src/test/java/org/gitlab4j/api/TestGroupApi.java +++ b/src/test/java/org/gitlab4j/api/TestGroupApi.java @@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category; * If any of the above are NULL, all tests in this class will be skipped. * */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestGroupApi extends AbstractIntegrationTest { // The following needs to be set to your test repository diff --git a/src/test/java/org/gitlab4j/api/TestHealthCheckApi.java b/src/test/java/org/gitlab4j/api/TestHealthCheckApi.java index 1ce08ac43ab22a5c8bb13d51d266badeaba5dac1..15c4d7895f246371a56c7ec6905e4dfb6a7cd1b6 100644 --- a/src/test/java/org/gitlab4j/api/TestHealthCheckApi.java +++ b/src/test/java/org/gitlab4j/api/TestHealthCheckApi.java @@ -18,7 +18,7 @@ import org.junit.experimental.categories.Category; * If any of the above are NULL, all tests in this class will be skipped. * */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestHealthCheckApi { // The following needs to be set to your test repository diff --git a/src/test/java/org/gitlab4j/api/TestIgnoreCertificateErrors.java b/src/test/java/org/gitlab4j/api/TestIgnoreCertificateErrors.java index 61f3dd889e1c543c71f05f4642c12256077c7acf..38a7b3a31b3ded045efc7c92fda8ceff2fbc6a04 100644 --- a/src/test/java/org/gitlab4j/api/TestIgnoreCertificateErrors.java +++ b/src/test/java/org/gitlab4j/api/TestIgnoreCertificateErrors.java @@ -21,7 +21,7 @@ import org.junit.experimental.categories.Category; * If any of the above are NULL, all tests in this class will be skipped. * */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestIgnoreCertificateErrors { // The following needs to be set to your test repository diff --git a/src/test/java/org/gitlab4j/api/TestIssuesApi.java b/src/test/java/org/gitlab4j/api/TestIssuesApi.java index c7c57a33bc2c0d61fed1562147f53aa165f57865..c24de2c6e3fc48a6a1a4eeb7ae2eb5f58dfcb81d 100644 --- a/src/test/java/org/gitlab4j/api/TestIssuesApi.java +++ b/src/test/java/org/gitlab4j/api/TestIssuesApi.java @@ -58,7 +58,7 @@ import org.junit.experimental.categories.Category; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestIssuesApi extends AbstractIntegrationTest { private static GitLabApi gitLabApi; diff --git a/src/test/java/org/gitlab4j/api/TestJobApi.java b/src/test/java/org/gitlab4j/api/TestJobApi.java index 68e1339e7f15005ce085cc239142d9daf61fc98f..f7411fe0ddf25b2e30a466e81d274547cdb87edb 100644 --- a/src/test/java/org/gitlab4j/api/TestJobApi.java +++ b/src/test/java/org/gitlab4j/api/TestJobApi.java @@ -46,7 +46,7 @@ import org.junit.experimental.categories.Category; *
* If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestJobApi extends AbstractIntegrationTest { private static GitLabApi gitLabApi; diff --git a/src/test/java/org/gitlab4j/api/TestNamespaceApi.java b/src/test/java/org/gitlab4j/api/TestNamespaceApi.java index 946c0c09145be45c32245d2797af1f664e917b70..42727a88c1f2b57dbc73e9c699f3114b705cd91c 100644 --- a/src/test/java/org/gitlab4j/api/TestNamespaceApi.java +++ b/src/test/java/org/gitlab4j/api/TestNamespaceApi.java @@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category; * If any of the above are NULL, all tests in this class will be skipped. * */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestNamespaceApi extends AbstractIntegrationTest { private static GitLabApi gitLabApi; diff --git a/src/test/java/org/gitlab4j/api/TestNotesApi.java b/src/test/java/org/gitlab4j/api/TestNotesApi.java index 7c538e4753de2ea0b925d36fa74b1a8ad35daccb..6e9da837105809a9800d64adc5a0fa036d90a2c9 100644 --- a/src/test/java/org/gitlab4j/api/TestNotesApi.java +++ b/src/test/java/org/gitlab4j/api/TestNotesApi.java @@ -27,7 +27,7 @@ import org.junit.runners.MethodSorters; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNotesApi extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestNotificationSettingsApi.java b/src/test/java/org/gitlab4j/api/TestNotificationSettingsApi.java index 2984f30b8bd4be2ed51a2e89fc38c2008881701f..773faba9dd287ad715ddb06f250b31aa1a00f421 100644 --- a/src/test/java/org/gitlab4j/api/TestNotificationSettingsApi.java +++ b/src/test/java/org/gitlab4j/api/TestNotificationSettingsApi.java @@ -29,7 +29,7 @@ import org.junit.runners.MethodSorters; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNotificationSettingsApi extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestPager.java b/src/test/java/org/gitlab4j/api/TestPager.java index 2ad50a90ad492b04c47638868e627d8b602ea6ac..9ccb724c73ed2b64ce16a20a57c63bd7a63018a1 100644 --- a/src/test/java/org/gitlab4j/api/TestPager.java +++ b/src/test/java/org/gitlab4j/api/TestPager.java @@ -30,7 +30,7 @@ import org.junit.runners.MethodSorters; * * NOTE: &FixMethodOrder(MethodSorters.NAME_ASCENDING) is very important to insure that the tests are in the correct order */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPager extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestPipelineApi.java b/src/test/java/org/gitlab4j/api/TestPipelineApi.java index 8ef1ab020d27328f4bdb4e202ce00cd09421f471..cdf3e6f1ece969a08b5b7617b32e3769bad0b339 100644 --- a/src/test/java/org/gitlab4j/api/TestPipelineApi.java +++ b/src/test/java/org/gitlab4j/api/TestPipelineApi.java @@ -16,7 +16,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestPipelineApi extends AbstractIntegrationTest { private static final String SCHEDULE_DESCRIPTION = "Test pipeline schedule - DELETE AFTER TEST"; diff --git a/src/test/java/org/gitlab4j/api/TestProjectApi.java b/src/test/java/org/gitlab4j/api/TestProjectApi.java index 14910604c0d39072af8d464c9d100a2a0ce83b60..8cb06d2d02b8da9c09dda6ed7ecc5f9b523aa455 100644 --- a/src/test/java/org/gitlab4j/api/TestProjectApi.java +++ b/src/test/java/org/gitlab4j/api/TestProjectApi.java @@ -65,7 +65,7 @@ import org.junit.runners.MethodSorters; * * NOTE: &FixMethodOrder(MethodSorters.NAME_ASCENDING) is very important to insure that the tests are in the correct order */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestProjectApi extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestProjectApiSnippets.java b/src/test/java/org/gitlab4j/api/TestProjectApiSnippets.java index 11fa6cd9dcb1779640ac017a50f01c0b8baeee72..e6660e638c1c812869c6617d396bc345853e6cde 100644 --- a/src/test/java/org/gitlab4j/api/TestProjectApiSnippets.java +++ b/src/test/java/org/gitlab4j/api/TestProjectApiSnippets.java @@ -49,7 +49,7 @@ import org.junit.experimental.categories.Category; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestProjectApiSnippets extends AbstractIntegrationTest { private static final String TEST_SNIPPET_TITLE_PREFIX = "Test Snippet: "; diff --git a/src/test/java/org/gitlab4j/api/TestProtectedBranchesApi.java b/src/test/java/org/gitlab4j/api/TestProtectedBranchesApi.java index f376f6137209760cebd4c9a4074c85dedfe11223..f6facb23f594375bafd5f8f4ab1340e615d0644a 100644 --- a/src/test/java/org/gitlab4j/api/TestProtectedBranchesApi.java +++ b/src/test/java/org/gitlab4j/api/TestProtectedBranchesApi.java @@ -30,7 +30,7 @@ import org.junit.runners.MethodSorters; * * NOTE: &FixMethodOrder(MethodSorters.NAME_ASCENDING) is very important to insure that testCreate() is executed first. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestProtectedBranchesApi extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestRepositoryApi.java b/src/test/java/org/gitlab4j/api/TestRepositoryApi.java index bc9c4fffce10d5fba1f37939ad0208a420404ff9..b69199924d6635a90436462f2c21a22748c871b9 100644 --- a/src/test/java/org/gitlab4j/api/TestRepositoryApi.java +++ b/src/test/java/org/gitlab4j/api/TestRepositoryApi.java @@ -39,7 +39,7 @@ import org.junit.runners.MethodSorters; * * NOTE: &FixMethodOrder(MethodSorters.NAME_ASCENDING) is very important to insure that testCreate() is executed first. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestRepositoryApi extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestRepositoryFileApi.java b/src/test/java/org/gitlab4j/api/TestRepositoryFileApi.java index 21cd9e06b37bf2570f3b00fb5bc7181ee4035aaf..b077af1e16619830f3b44a4329d131d23be31d7f 100644 --- a/src/test/java/org/gitlab4j/api/TestRepositoryFileApi.java +++ b/src/test/java/org/gitlab4j/api/TestRepositoryFileApi.java @@ -37,7 +37,7 @@ import org.junit.runners.MethodSorters; * * NOTE: &FixMethodOrder(MethodSorters.NAME_ASCENDING) is very important to insure that testCreate() is executed first. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestRepositoryFileApi extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestRequestResponseLogging.java b/src/test/java/org/gitlab4j/api/TestRequestResponseLogging.java index c29e6f2b1039861fec0eb534ace5c53d8e1a101a..7f326bdf7da4fd0fb574b37a0cbaaf6fb78bdd5b 100644 --- a/src/test/java/org/gitlab4j/api/TestRequestResponseLogging.java +++ b/src/test/java/org/gitlab4j/api/TestRequestResponseLogging.java @@ -55,7 +55,7 @@ import org.junit.rules.TemporaryFolder; *
* If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) public class TestRequestResponseLogging { @ClassRule diff --git a/src/test/java/org/gitlab4j/api/TestRunnersApi.java b/src/test/java/org/gitlab4j/api/TestRunnersApi.java index 81ee693f32f36897254e9f0e61d74d6b3d0901e3..5067bbd2e413ce74338a7a0c82126223b679c83c 100644 --- a/src/test/java/org/gitlab4j/api/TestRunnersApi.java +++ b/src/test/java/org/gitlab4j/api/TestRunnersApi.java @@ -51,7 +51,7 @@ import org.junit.runners.MethodSorters; *
* NOTE: &FixMethodOrder(MethodSorters.NAME_ASCENDING) is very important to insure that the tests are in the correct order */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.JVM) public class TestRunnersApi extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestServicesApi.java b/src/test/java/org/gitlab4j/api/TestServicesApi.java index 55788ebb36bd742f360b44cc260cde6023347d81..f852f1f1ebb385e7c960f09a0ccbb4e54350ef9c 100644 --- a/src/test/java/org/gitlab4j/api/TestServicesApi.java +++ b/src/test/java/org/gitlab4j/api/TestServicesApi.java @@ -27,7 +27,7 @@ import org.junit.runners.MethodSorters; * * If any of the above are NULL, all tests in this class will be skipped. */ -@Category(org.gitlab4j.api.IntegrationTest.class) +@Category(IntegrationTest.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestServicesApi extends AbstractIntegrationTest { diff --git a/src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java b/src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java index 8ef03fa0e3847687b2abe2770d9805b0ee0f73f9..95231701a96b15072c7776b3cc8dabe7d1e19190 100644 --- a/src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java +++ b/src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java @@ -32,7 +32,7 @@ public class TestSnippetDiscussionsApi implements Constants { @Before public void setUp() throws Exception { initMocks(this); - response.init(Discussion.class, null, "snippet-discussions.json"); + response.init(Discussion.class, null, "snippet-discussions.json"); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.