All tests should use the secondary account

kohsuke · kohsuke · commit c564dc5f2941 · 2014-05-10T12:47:28.000-07:00
diff --git a/src/test/java/org/kohsuke/AbstractGitHubApiTestBase.java b/src/test/java/org/kohsuke/AbstractGitHubApiTestBase.java
@@ -0,0 +1,34 @@
+package org.kohsuke;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.kohsuke.github.GitHub;
+
+import java.io.FileInputStream;
+import java.util.Properties;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class AbstractGitHubApiTestBase extends Assert {
+
+    protected GitHub gitHub;
+
+    @Before
+    public void setUp() throws Exception {
+        Properties props = new Properties();
+        java.io.File f = new java.io.File(System.getProperty("user.home"), ".github.kohsuke2");
+        if (f.exists()) {
+            FileInputStream in = new FileInputStream(f);
+            try {
+                props.load(in);
+                gitHub = GitHub.connect(props.getProperty("login"),props.getProperty("oauth"));
+            } finally {
+                IOUtils.closeQuietly(in);
+            }
+        } else {
+            gitHub = GitHub.connect();
+        }
+    }
+}
diff --git a/src/test/java/org/kohsuke/AppTest.java b/src/test/java/org/kohsuke/AppTest.java
@@ -59,27 +59,7 @@
 /**
  * Unit test for simple App.
  */
-public class AppTest {
-
-    private GitHub gitHub;
-
-    @Before
-    public void setUp() throws Exception {
-        Properties props = new Properties();
-        java.io.File f = new java.io.File(System.getProperty("user.home"), ".github.kohsuke2");
-        if (f.exists()) {
-            FileInputStream in = new FileInputStream(f);
-            try {
-                props.load(in);
-                gitHub = GitHub.connect(props.getProperty("login"),props.getProperty("oauth"));
-            } finally {
-                IOUtils.closeQuietly(in);
-            }
-        } else {
-            gitHub = GitHub.connect();
-        }
-    }
-
+public class AppTest extends AbstractGitHubApiTestBase {
     private String getTestRepositoryName() throws IOException {
         return getUser().getLogin() + "/github-api-test";
     }
diff --git a/src/test/java/org/kohsuke/LifecycleTest.java b/src/test/java/org/kohsuke/LifecycleTest.java
@@ -1,18 +1,17 @@
 package org.kohsuke;
 
-import junit.framework.TestCase;
 import org.apache.commons.io.IOUtils;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.dircache.DirCache;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
+import org.junit.Test;
 import org.kohsuke.github.GHAsset;
 import org.kohsuke.github.GHIssue;
 import org.kohsuke.github.GHMilestone;
 import org.kohsuke.github.GHMyself;
 import org.kohsuke.github.GHRelease;
 import org.kohsuke.github.GHRepository;
-import org.kohsuke.github.GitHub;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -22,15 +21,8 @@
 import java.util.List;
 import java.util.Properties;
 
-public class LifecycleTest extends TestCase {
-    private GitHub gitHub;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        gitHub = GitHub.connect();
-    }
-
+public class LifecycleTest extends AbstractGitHubApiTestBase {
+    @Test
     public void testCreateRepository() throws IOException, GitAPIException, InterruptedException {
         GHMyself myself = gitHub.getMyself();
         GHRepository repository = myself.getRepository("github-api-test");
