litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-766 modify test so it will not fail under Java 8.

Browse source
This commit is contained in:
Jim Blake 2014-05-15 10:42:37 -04:00
parent 1c819ffb0b
commit 0b345a6aee
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
webapp/test/edu/cornell/mannlib/vitro/webapp/web/ContentTypeTest.java
View file

@ -45,12 +45,16 @@ public class ContentTypeTest {
Assert.assertEquals("application/rdf+xml", ContentType.getBestContentType(clientAccepts, serverTypes)); Assert.assertEquals("application/rdf+xml", ContentType.getBestContentType(clientAccepts, serverTypes));
} }
/**
* Modified this, added q-factor to text/html, because otherwise the result is indeterminate, and the
* test fails in Java 8.
*/
@Test @Test
public void testWeightedBestContentTypeForFirefox(){ public void testWeightedBestContentTypeForFirefox(){
//accept header from normal firefox //accept header from normal firefox
Map<String,Float> clientAccepts = ContentType.getTypesAndQ( Map<String,Float> clientAccepts = ContentType.getTypesAndQ(
"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); "text/html;q=0.95,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
Map<String,Float> serverTypes = IndividualController.ACCEPTED_CONTENT_TYPES; Map<String,Float> serverTypes = IndividualController.ACCEPTED_CONTENT_TYPES;