Commit ab045070 authored by Greg Messner's avatar Greg Messner
Browse files

Minor code cleanup.

parent a9514049
...@@ -49,7 +49,7 @@ import org.junit.experimental.categories.Category; ...@@ -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. * 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 { public class TestProjectApiSnippets extends AbstractIntegrationTest {
private static final String TEST_SNIPPET_TITLE_PREFIX = "Test Snippet: "; private static final String TEST_SNIPPET_TITLE_PREFIX = "Test Snippet: ";
......
...@@ -30,7 +30,7 @@ import org.junit.runners.MethodSorters; ...@@ -30,7 +30,7 @@ import org.junit.runners.MethodSorters;
* *
* NOTE: &FixMethodOrder(MethodSorters.NAME_ASCENDING) is very important to insure that testCreate() is executed first. * 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) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestProtectedBranchesApi extends AbstractIntegrationTest { public class TestProtectedBranchesApi extends AbstractIntegrationTest {
......
...@@ -39,7 +39,7 @@ import org.junit.runners.MethodSorters; ...@@ -39,7 +39,7 @@ import org.junit.runners.MethodSorters;
* *
* NOTE: &FixMethodOrder(MethodSorters.NAME_ASCENDING) is very important to insure that testCreate() is executed first. * 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) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestRepositoryApi extends AbstractIntegrationTest { public class TestRepositoryApi extends AbstractIntegrationTest {
......
...@@ -37,7 +37,7 @@ import org.junit.runners.MethodSorters; ...@@ -37,7 +37,7 @@ import org.junit.runners.MethodSorters;
* *
* NOTE: &FixMethodOrder(MethodSorters.NAME_ASCENDING) is very important to insure that testCreate() is executed first. * 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) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestRepositoryFileApi extends AbstractIntegrationTest { public class TestRepositoryFileApi extends AbstractIntegrationTest {
......
...@@ -55,7 +55,7 @@ import org.junit.rules.TemporaryFolder; ...@@ -55,7 +55,7 @@ import org.junit.rules.TemporaryFolder;
* <p> * <p>
* If any of the above are NULL, all tests in this class will be skipped. * 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 { public class TestRequestResponseLogging {
@ClassRule @ClassRule
......
...@@ -51,7 +51,7 @@ import org.junit.runners.MethodSorters; ...@@ -51,7 +51,7 @@ import org.junit.runners.MethodSorters;
* <p> * <p>
* NOTE: &amp;FixMethodOrder(MethodSorters.NAME_ASCENDING) is very important to insure that the tests are in the correct order * NOTE: &amp;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) @FixMethodOrder(MethodSorters.JVM)
public class TestRunnersApi extends AbstractIntegrationTest { public class TestRunnersApi extends AbstractIntegrationTest {
......
...@@ -27,7 +27,7 @@ import org.junit.runners.MethodSorters; ...@@ -27,7 +27,7 @@ import org.junit.runners.MethodSorters;
* *
* If any of the above are NULL, all tests in this class will be skipped. * 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) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestServicesApi extends AbstractIntegrationTest { public class TestServicesApi extends AbstractIntegrationTest {
......
...@@ -32,7 +32,7 @@ public class TestSnippetDiscussionsApi implements Constants { ...@@ -32,7 +32,7 @@ public class TestSnippetDiscussionsApi implements Constants {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
initMocks(this); initMocks(this);
response.init(Discussion.class, null, "snippet-discussions.json"); response.init(Discussion.class, null, "snippet-discussions.json");
when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response); when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
......
...@@ -15,7 +15,7 @@ import org.junit.BeforeClass; ...@@ -15,7 +15,7 @@ import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@Category(org.gitlab4j.api.IntegrationTest.class) @Category(IntegrationTest.class)
public class TestSnippetsApi extends AbstractIntegrationTest { public class TestSnippetsApi extends AbstractIntegrationTest {
private static GitLabApi gitLabApi; private static GitLabApi gitLabApi;
......
...@@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters; ...@@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters;
* *
* If any of the above are NULL, all tests in this class will be skipped. * 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) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestSystemHooksApi extends AbstractIntegrationTest { public class TestSystemHooksApi extends AbstractIntegrationTest {
......
...@@ -18,7 +18,7 @@ import org.junit.BeforeClass; ...@@ -18,7 +18,7 @@ import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@Category(org.gitlab4j.api.IntegrationTest.class) @Category(IntegrationTest.class)
public class TestTagsApi extends AbstractIntegrationTest { public class TestTagsApi extends AbstractIntegrationTest {
private static final String TEST_TAG_NAME_1 = "test-tag-1"; private static final String TEST_TAG_NAME_1 = "test-tag-1";
......
...@@ -45,7 +45,7 @@ import org.junit.experimental.categories.Category; ...@@ -45,7 +45,7 @@ import org.junit.experimental.categories.Category;
* If this is null the SSH key tests will be skipped. * If this is null the SSH key tests will be skipped.
* *
*/ */
@Category(org.gitlab4j.api.IntegrationTest.class) @Category(IntegrationTest.class)
public class TestUserApi extends AbstractIntegrationTest { public class TestUserApi extends AbstractIntegrationTest {
// The following needs to be set to your test repository // The following needs to be set to your test repository
......
...@@ -50,7 +50,7 @@ import org.junit.experimental.categories.Category; ...@@ -50,7 +50,7 @@ import org.junit.experimental.categories.Category;
* <p> * <p>
* If any of the above are NULL, all tests in this class will be skipped. * 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 TestWikisApi extends AbstractIntegrationTest { public class TestWikisApi extends AbstractIntegrationTest {
private static final String TEST_WIKI_TITLE_PREFIX = "Test Wiki: "; private static final String TEST_WIKI_TITLE_PREFIX = "Test Wiki: ";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment