[Bigdata-commit] SF.net SVN: bigdata:[8000] branches/RDR/bigdata-sails/src/test/com/bigdata/ rdf/sail/webapp/TestConneg.java

[<mrp...@us...>]

Revision: 8000
          http://sourceforge.net/p/bigdata/code/8000
Author:   mrpersonick
Date:     2014-03-19 16:44:49 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
fixed the test case to not fail because of the new SPARQL JSON to RDF parser

Modified Paths:
--------------
    branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestConneg.java

Modified: branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestConneg.java
===================================================================
--- branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestConneg.java	2014-03-19 16:00:05 UTC (rev 7999)
+++ branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestConneg.java	2014-03-19 16:44:49 UTC (rev 8000)
@@ -33,6 +33,8 @@
 import org.openrdf.query.resultio.TupleQueryResultFormat;
 import org.openrdf.rio.RDFFormat;
 
+import com.bigdata.rdf.rio.json.BigdataSPARQLResultsJSONParserFactory;
+
 /**
  * Test suite for content negotiation helper class.
  * 
@@ -41,6 +43,13 @@
  */
 public class TestConneg extends TestCase2 {
 
+	
+//	static {
+//		
+//		new BigdataSPARQLResultsJSONParserFactory();
+//		
+//	}
+	
     /**
      * 
      */
@@ -68,7 +77,11 @@
 
             assertEquals(format.getName(), format, util.getRDFFormat());
 
-            assertNull(format.getName(), util.getTupleQueryResultFormat());
+            if (!format.getName().equals("JSON")) {
+            
+            	assertNull(format.getName(), util.getTupleQueryResultFormat());
+            	
+            }
 
             assertSameArray(new ConnegScore[] {//
                     new ConnegScore(1f, format) },//
@@ -90,8 +103,12 @@
 
             final ConnegUtil util = new ConnegUtil(format.getDefaultMIMEType());
 
-            assertNull(format.getName(), util.getRDFFormat());
+            if (!format.getName().equals("SPARQL/JSON")) {
+                
+            	assertNull(format.getName(), util.getRDFFormat());
 
+            }
+            
             assertEquals(format.getName(), format,
                     util.getTupleQueryResultFormat());
 
@@ -152,7 +169,11 @@
 
             final ConnegUtil util = new ConnegUtil(format.getDefaultMIMEType());
 
-            assertNull(format.getName(), util.getRDFFormat());
+            if (!format.getName().equals("SPARQL/JSON")) {
+                
+            	assertNull(format.getName(), util.getRDFFormat());
+            	
+            }
 
             assertEquals(format.getName(), format,
                     util.getBooleanQueryResultFormat());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.