From 4535beee8552aeaa73e2d811e5a4e07cecd35a2d Mon Sep 17 00:00:00 2001 From: Felix Belzunce Arcos Date: Tue, 17 Mar 2015 14:05:15 +0100 Subject: [PATCH] JENKINS-24433 Improving tests (cherry picked from commit cb174607b348636eeaf27c6b0eab502ec1f2f3a6) --- .../test/java/hudson/search/SearchTest.java | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/test/src/test/java/hudson/search/SearchTest.java b/test/src/test/java/hudson/search/SearchTest.java index fc5a353661..47e31f403b 100644 --- a/test/src/test/java/hudson/search/SearchTest.java +++ b/test/src/test/java/hudson/search/SearchTest.java @@ -32,6 +32,8 @@ import static org.junit.Assert.fail; import hudson.model.FreeStyleProject; import hudson.model.ListView; +import java.net.URL; + import java.util.ArrayList; import java.util.List; @@ -108,35 +110,32 @@ public class SearchTest { @Issue("JENKINS-24433") @Test public void testSearchByProjectNameBehindAFolder() throws Exception { - final String projectName = "testSearchByProjectName"; - j.createFreeStyleProject(projectName); - j.createFolder("my-folder-1").createProject(FreeStyleProject.class, "my-job-1"); + FreeStyleProject myFreeStyleProject = j.createFreeStyleProject("testSearchByProjectName"); + MockFolder myMockFolder = j.createFolder("my-folder-1"); - Page result = j.createWebClient().goTo("job/my-folder-1/search?q="+ projectName); + Page result = j.createWebClient().goTo(myMockFolder.getUrl() + "search?q="+ myFreeStyleProject.getName()); assertNotNull(result); j.assertGoodStatus(result); - // make sure we've fetched the testSearchByDisplayName project page - String contents = result.getWebResponse().getContentAsString(); - assertTrue(contents.contains(String.format("%s [Jenkins]", projectName))); + URL resultUrl = result.getWebResponse().getUrl(); + assertTrue(resultUrl.toString().equals(j.getInstance().getRootUrl() + myFreeStyleProject.getUrl())); } @Issue("JENKINS-24433") @Test public void testSearchByProjectNameInAFolder() throws Exception { - final String projectName = "testSearchByProjectName"; - j.createFreeStyleProject(projectName); - j.createFolder("my-folder-1").createProject(FreeStyleProject.class, "my-job-1"); - Page result = j.createWebClient().goTo("job/my-folder-1/search?q="+ "my-folder-1/my-job-1"); + MockFolder myMockFolder = j.createFolder("my-folder-1"); + FreeStyleProject myFreeStyleProject = myMockFolder.createProject(FreeStyleProject.class, "my-job-1"); + + Page result = j.createWebClient().goTo(myMockFolder.getUrl() + "search?q=" + myFreeStyleProject.getFullName()); assertNotNull(result); j.assertGoodStatus(result); - // make sure we've fetched the testSearchByDisplayName project page - String contents = result.getWebResponse().getContentAsString(); - assertTrue(contents.contains(String.format("%s [Jenkins]", "my-job-1 [my-folder-1]"))); + URL resultUrl = result.getWebResponse().getUrl(); + assertTrue(resultUrl.toString().equals(j.getInstance().getRootUrl() + myFreeStyleProject.getUrl())); } @Test @@ -293,15 +292,11 @@ public class SearchTest { JSONObject jsonSuggestion = (JSONObject)suggestion; String name = (String)jsonSuggestion.get("name"); - if(projectName1.equals(name)) { - foundProjectName = true; - } if(displayName1.equals(name)) { foundDisplayName = true; } } - assertTrue(foundProjectName); assertTrue(foundDisplayName); }