Ticket Reference handling #1048

Paul Martin

2016-04-27 c2188a840bc4153ae92112b04b2e06a90d3944aa

 src/test/java/com/gitblit/tests/GitBlitSuite.java

@@ -61,10 +61,12 @@
      MarkdownUtilsTest.class, JGitUtilsTest.class, SyndicationUtilsTest.class,

      DiffUtilsTest.class, MetricUtilsTest.class, X509UtilsTest.class,

      GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class, GitDaemonTest.class,

      GroovyScriptTest.class, LuceneExecutorTest.class, RepositoryModelTest.class, SshDaemonTest.class,

      SshDaemonTest.class, GroovyScriptTest.class, LuceneExecutorTest.class, RepositoryModelTest.class,

      FanoutServiceTest.class, Issue0259Test.class, Issue0271Test.class, HtpasswdAuthenticationTest.class,

      ModelUtilsTest.class, JnaUtilsTest.class, LdapSyncServiceTest.class, FileTicketServiceTest.class,
      BranchTicketServiceTest.class, RedisTicketServiceTest.class, AuthenticationManagerTest.class })
      ModelUtilsTest.class, JnaUtilsTest.class, LdapSyncServiceTest.class, FileTicketServiceTest.class,

      BranchTicketServiceTest.class, RedisTicketServiceTest.class, AuthenticationManagerTest.class,

      SshKeysDispatcherTest.class, UITicketTest.class, PathUtilsTest.class, SshKerberosAuthenticationTest.class,

      GravatarTest.class, FilestoreManagerTest.class, FilestoreServletTest.class, TicketReferenceTest.class })

public class GitBlitSuite {



   public static final File BASEFOLDER = new File("data");

@@ -78,20 +80,12 @@
   static int port = 8280;

   static int gitPort = 8300;

   static int shutdownPort = 8281;

   static int sshPort = 29418;



// Overriding of keys doesn't seem to work

//   static {

//      try {

//         sshPort = SshUtils.getFreePort();

//      } catch (Exception e) {

//         e.printStackTrace();

//      }

//   }

   static int sshPort = 39418;



   public static String url = "http://localhost:" + port;

   public static String gitServletUrl = "http://localhost:" + port + "/git";

   public static String gitDaemonUrl = "git://localhost:" + gitPort;

   public static String sshDaemonUrl = "ssh://admin@localhost:" + sshPort;

   public static String account = "admin";

   public static String password = "admin";



@@ -117,11 +111,11 @@
      return getRepository("test/gitective.git");

   }



   public static Repository getTicketsTestRepository() {
      JGitUtils.createRepository(REPOSITORIES, "gb-tickets.git").close();
      return getRepository("gb-tickets.git");
   }

   public static Repository getTicketsTestRepository() {

      JGitUtils.createRepository(REPOSITORIES, "gb-tickets.git").close();

      return getRepository("gb-tickets.git");

   }



   private static Repository getRepository(String name) {

      try {

         File gitDir = FileKey.resolve(new File(REPOSITORIES, name), FS.DETECTED);

@@ -145,13 +139,16 @@
      Executors.newSingleThreadExecutor().execute(new Runnable() {

         @Override

         public void run() {

            GitBlitServer.main("--httpPort", "" + port, "--httpsPort", "0", "--shutdownPort",

                  "" + shutdownPort, "--gitPort", "" + gitPort, "--repositoriesFolder",

                  "\"" + GitBlitSuite.REPOSITORIES.getAbsolutePath() + "\"", "--userService",

                  GitBlitSuite.USERSCONF.getAbsolutePath(), "--settings", GitBlitSuite.SETTINGS.getAbsolutePath(),

            GitBlitServer.main(

                  "--httpPort", "" + port,

                  "--httpsPort", "0",

                  "--shutdownPort", "" + shutdownPort,

                  "--gitPort", "" + gitPort,

                  "--sshPort", "" + sshPort,

                  "--repositoriesFolder", GitBlitSuite.REPOSITORIES.getAbsolutePath(),

                  "--userService", GitBlitSuite.USERSCONF.getAbsolutePath(),

                  "--settings", GitBlitSuite.SETTINGS.getAbsolutePath(),

                  "--baseFolder", "data");

            // doesn't work

            //, "--sshPort", "" + sshPort);

         }

      });