Skip to content
GitLab
Commit ae37475b authored by Greg Messner's avatar Greg Messner
Browse files

Updated with projects formatting style.

parent 8077face
Hide whitespace changes
Inline Side-by-side
src/main/java/org/gitlab4j/api/models/Snippet.java
View file @ ae37475b
/* /*
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2017 Greg Messner <greg@messners.com> * Copyright (c) 2018 Greg Messner <greg@messners.com>
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of * Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in * this software and associated documentation files (the "Software"), to deal in
...@@ -44,24 +44,23 @@ public class Snippet { ...@@ -44,24 +44,23 @@ public class Snippet {
private String content; private String content;
private String rawUrl; private String rawUrl;
private Visibility visibility; private Visibility visibility;
private String description; private String description;
public Snippet() { public Snippet() {
} }
public Snippet(String title, String fileName, String content, Visibility visibility, String description) { public Snippet(String title, String fileName, String content, Visibility visibility, String description) {
this(title, fileName, content); this(title, fileName, content);
this.visibility = visibility; this.visibility = visibility;
this.description = description; this.description = description;
} }
public Snippet(String title, String fileName, String content) { public Snippet(String title, String fileName, String content) {
this.title = title; this.title = title;
this.fileName = fileName; this.fileName = fileName;
this.content = content; this.content = content;
} }
public Author getAuthor() { public Author getAuthor() {
return this.author; return this.author;
} }
...@@ -126,35 +125,35 @@ public class Snippet { ...@@ -126,35 +125,35 @@ public class Snippet {
this.webUrl = webUrl; this.webUrl = webUrl;
} }
public String getContent() { public String getContent() {
return content; return content;
} }
public void setContent(String content) { public void setContent(String content) {
this.content = content; this.content = content;
} }
public String getRawUrl() { public String getRawUrl() {
return rawUrl; return rawUrl;
} }
public void setRawUrl(String rawUrl) { public void setRawUrl(String rawUrl) {
this.rawUrl = rawUrl; this.rawUrl = rawUrl;
} }
public Visibility getVisibility() { public Visibility getVisibility() {
return visibility; return visibility;
} }
public void setVisibility(Visibility visibility) { public void setVisibility(Visibility visibility) {
this.visibility = visibility; this.visibility = visibility;
} }
public String getDescription() { public String getDescription() {
return description; return description;
} }
public void setDescription(String description) { public void setDescription(String description) {
this.description = description; this.description = description;
} }
} }
src/test/java/org/gitlab4j/api/TestSnippetsApi.java
View file @ ae37475b
...@@ -17,7 +17,7 @@ public class TestSnippetsApi { ...@@ -17,7 +17,7 @@ public class TestSnippetsApi {
private static final String TEST_HOST_URL; private static final String TEST_HOST_URL;
private static final String TEST_PRIVATE_TOKEN; private static final String TEST_PRIVATE_TOKEN;
static { static {
TEST_HOST_URL = TestUtils.getProperty("TEST_HOST_URL"); TEST_HOST_URL = TestUtils.getProperty("TEST_HOST_URL");
TEST_PRIVATE_TOKEN = TestUtils.getProperty("TEST_PRIVATE_TOKEN"); TEST_PRIVATE_TOKEN = TestUtils.getProperty("TEST_PRIVATE_TOKEN");
...@@ -29,8 +29,7 @@ public class TestSnippetsApi { ...@@ -29,8 +29,7 @@ public class TestSnippetsApi {
private static final String TEST_SNIPPET_CONTENT_1 = "test-snippet-content-1"; private static final String TEST_SNIPPET_CONTENT_1 = "test-snippet-content-1";
private static final String TEST_SNIPPET_CONTENT_2 = "test-snippet-content-2"; private static final String TEST_SNIPPET_CONTENT_2 = "test-snippet-content-2";
private static final String TEST_SNIPPET_DESCRIPTION_1 = "test-snippet-description-1"; private static final String TEST_SNIPPET_DESCRIPTION_1 = "test-snippet-description-1";
@BeforeClass @BeforeClass
public static void setup() { public static void setup() {
...@@ -50,95 +49,81 @@ public class TestSnippetsApi { ...@@ -50,95 +49,81 @@ public class TestSnippetsApi {
System.err.print(problems); System.err.print(problems);
} }
} }
@Test @Test
public void testCreate() throws GitLabApiException { public void testCreate() throws GitLabApiException {
Snippet snippet = createSnippet(new Snippet(TEST_SNIPPET_TITLE_1, Snippet snippet = createSnippet(
TEST_SNIPPET_FILE_NAME_1, new Snippet(TEST_SNIPPET_TITLE_1, TEST_SNIPPET_FILE_NAME_1, TEST_SNIPPET_CONTENT_1));
TEST_SNIPPET_CONTENT_1)); assertEquals(TEST_SNIPPET_TITLE_1, snippet.getTitle());
assertEquals(TEST_SNIPPET_TITLE_1, snippet.getTitle()); assertEquals(TEST_SNIPPET_FILE_NAME_1, snippet.getFileName());
assertEquals(TEST_SNIPPET_FILE_NAME_1, snippet.getFileName()); assertNull(snippet.getContent());
assertNull(snippet.getContent());
deleteSnippet(snippet);
deleteSnippet(snippet); }
}
@Test
@Test public void testDelete() throws GitLabApiException {
public void testDelete() throws GitLabApiException { Snippet snippet = createSnippet(
Snippet snippet = createSnippet(new Snippet(TEST_SNIPPET_TITLE_1, new Snippet(TEST_SNIPPET_TITLE_1, TEST_SNIPPET_FILE_NAME_1, TEST_SNIPPET_CONTENT_1));
TEST_SNIPPET_FILE_NAME_1, deleteSnippet(snippet);
TEST_SNIPPET_CONTENT_1));
deleteSnippet(snippet); SnippetsApi api = gitLabApi.getSnippetApi();
List<Snippet> snippets = api.getSnippets();
SnippetsApi api = gitLabApi.getSnippetApi(); boolean found = snippets.stream().anyMatch(s -> s.getId().equals(snippet.getId()));
List<Snippet> snippets = api.getSnippets(); assertFalse(found);
boolean found = snippets.stream().anyMatch( }
s -> s.getId().equals(snippet.getId()));
assertFalse(found); @Test
} public void testList() throws GitLabApiException {
Snippet snippet1 = createSnippet(new Snippet(TEST_SNIPPET_TITLE_1, TEST_SNIPPET_FILE_NAME_1, TEST_SNIPPET_CONTENT_1));
@Test Snippet snippet2 = createSnippet(new Snippet(TEST_SNIPPET_TITLE_1, TEST_SNIPPET_FILE_NAME_1, TEST_SNIPPET_CONTENT_2));
public void testList() throws GitLabApiException {
Snippet snippet1 = createSnippet(new Snippet(TEST_SNIPPET_TITLE_1, SnippetsApi api = gitLabApi.getSnippetApi();
TEST_SNIPPET_FILE_NAME_1, List<Snippet> snippets = api.getSnippets(true);
TEST_SNIPPET_CONTENT_1));
Snippet snippet2 = createSnippet(new Snippet(TEST_SNIPPET_TITLE_1, assertTrue(snippets.size() >= 2);
TEST_SNIPPET_FILE_NAME_1, assertTrue(snippets.stream().anyMatch(s -> s.getContent().equals(TEST_SNIPPET_CONTENT_1)));
TEST_SNIPPET_CONTENT_2)); assertTrue(snippets.stream().anyMatch(s -> s.getContent().equals(TEST_SNIPPET_CONTENT_2)));
SnippetsApi api = gitLabApi.getSnippetApi(); deleteSnippet(snippet1);
List<Snippet> snippets = api.getSnippets(true); deleteSnippet(snippet2);
}
assertTrue(snippets.size() >= 2);
assertTrue(snippets.stream().anyMatch(s -> s.getContent().equals(TEST_SNIPPET_CONTENT_1))); @Test
assertTrue(snippets.stream().anyMatch(s -> s.getContent().equals(TEST_SNIPPET_CONTENT_2))); public void testSnippetContent() throws GitLabApiException {
Snippet snippet = createSnippet(
new Snippet(TEST_SNIPPET_TITLE_1, TEST_SNIPPET_FILE_NAME_1, TEST_SNIPPET_CONTENT_1));
deleteSnippet(snippet1); SnippetsApi api = gitLabApi.getSnippetApi();
deleteSnippet(snippet2); String snippetContent = api.getSnippetContent(snippet.getId());
} assertEquals(TEST_SNIPPET_CONTENT_1, snippetContent);
deleteSnippet(snippet);
@Test }
public void testSnippetContent() throws GitLabApiException {
Snippet snippet = createSnippet( @Test
new Snippet(TEST_SNIPPET_TITLE_1, TEST_SNIPPET_FILE_NAME_1, TEST_SNIPPET_CONTENT_1)); public void testRetrieveSnippet() throws GitLabApiException {
SnippetsApi api = gitLabApi.getSnippetApi(); Snippet snippet = createSnippet(new Snippet(TEST_SNIPPET_TITLE_1, TEST_SNIPPET_FILE_NAME_1,
String snippetContent = api.getSnippetContent(snippet.getId()); TEST_SNIPPET_CONTENT_1, Visibility.INTERNAL, TEST_SNIPPET_DESCRIPTION_1));
assertEquals(TEST_SNIPPET_CONTENT_1, snippetContent);
deleteSnippet(snippet); SnippetsApi api = gitLabApi.getSnippetApi();
} Snippet savedSnippet = api.getSnippet(snippet.getId(), true);
@Test assertEquals(TEST_SNIPPET_TITLE_1, savedSnippet.getTitle());
public void testRetrieveSnippet() throws GitLabApiException { assertEquals(TEST_SNIPPET_FILE_NAME_1, savedSnippet.getFileName());
Snippet snippet = createSnippet (new Snippet(TEST_SNIPPET_TITLE_1, assertEquals(TEST_SNIPPET_CONTENT_1, savedSnippet.getContent());
TEST_SNIPPET_FILE_NAME_1, assertEquals(TEST_SNIPPET_DESCRIPTION_1, savedSnippet.getDescription());
TEST_SNIPPET_CONTENT_1,
Visibility.INTERNAL, deleteSnippet(savedSnippet);
TEST_SNIPPET_DESCRIPTION_1)); }
SnippetsApi api = gitLabApi.getSnippetApi(); public void deleteSnippet(Snippet snippet) throws GitLabApiException {
Snippet savedSnippet = api.getSnippet(snippet.getId(), true); SnippetsApi api = gitLabApi.getSnippetApi();
api.deleteSnippet(snippet.getId());
assertEquals(TEST_SNIPPET_TITLE_1, savedSnippet.getTitle()); }
assertEquals(TEST_SNIPPET_FILE_NAME_1, savedSnippet.getFileName());
assertEquals(TEST_SNIPPET_CONTENT_1, savedSnippet.getContent()); public Snippet createSnippet(Snippet snippet) throws GitLabApiException {
assertEquals(TEST_SNIPPET_DESCRIPTION_1, savedSnippet.getDescription()); SnippetsApi api = gitLabApi.getSnippetApi();
return api.createSnippet(snippet.getTitle(), snippet.getFileName(), snippet.getContent(),
deleteSnippet(savedSnippet); snippet.getVisibility(), snippet.getDescription());
} }
public void deleteSnippet(Snippet snippet) throws GitLabApiException {
SnippetsApi api = gitLabApi.getSnippetApi();
api.deleteSnippet(snippet.getId());
}
public Snippet createSnippet(Snippet snippet) throws GitLabApiException {
SnippetsApi api = gitLabApi.getSnippetApi();
return api.createSnippet(snippet.getTitle(),
snippet.getFileName(),
snippet.getContent(),
snippet.getVisibility(),
snippet.getDescription());
}
} }
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