Merge branch 'maint-rel-1.6' into develop
This commit is contained in:
commit
b47900cf1a
2 changed files with 14365 additions and 14344 deletions
File diff suppressed because it is too large
Load diff
|
@ -1,13 +1,12 @@
|
|||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||
package edu.cornell.mannlib.vitro.webapp.search.solr;
|
||||
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import java.io.InputStream;
|
||||
|
||||
import org.apache.solr.common.SolrInputDocument;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
public void testWonder(){
|
||||
Individual ind = new IndividualImpl();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue