Adding dispatch

rh-messaging · Jun 21, 2018 · 0276f64 · 0276f64
1 parent faba271
commit 0276f64
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/main/java/com/redhat/jiragit/GitParser.java b/src/main/java/com/redhat/jiragit/GitParser.java
@@ -269,7 +269,8 @@ public void parse(File outputFile, String from, String to) throws Exception {
                   EditList edits = hunk.toEditList();
                   Iterator<Edit> editsIterator = edits.iterator();
 
-                  if (!interested && path.endsWith(".java")) {
+                  if (!interested && isSource(path)) {
+
 
                      while (editsIterator.hasNext()) {
                         Edit edit = editsIterator.next();

diff --git a/src/main/java/com/redhat/jiragit/ProjectParser.java b/src/main/java/com/redhat/jiragit/ProjectParser.java
@@ -125,7 +125,7 @@ private static void qpidJMSProcess(String clone, String output, String tag1, Str
 
    private static void qpidDispatchProcess(String clone, String output, String tag1, String tag2, boolean rest) throws Exception {
 
-      JiraParser jiraParser = new JiraParser("QPID JIRAs");
+      JiraParser jiraParser = new JiraParser("Dispatch JIRAs");
       jiraParser.setJira("DISPATCH-").setJiraBrowseURI("https://issues.apache.org/jira/browse/").
          setSampleJQL("https://issues.apache.org/jira/issues/?jql=project%20%3D%20DISPATCH%20AND%20key%20in%20");
 

diff --git a/src/test/java/com/redhat/jiragit/JiraReplaceTest.java b/src/test/java/com/redhat/jiragit/JiraReplaceTest.java
@@ -20,6 +20,7 @@
 import java.io.File;
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -28,9 +29,19 @@
 
 public class JiraReplaceTest {
 
+   JiraParser jiraParser;
+
+
+   @Before
+   public void init() {
+      jiraParser = new JiraParser("Artemis");
+      jiraParser.setJira("ARTEMIS-").setJiraBrowseURI("https://issues.apache.org/jira/browse/").
+         setSampleJQL("https://issues.apache.org/jira/issues/?jql=project%20%3D%20ARTEMIS%20AND%20key%20in%20");
+   }
+
    @Test
    public void jiraReplaceMultiple() throws Exception {
-      String[] jiras = GitParser.extractJIRAs("ARTEMIS-", "[ARTEMIS-110] [ARTEMIS-1264]");
+      String[] jiras = jiraParser.extractJIRAs("[ARTEMIS-110] [ARTEMIS-1264]");
 
       Assert.assertEquals(2, jiras.length);
       Assert.assertEquals("ARTEMIS-110", jiras[0]);
@@ -39,16 +50,8 @@ public void jiraReplaceMultiple() throws Exception {
 
    @Test
    public void replaceSimple() {
-      String jiras[] = GitParser.extractJIRAs("ARTEMIS-", "ARTEMIS-1537 broker was less strict while reloading configuration");
+      String jiras[] = jiraParser.extractJIRAs("ARTEMIS-1537 broker was less strict while reloading configuration");
       Assert.assertEquals(1, jiras.length);
       Assert.assertEquals("ARTEMIS-1537", jiras[0]);
    }
-
-   @Test
-   public void replaceURI() {
-      GitParser parser = new GitParser(new File("../"),"ARTEMIS-", "https://issues.apache.org/jira/browse/", "https://github.com/apache/activemq-artemis/").
-         setSourceSuffix(".java");
-      String output = parser.prettyCommitMessage("ARTEMIS-123");
-      Assert.assertEquals("<a href='" + parser.getJiraBrowseURI() + "ARTEMIS-123'>ARTEMIS-123</a>", output);
-   }
 }