You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/08/31 14:12:35 UTC
svn commit: r1379427 - in
/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki: WebTest.java
http/TestDatasetAccessorHTTP.java
Author: andy
Date: Fri Aug 31 12:12:35 2012
New Revision: 1379427
URL: http://svn.apache.org/viewvc?rev=1379427&view=rev
Log:
Allow different possible expected response codes in a test.
Modified:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java?rev=1379427&r1=1379426&r2=1379427&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java Fri Aug 31 12:12:35 2012
@@ -29,16 +29,16 @@ import org.apache.http.client.methods.Ht
import org.apache.http.impl.client.DefaultHttpClient ;
import org.openjena.atlas.io.IO ;
-public class WebTest
+public class WebTest extends BaseTest
{
- public static void exec_get(String url, int expectedResponseCode)
+ public static void exec_get(String url, int ... expectedResponseCodes)
{
HttpUriRequest httpRequest = new HttpGet(url) ;
- exec(httpRequest, expectedResponseCode) ;
+ exec(httpRequest, expectedResponseCodes) ;
}
- public static void exec(HttpUriRequest httpRequest, int expectedResponseCode)
+ public static void exec(HttpUriRequest httpRequest, int...expectedResponseCodes)
{
HttpClient httpclient = new DefaultHttpClient() ;
try {
@@ -54,7 +54,12 @@ public class WebTest
byte[] bytes = IO.readWholeFile(instream) ;
instream.close() ;
}
- org.junit.Assert.assertEquals("("+responseCode+", "+responseMessage+")", expectedResponseCode, responseCode) ;
+
+ boolean found = false ;
+ for ( int expected : expectedResponseCodes)
+ if ( expected == responseCode )
+ return ;
+ fail("Reponse: "+responseCode+" : Expected : "+expectedResponseCodes) ;
} catch (IOException ex)
{ IO.exception(ex) ; }
}
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java?rev=1379427&r1=1379426&r2=1379427&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java Fri Aug 31 12:12:35 2012
@@ -41,8 +41,8 @@ public class TestDatasetAccessorHTTP ext
@Test public void test_ds_1()
{
- // Can't GET the dataset
- WebTest.exec_get(serviceREST, 400) ;
+ // Can't GET the dataset service.
+ WebTest.exec_get(serviceREST, 400, 404) ;
}
@Test public void test_ds_2()
@@ -57,12 +57,6 @@ public class TestDatasetAccessorHTTP ext
WebTest.exec_get(datasetURI_not_2, 404) ;
}
- @Test public void test_ds_4()
- {
- // Longer path URI.
- WebTest.exec_get(datasetURI_not_2, 404) ;
- }
-
@Test //(expected=FusekiNotFoundException.class)
public void test_404_1()
{