From b4c6975ec21986aa6e4c3181417fb5fea6d2fbc5 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Tue, 6 Aug 2013 16:06:21 +0400
Subject: [PATCH] Update test and JQL query to use 'buildtest' as current user
 and not depend on issues not assigned to it

---
 .../integration/JiraIntegrationTest.java      | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java
index 76519590ac0d..5550d8e63faa 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java
@@ -51,8 +51,8 @@ public class JiraIntegrationTest extends TaskManagerTestCase {
    */
   public void testVersionDiscovery1() throws Exception {
     myRepository.setUrl("http://trackers-tests.labs.intellij.net:8015");
-    myRepository.setUsername("deva");
-    myRepository.setPassword("deva");
+    myRepository.setUsername("buildtest");
+    myRepository.setPassword("buildtest");
     assertEquals("2.0", myRepository.discoverRestApiVersion().getVersionName());
   }
 
@@ -61,24 +61,24 @@ public class JiraIntegrationTest extends TaskManagerTestCase {
    */
   public void testVersionDiscovery2() throws Exception {
     myRepository.setUrl("http://trackers-tests.labs.intellij.net:8014");
-    myRepository.setUsername("deva");
-    myRepository.setPassword("deva");
+    myRepository.setUsername("buildtest");
+    myRepository.setPassword("buildtest");
     assertEquals("2.0.alpha1", myRepository.discoverRestApiVersion().getVersionName());
   }
 
   public void testJqlQuery() throws Exception {
-    myRepository.setUsername("deva");
-    myRepository.setPassword("deva");
-    myRepository.setSearchQuery("assignee = currentUser() AND summary ~ 'animal'");
-    assertEquals(1, myRepository.getIssues("", 50, 0).length);
+    myRepository.setUsername("buildtest");
+    myRepository.setPassword("buildtest");
+    myRepository.setSearchQuery("assignee = currentUser() AND (summary ~ 'foo' or resolution = Fixed)");
+    assertEquals(2, myRepository.getIssues("", 50, 0).length);
   }
 
   /**
    * Holds only for JIRA > 5.x.x
    */
   public void testExtractedErrorMessage() throws Exception {
-    myRepository.setUsername("deva");
-    myRepository.setPassword("deva");
+    myRepository.setUsername("buildtest");
+    myRepository.setPassword("buildtest");
     myRepository.setSearchQuery("foo < bar");
     try {
       myRepository.getIssues("", 50, 0);
@@ -89,13 +89,6 @@ public class JiraIntegrationTest extends TaskManagerTestCase {
     }
   }
 
-  public void testEmptyQuerySelectsAllIssues() throws Exception {
-    myRepository.setUsername("deva");
-    myRepository.setPassword("deva");
-    myRepository.setSearchQuery("");
-    assertEquals(13, myRepository.getIssues("", 50, 0).length);
-  }
-
   @Override
   public void setUp() throws Exception {
     super.setUp();