WIP

hub4j · Oct 4, 2019 · d787359 · d787359
1 parent fc08711
commit d787359
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 50 deletions.
diff --git a/src/test/java/org/kohsuke/github/GHProjectCardTest.java b/src/test/java/org/kohsuke/github/GHProjectCardTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.FileNotFoundException;
@@ -16,9 +17,9 @@ public class GHProjectCardTest extends AbstractGitHubApiTestBase {
 	private GHProjectColumn column;
 	private GHProjectCard card;
 
-	@Override public void setUp() throws Exception {
-		super.setUp();
-		org = gitHub.getOrganization("github-api-test-org");
+	@Before
+	public void setUp() throws Exception {
+		org = gitHub.getOrganization(GITHUB_API_TEST_ORG);
 		project = org.createProject("test-project", "This is a test project");
 		column = project.createColumn("column-one");
 		card = column.createCard("This is a card");
@@ -71,28 +72,35 @@ public void testDeleteCard() throws IOException {
 
 	@After
 	public void after() throws IOException {
-		if(card != null) {
-			try {
-				card.delete();
-				card = null;
-			} catch (FileNotFoundException e) {
-				card = null;
+		if(githubApi.isUseProxy()) {
+			if (card != null) {
+				card = gitHubBeforeAfter.getProjectCard(card.getId());
+				try {
+					card.delete();
+					card = null;
+				} catch (FileNotFoundException e) {
+					card = null;
+				}
 			}
-		}
-		if(column != null) {
-			try {
-				column.delete();
-				column = null;
-			} catch (FileNotFoundException e) {
-				column = null;
+			if (column != null) {
+				column = gitHubBeforeAfter
+					.getProjectColumn(column.getId());
+				try {
+					column.delete();
+					column = null;
+				} catch (FileNotFoundException e) {
+					column = null;
+				}
 			}
-		}
-		if(project != null) {
-			try {
-				project.delete();
-				project = null;
-			} catch (FileNotFoundException e) {
-				project = null;
+			if (project != null) {
+				project = gitHubBeforeAfter
+					.getProject(project.getId());
+				try {
+					project.delete();
+					project = null;
+				} catch (FileNotFoundException e) {
+					project = null;
+				}
 			}
 		}
 	}

diff --git a/src/test/java/org/kohsuke/github/GHProjectColumnTest.java b/src/test/java/org/kohsuke/github/GHProjectColumnTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.FileNotFoundException;
@@ -10,14 +11,14 @@
 /**
  * @author Gunnar Skjold
  */
-public class GHProjectColumnTest extends AbstractGitHubApiTestBase {
+public class GHProjectColumnTest extends AbstractGitHubApiWireMockTest {
 	private GHProject project;
 	private GHProjectColumn column;
 
-	@Override public void setUp() throws Exception {
-		super.setUp();
+	@Before
+	public void setUp() throws Exception {
 		project = gitHub
-				.getOrganization("github-api-test-org")
+				.getOrganization(GITHUB_API_TEST_ORG)
 				.createProject("test-project", "This is a test project");
 		column = project.createColumn("column-one");
 	}
@@ -47,20 +48,26 @@ public void testDeleteColumn() throws IOException {
 
 	@After
 	public void after() throws IOException {
-		if(column != null) {
-			try {
-				column.delete();
-				column = null;
-			} catch (FileNotFoundException e) {
-				column = null;
+		if(githubApi.isUseProxy()) {
+			if (column != null) {
+				column = gitHubBeforeAfter
+					.getProjectColumn(column.getId());
+				try {
+					column.delete();
+					column = null;
+				} catch (FileNotFoundException e) {
+					column = null;
+				}
 			}
-		}
-		if(project != null) {
-			try {
-				project.delete();
-				project = null;
-			} catch (FileNotFoundException e) {
-				project = null;
+			if (project != null) {
+				project = gitHubBeforeAfter
+					.getProject(project.getId());
+				try {
+					project.delete();
+					project = null;
+				} catch (FileNotFoundException e) {
+					project = null;
+				}
 			}
 		}
 	}

diff --git a/src/test/java/org/kohsuke/github/GHProjectTest.java b/src/test/java/org/kohsuke/github/GHProjectTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.FileNotFoundException;
@@ -13,11 +14,11 @@
 public class GHProjectTest extends AbstractGitHubApiTestBase {
 	private GHProject project;
 
-	@Override public void setUp() throws Exception {
-		super.setUp();
+	@Before
+	public void setUp() throws Exception {
 		project = gitHub
-				.getOrganization("github-api-test-org")
-				.createProject("test-project", "This is a test project");
+			.getOrganization(GITHUB_API_TEST_ORG)
+			.createProject("test-project", "This is a test project");
 	}
 
 	@Test
@@ -68,12 +69,16 @@ public void testDeleteProject() throws IOException {
 
 	@After
 	public void after() throws IOException {
-		if(project != null) {
-			try {
-				project.delete();
-				project = null;
-			} catch (FileNotFoundException e) {
-				project = null;
+		if (githubApi.isUseProxy()) {
+			if (project != null) {
+				project = gitHubBeforeAfter
+					.getProject(project.getId());
+				try {
+					project.delete();
+					project = null;
+				} catch (FileNotFoundException e) {
+					project = null;
+				}
 			}
 		}
 	}