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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-11-11 10:58:19 -05:00
commit b47900cf1a
2 changed files with 14365 additions and 14344 deletions
Download patch file Download diff file Expand all files Collapse all files

28623
test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf
View file

File diff suppressed because it is too large Load diff

6
test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java
View file

@ -1,13 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.solr;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.*;
import static org.junit.Assert.assertTrue;
import java.io.InputStream; import java.io.InputStream;
import org.apache.solr.common.SolrInputDocument;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Model;
@ -64,7 +63,6 @@ public class VivoAgentContextNodeFieldsTest extends AbstractTestClass{
assertTrue("expected to have jane because SPCA advises jane", hasJane); assertTrue("expected to have jane because SPCA advises jane", hasJane);
} }
@Ignore
@Test @Test
public void testWonder(){ public void testWonder(){
Individual ind = new IndividualImpl(); Individual ind = new IndividualImpl();