[JENKINS-43507] Fix tests after merge with master

jenkinsci · Jun 14, 2017 · 12502840e5949a667107a69126b28c3b7a726746 · 1250284
1 parent 3ac633a
commit 12502840e5949a667107a69126b28c3b7a726746
Unified Split

Showing with 8 additions and 7 deletions.

+8 −7 src/test/java/jenkins/scm/api/SCMRevisionActionTest.java
diff --git a/src/test/java/jenkins/scm/api/SCMRevisionActionTest.java b/src/test/java/jenkins/scm/api/SCMRevisionActionTest.java
@@ -2,6 +2,7 @@
 import hudson.model.Actionable;
 import jenkins.scm.impl.mock.MockSCMController;
+  
+import jenkins.scm.impl.mock.MockSCMDiscoverBranches;
 import jenkins.scm.impl.mock.MockSCMHead;
 import jenkins.scm.impl.mock.MockSCMRevision;
 import jenkins.scm.impl.mock.MockSCMSource;
@@ -15,7 +16,7 @@
    public void given__legacyData__when__gettingRevision__then__legacyReturned() throws Exception {
        MockSCMController c = MockSCMController.create();
        try {
-  
-            MockSCMSource source = new MockSCMSource("foo", c, "test", true, false, false);
+  
+            MockSCMSource source = new MockSCMSource("foo", c, "test", new MockSCMDiscoverBranches());
            SCMRevision revision = new MockSCMRevision(new MockSCMHead("head"), "hash");
            Actionable a = new ActionableImpl();
            a.addAction(new SCMRevisionAction(revision, null));
@@ -29,9 +30,9 @@ public void given__legacyData__when__gettingRevision__then__legacyReturned() thr
    public void given__mixedData__when__gettingRevision__then__legacyReturnedForUnmatched() throws Exception {
        MockSCMController c = MockSCMController.create();
        try {
-  
-            MockSCMSource source1 = new MockSCMSource("foo", c, "test", true, false, false);
-  
-            MockSCMSource source2 = new MockSCMSource("bar", c, "test", true, false, false);
-  
-            MockSCMSource source3 = new MockSCMSource("manchu", c, "test", true, false, false);
+  
+            MockSCMSource source1 = new MockSCMSource("foo", c, "test", new MockSCMDiscoverBranches());
+  
+            MockSCMSource source2 = new MockSCMSource("bar", c, "test", new MockSCMDiscoverBranches());
+  
+            MockSCMSource source3 = new MockSCMSource("manchu", c, "test", new MockSCMDiscoverBranches());
            SCMRevision revision1 = new MockSCMRevision(new MockSCMHead("head1"), "hash1");
            SCMRevision revision2 = new MockSCMRevision(new MockSCMHead("head2"), "hash2");
            SCMRevision revision3 = new MockSCMRevision(new MockSCMHead("head3"), "hash3");
@@ -51,9 +52,9 @@ public void given__mixedData__when__gettingRevision__then__legacyReturnedForUnma
    public void given__mixedData__when__gettingRevision__then__firstlegacyReturnedForUnmatched() throws Exception {
        MockSCMController c = MockSCMController.create();
        try {
-  
-            MockSCMSource source1 = new MockSCMSource("foo", c, "test", true, false, false);
-  
-            MockSCMSource source2 = new MockSCMSource("bar", c, "test", true, false, false);
-  
-            MockSCMSource source3 = new MockSCMSource("manchu", c, "test", true, false, false);
+  
+            MockSCMSource source1 = new MockSCMSource("foo", c, "test", new MockSCMDiscoverBranches());
+  
+            MockSCMSource source2 = new MockSCMSource("bar", c, "test", new MockSCMDiscoverBranches());
+  
+            MockSCMSource source3 = new MockSCMSource("manchu", c, "test", new MockSCMDiscoverBranches());
            SCMRevision revision1 = new MockSCMRevision(new MockSCMHead("head1"), "hash1");
            SCMRevision revision2 = new MockSCMRevision(new MockSCMHead("head2"), "hash2");
            SCMRevision revision3 = new MockSCMRevision(new MockSCMHead("head3"), "hash3");