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

Update JUnit and add Hamcrest matchers.

Browse source 
Allows better testing of expected exceptions in unit tests.
This commit is contained in:
Jim Blake 2014-10-24 10:27:53 -04:00
parent ea98c15092
commit a4d4d761bc
4 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
webapp/lib/hamcrest-all-1.3.jar Normal file
View file

Binary file not shown.

BIN
webapp/lib/junit-4.11.jar Normal file
View file

Binary file not shown.

BIN
webapp/lib/junit-4.9.jar
View file

Binary file not shown.

53
webapp/test/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java
View file

@ -4,6 +4,7 @@ package edu.cornell.mannlib.vitro.testing;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.fail;
import static org.hamcrest.Matchers.containsString;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
@ -41,8 +42,12 @@ import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.ExpectedException;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@ -52,8 +57,6 @@ import com.hp.hpl.jena.ontology.OntModelSpec;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import edu.cornell.mannlib.vitro.webapp.controller.accounts.manageproxies.ProxyRelationshipSelectorTest;
/**
* A collection of useful routines to help when testing.
* <ul>
@ -264,6 +267,46 @@ public abstract class AbstractTestClass {
return tempDirectory;
}
// ----------------------------------------------------------------------
// A better way of handling expected exceptions.
// ----------------------------------------------------------------------
@Rule
public ExpectedException exception = ExpectedException.none();
protected void expectException(Class<? extends Throwable> type,
String messageSubstring) {
exception.expect(type);
exception.expectMessage(messageSubstring);
}
protected void expectException(Class<? extends Throwable> type,
Matcher<String> messageMatcher) {
exception.expect(type);
exception.expectMessage(messageMatcher);
}
protected void expectExceptionCause(Class<? extends Throwable> type,
String messageSubstring) {
exception.expectCause(Matchers.<Throwable> instanceOf(type));
exception.expectCause(Matchers.<Throwable> hasProperty("message",
containsString(messageSubstring)));
}
protected void expectExceptionCause(Class<? extends Throwable> type,
Matcher<String> messageMatcher) {
exception.expectCause(Matchers.<Throwable> instanceOf(type));
exception.expectCause(Matchers.<Throwable> hasProperty("message",
messageMatcher));
}
protected void expectException(Class<? extends Throwable> clazz,
String messageSubstring, Class<? extends Throwable> causeClazz,
String causeMessageSubstring) {
expectException(clazz, messageSubstring);
expectExceptionCause(causeClazz, causeMessageSubstring);
}
// ----------------------------------------------------------------------
// Other utilities.
// ----------------------------------------------------------------------
@ -416,9 +459,9 @@ public abstract class AbstractTestClass {
return new HashSet<T>(Arrays.asList(array));
}
protected OntModel readModelFromFile(String relativePath, String rdfType) throws IOException {
InputStream stream = this.getClass()
.getResourceAsStream(relativePath);
protected OntModel readModelFromFile(String relativePath, String rdfType)
throws IOException {
InputStream stream = this.getClass().getResourceAsStream(relativePath);
Model model = ModelFactory.createDefaultModel();
model.read(stream, null, rdfType);
stream.close();