From 56afbdf149368438b7ae4e2ecd278a84b620e65b Mon Sep 17 00:00:00 2001
From: Greg Messner <greg@messners.com>
Date: Fri, 28 Feb 2014 20:03:45 -0800
Subject: [PATCH] Consolidated tests.

---
 .../api/TestCreateProjectAndMergeRequest.java | 44 -------------------
 .../messners/gitlab/api/TestGitLabApi.java    | 20 ---------
 .../gitlab/api/TestGitLabApiBeans.java        |  4 +-
 .../gitlab/api/TestGitLabApiEvents.java       |  4 +-
 4 files changed, 4 insertions(+), 68 deletions(-)
 delete mode 100644 src/test/java/com/messners/gitlab/api/TestCreateProjectAndMergeRequest.java

diff --git a/src/test/java/com/messners/gitlab/api/TestCreateProjectAndMergeRequest.java b/src/test/java/com/messners/gitlab/api/TestCreateProjectAndMergeRequest.java
deleted file mode 100644
index cf21e6cf..00000000
--- a/src/test/java/com/messners/gitlab/api/TestCreateProjectAndMergeRequest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.messners.gitlab.api;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-public class TestCreateProjectAndMergeRequest {
-	
-	// The following needs to be set to your test repository
-	private static final String TEST_HOST_URL = "https://your.gitlab.host.url";
-	private static final String TEST_PRIVATE_TOKEN = "YOUR PRIVATE TOKEN";
-	
-	private static GitLabApi gitLabApi;
-	
-	public TestCreateProjectAndMergeRequest () {
-		super();
-	}
-	
-	@BeforeClass
-	public static void setup () {
-		gitLabApi = new GitLabApi(TEST_HOST_URL, TEST_PRIVATE_TOKEN);
-	}
-	
-	
-	@Test
-	public void testCreateProject () {
-			
-		 try {
-			 
-			 Project newProject = new Project();
-			 newProject.setName("test-gitlab-api-project");
-			 Project project = gitLabApi.createProject(newProject);
-			 assertTrue(project != null);
-			 assertTrue(project.getName().equals(newProject.getName()));
-			 
-			 gitLabApi.deleteProject(project);
-			 
-		} catch (Exception e) {
-			System.err.println("Check TEST_HOST_URL and TEST_PRIVATE_TOKEN, they are probably not set.");		
-		}
-	}
-}
diff --git a/src/test/java/com/messners/gitlab/api/TestGitLabApi.java b/src/test/java/com/messners/gitlab/api/TestGitLabApi.java
index e5653a41..66dcb7cd 100644
--- a/src/test/java/com/messners/gitlab/api/TestGitLabApi.java
+++ b/src/test/java/com/messners/gitlab/api/TestGitLabApi.java
@@ -46,24 +46,4 @@ public class TestGitLabApi {
 			System.err.println("Check TEST_HOST_URL and TEST_PRIVATE_TOKEN, they are probably not set.");		
 		}
 	}
-	
-	
-	@Test
-	public void testOwnedProjectsProject () {
-			
-		 try {
-			 
-			 List<Project> projects = gitLabApi.getOwnedProjects();
-			 assertTrue(projects != null);
-			 
-			 Project ownedProject = projects.get(0);
-			 assertTrue(ownedProject != null);
-			 Project project = gitLabApi.getProject(ownedProject.getId());
-			 assertTrue(project != null);
-			 assertTrue(ownedProject.getId().equals(project.getId()));
-			 
-		} catch (Exception e) {
-			System.err.println("Check TEST_HOST_URL and TEST_PRIVATE_TOKEN, they are probably not set.");
-		}
-	}
 }
diff --git a/src/test/java/com/messners/gitlab/api/TestGitLabApiBeans.java b/src/test/java/com/messners/gitlab/api/TestGitLabApiBeans.java
index fd0ceb2b..f027ca75 100644
--- a/src/test/java/com/messners/gitlab/api/TestGitLabApiBeans.java
+++ b/src/test/java/com/messners/gitlab/api/TestGitLabApiBeans.java
@@ -15,7 +15,7 @@ import org.junit.Test;
 
 public class TestGitLabApiBeans {
 	
-	private static JacksonJsonConfig jacksonJsonConfig;
+	private static JacksonJson jacksonJsonConfig;
 	
 	public TestGitLabApiBeans () {
 		super();
@@ -23,7 +23,7 @@ public class TestGitLabApiBeans {
 	
 	@BeforeClass
 	public static void setup () {
-		jacksonJsonConfig = new JacksonJsonConfig();
+		jacksonJsonConfig = new JacksonJson();
 	}
 	
 	@Test
diff --git a/src/test/java/com/messners/gitlab/api/TestGitLabApiEvents.java b/src/test/java/com/messners/gitlab/api/TestGitLabApiEvents.java
index 98585295..f35937e1 100644
--- a/src/test/java/com/messners/gitlab/api/TestGitLabApiEvents.java
+++ b/src/test/java/com/messners/gitlab/api/TestGitLabApiEvents.java
@@ -16,7 +16,7 @@ import com.messners.gitlab.api.webhook.PushEvent;
 
 public class TestGitLabApiEvents {
 	
-	private static JacksonJsonConfig jacksonJsonConfig;
+	private static JacksonJson jacksonJsonConfig;
 	
 	public TestGitLabApiEvents () {
 		super();
@@ -24,7 +24,7 @@ public class TestGitLabApiEvents {
 	
 	@BeforeClass
 	public static void setup () {
-		jacksonJsonConfig = new JacksonJsonConfig();
+		jacksonJsonConfig = new JacksonJson();
 	}
 	
 	@Test
-- 
GitLab