Changeset 3528

Show
Ignore:
Timestamp:
20/05/04 12:54:06 (5 years ago)
Author:
mark
Message:

/iqlquery is now /iqlQuery

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/intermine/src/test/org/intermine/web/IqlQueryActionTest.java

    r2792 r3528  
    3030 
    3131    public void testSubmitSuccessfulQuery() { 
    32         setRequestPathInfo("/iqlquery"); 
     32        setRequestPathInfo("/iqlQueryAction"); 
    3333        addRequestParameter("querystring","select a1_ from Company as a1_"); 
    3434        addRequestParameter("action", "Run query"); 
    3535        actionPerform(); 
    36         verifyForward("runquery"); 
    37         assertNotNull(getSession().getAttribute(Constants.QUERY)); 
     36        verifyNoActionErrors(); 
     37        verifyForward("results"); 
     38        assertNotNull(getSession().getAttribute(Constants.RESULTS_TABLE)); 
    3839        verifyNoActionErrors(); 
    3940    } 
    4041 
    4142    public void testSubmitEmptyQuery() { 
    42         setRequestPathInfo("/iqlquery"); 
     43        setRequestPathInfo("/iqlQueryAction"); 
    4344        addRequestParameter("querystring",""); 
    4445        addRequestParameter("action", "Run query"); 
    4546        actionPerform(); 
    46         verifyForward("error"); 
    47         assertNull(getSession().getAttribute(Constants.QUERY)); 
     47        verifyActionErrors(new String[] {"errors.iqlquery.illegalargument"}); 
     48        verifyForward("iqlQuery"); 
     49        assertNull(getSession().getAttribute(Constants.RESULTS_TABLE)); 
    4850    } 
    4951 
    5052    public void testSubmitRubbishQuery() { 
    51         setRequestPathInfo("/iqlquery"); 
     53        setRequestPathInfo("/iqlQueryAction"); 
    5254        addRequestParameter("querystring","some rubbish"); 
    5355        addRequestParameter("action", "Run query"); 
    5456        actionPerform(); 
    55         verifyForward("error"); 
    56         assertNull(getSession().getAttribute(Constants.QUERY)); 
    57     } 
    58  
    59     public void testViewSuccessfulQuery() { 
    60         setRequestPathInfo("/iqlquery"); 
    61         addRequestParameter("querystring","select a1_ from Company as a1_"); 
    62         addRequestParameter("action", "Query composer"); 
    63         actionPerform(); 
    64         verifyForward("buildquery"); 
    65         assertEquals("SELECT a1_ FROM org.intermine.model.testmodel.Company AS a1_", 
    66                      ((Query) getSession().getAttribute(Constants.QUERY)).toString()); 
    67         verifyNoActionErrors(); 
    68     } 
    69  
    70     public void testViewEmptyQuery() { 
    71         setRequestPathInfo("/iqlquery"); 
    72         addRequestParameter("querystring",""); 
    73         addRequestParameter("action", "Query composer"); 
    74         actionPerform(); 
    75         verifyForward("error"); 
    76         assertNull((String) getSession().getAttribute(Constants.QUERY)); 
    77     } 
    78  
    79     public void testViewRubbishQuery() { 
    80         setRequestPathInfo("/iqlquery"); 
    81         addRequestParameter("querystring","some rubbish"); 
    82         addRequestParameter("action", "Query composer"); 
    83         actionPerform(); 
    84         verifyForward("error"); 
    85         assertNull((String) getSession().getAttribute(Constants.QUERY)); 
     57        verifyActionErrors(new String[] {"errors.iqlquery.illegalargument"}); 
     58        verifyForward("iqlQuery"); 
     59        assertNull(getSession().getAttribute(Constants.RESULTS_TABLE)); 
    8660    } 
    8761}