You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/05/14 23:02:42 UTC

[5/7] jena git commit: JENA-938 : Code cleaning (extract of PR #60)

JENA-938 : Code cleaning (extract of PR #60)

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a251dd9a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a251dd9a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a251dd9a

Branch: refs/heads/master
Commit: a251dd9a45b28cff1422982e4307d4300f049e36
Parents: 45ee91c
Author: Andy Seaborne <an...@apache.org>
Authored: Thu May 14 21:47:47 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu May 14 21:47:47 2015 +0100

----------------------------------------------------------------------
 .../jena/ontology/impl/TestAllDifferent.java    |   2 +-
 .../jena/ontology/impl/TestClassExpression.java | 112 +++++++++----------
 .../jena/ontology/impl/TestIndividual.java      |  42 +++----
 .../apache/jena/ontology/impl/TestOntTools.java |   3 +-
 .../apache/jena/ontology/impl/TestOntology.java |   8 +-
 .../apache/jena/ontology/impl/TestProperty.java |  54 ++++-----
 .../apache/jena/ontology/impl/TestResource.java |  50 ++++-----
 .../model/test/AbstractContainerMethods.java    |   2 +-
 .../rdf/model/test/AbstractModelTestBase.java   |   4 +-
 .../jena/rdf/model/test/IsomorphicTests.java    |   4 +-
 .../jena/rdf/model/test/TestAddAndContains.java |   4 +-
 .../jena/rdf/model/test/TestAddModel.java       |   4 +-
 .../jena/rdf/model/test/TestConcurrency.java    |   4 +-
 .../rdf/model/test/TestConcurrencyNesting.java  |   2 +-
 .../rdf/model/test/TestConcurrencyParallel.java |   2 +-
 .../rdf/model/test/TestCopyInOutOfModel.java    |   2 +-
 .../org/apache/jena/rdf/model/test/TestGet.java |   4 +-
 .../jena/rdf/model/test/TestIterators.java      |   2 +-
 .../jena/rdf/model/test/TestListStatements.java |   4 +-
 .../jena/rdf/model/test/TestListSubjects.java   |   2 +-
 .../rdf/model/test/TestLiteralsInModel.java     |   2 +-
 .../jena/rdf/model/test/TestModelEvents.java    |   2 +-
 .../rdf/model/test/TestModelSetOperations.java  |   4 +-
 .../rdf/model/test/TestObjectOfProperties.java  |   2 +-
 .../apache/jena/rdf/model/test/TestObjects.java |   4 +-
 .../rdf/model/test/TestReifiedStatements.java   |   2 +-
 .../rdf/model/test/TestResourceMethods.java     |   2 +-
 .../jena/rdf/model/test/TestSelectorUse.java    |   2 +-
 .../jena/rdf/model/test/TestSeqMethods.java     |   2 +-
 .../model/test/TestSimpleListStatements.java    |   2 +-
 .../jena/rdf/model/test/TestSimpleSelector.java |   2 +-
 .../rdf/model/test/TestStatementCreation.java   |   4 +-
 .../rdf/model/test/TestStatementMethods.java    |   2 +-
 .../jena/rdfxml/xmloutput/PrettyWriterTest.java |   2 +-
 .../jena/rdfxml/xmloutput/TestXMLFeatures.java  |   4 +-
 35 files changed, 174 insertions(+), 175 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAllDifferent.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAllDifferent.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAllDifferent.java
index 6ac2fd0..133ab0a 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAllDifferent.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAllDifferent.java
@@ -66,7 +66,7 @@ public class TestAllDifferent
         return new OntTestCase[] {
             new OntTestCase( "AllDifferent.distinctMembers", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     AllDifferent a = m.createAllDifferent();
                     OntResource b = m.getResource( NS + "b" ).as( OntResource.class );

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestClassExpression.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestClassExpression.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestClassExpression.java
index a3e035c..5a7923e 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestClassExpression.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestClassExpression.java
@@ -69,7 +69,7 @@ public class TestClassExpression
         return new OntTestCase[] {
             new OntTestCase( "OntClass.super-class", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
@@ -96,7 +96,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.sub-class", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
@@ -123,7 +123,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.equivalentClass", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
@@ -150,7 +150,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.disjointWith", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
@@ -177,7 +177,7 @@ public class TestClassExpression
             },
             new OntTestCase( "EnumeratedClass.oneOf", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     EnumeratedClass A = m.createEnumeratedClass( NS + "A", null );
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
@@ -207,7 +207,7 @@ public class TestClassExpression
             },
             new OntTestCase( "IntersectionClass.intersectionOf", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     IntersectionClass A = m.createIntersectionClass( NS + "A", null );
                     OntClass B = m.createClass( NS + "B" );
@@ -241,7 +241,7 @@ public class TestClassExpression
             },
             new OntTestCase( "UnionClass.unionOf", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     UnionClass A = m.createUnionClass( NS + "A", null );
                     OntClass B = m.createClass( NS + "B" );
@@ -275,7 +275,7 @@ public class TestClassExpression
             },
             new OntTestCase( "ComplementClass.complementOf", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     ComplementClass A = m.createComplementClass( NS + "A", null );
                     OntClass B = m.createClass( NS + "B" );
@@ -311,7 +311,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.onProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
                     OntProperty q = m.createObjectProperty( NS + "q" );
@@ -339,7 +339,7 @@ public class TestClassExpression
             },
             new OntTestCase( "AllValuesFromRestriction.allValuesFrom", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
                     OntClass B = m.createClass( NS + "B" );
@@ -367,7 +367,7 @@ public class TestClassExpression
             },
             new OntTestCase( "AllValuesFromRestriction.allValuesFrom.datatype", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
 
@@ -393,7 +393,7 @@ public class TestClassExpression
             },
             new OntTestCase( "AllValuesFromRestriction.allValuesFrom.literal", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
 
@@ -407,7 +407,7 @@ public class TestClassExpression
             },
             new OntTestCase( "AllValuesFromRestriction.allValuesFrom.datarange", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     Literal x = m.createTypedLiteral( 1 );
                     Literal y = m.createTypedLiteral( 2 );
@@ -430,7 +430,7 @@ public class TestClassExpression
             },
             new OntTestCase( "HasValueRestriction.hasValue", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
                     OntClass B = m.createClass( NS + "B" );
@@ -462,7 +462,7 @@ public class TestClassExpression
             },
             new OntTestCase( "SomeValuesFromRestriction.someValuesFrom", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
                     OntClass B = m.createClass( NS + "B" );
@@ -490,7 +490,7 @@ public class TestClassExpression
             },
             new OntTestCase( "SomeValuesFromRestriction.SomeValuesFrom.datatype", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
 
@@ -516,7 +516,7 @@ public class TestClassExpression
             },
             new OntTestCase( "SomeValuesFromRestriction.SomeValuesFrom.literal", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
 
@@ -530,7 +530,7 @@ public class TestClassExpression
             },
             new OntTestCase( "SomeValuesFromRestriction.SomeValuesFrom.datarange", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     Literal x = m.createTypedLiteral( 1 );
                     Literal y = m.createTypedLiteral( 2 );
@@ -553,7 +553,7 @@ public class TestClassExpression
             },
             new OntTestCase( "CardinalityRestriction.cardinality", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
 
@@ -580,7 +580,7 @@ public class TestClassExpression
             },
             new OntTestCase( "MinCardinalityRestriction.minCardinality", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
 
@@ -607,7 +607,7 @@ public class TestClassExpression
             },
             new OntTestCase( "MaxCardinalityRestriction.maxCardinality", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
 
@@ -634,7 +634,7 @@ public class TestClassExpression
             },
             new OntTestCase( "QualifiedRestriction.hasClassQ", false, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createObjectProperty( NS + "p" );
                     OntClass c = m.createClass( NS + "C" );
                     OntClass d = m.createClass( NS + "D" );
@@ -659,7 +659,7 @@ public class TestClassExpression
             },
             new OntTestCase( "CardinalityQRestriction.cardinality", false, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createObjectProperty( NS + "p" );
                     OntClass c = m.createClass( NS + "C" );
 
@@ -682,7 +682,7 @@ public class TestClassExpression
             },
             new OntTestCase( "MinCardinalityQRestriction.minCardinality", false, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createObjectProperty( NS + "p" );
                     OntClass c = m.createClass( NS + "C" );
 
@@ -705,7 +705,7 @@ public class TestClassExpression
             },
             new OntTestCase( "MaxCardinalityQRestriction.maxCardinality", false, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createObjectProperty( NS + "p" );
                     OntClass c = m.createClass( NS + "C" );
 
@@ -730,7 +730,7 @@ public class TestClassExpression
             // from file
             new OntTestCase( "OntClass.subclass.fromFile", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     String lang = m_owlLang ? "owl" : "rdfs" ;
                     String fileName = "file:testing/ontology/" + lang + "/ClassExpression/test.rdf";
                     m.read( fileName );
@@ -744,7 +744,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.equivalentClass.fromFile", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     String lang = m_owlLang ? "owl" : "rdfs" ;
                     String fileName = "file:testing/ontology/" + lang + "/ClassExpression/test.rdf";
                     m.read( fileName );
@@ -757,7 +757,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.disjoint.fromFile", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     String lang = m_owlLang ? "owl" : "rdfs" ;
                     String fileName = "file:testing/ontology/" + lang + "/ClassExpression/test.rdf";
                     m.read( fileName );
@@ -772,7 +772,7 @@ public class TestClassExpression
             // type testing
             new OntTestCase( "OntClass.isEnumeratedClass", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass b = m.createClass( NS + "B" );
                     Individual x = m.createIndividual( NS + "x", b );
                     Individual y = m.createIndividual( NS + "y", b );
@@ -787,7 +787,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.isIntersectionClass", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass b = m.createClass( NS + "B" );
                     OntClass c = m.createClass( NS + "C" );
                     OntClass a = m.createIntersectionClass( NS + "A", m.createList( new RDFNode[] {b,c} ) );
@@ -801,7 +801,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.isUnionClass", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass b = m.createClass( NS + "B" );
                     OntClass c = m.createClass( NS + "C" );
                     OntClass a = m.createUnionClass( NS + "A", m.createList( new RDFNode[] {b,c} ) );
@@ -815,7 +815,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.isComplementClass", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass b = m.createClass( NS + "B" );
                     OntClass a = m.createComplementClass( NS + "A", b );
 
@@ -828,7 +828,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.isRestriction", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass a = m.createRestriction( null );
 
                     assertTrue( "enumerated class test not correct",    m_owlLiteLang || !a.isEnumeratedClass() );
@@ -842,7 +842,7 @@ public class TestClassExpression
             // conversion
             new OntTestCase( "OntClass.toEnumeratedClass", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass a = m.createClass( NS + "A" );
 
                     assertTrue( "enumerated class test not correct",    !a.isEnumeratedClass() );
@@ -865,7 +865,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.toIntersectionClass", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass a = m.createClass( NS + "A" );
 
                     assertTrue( "enumerated class test not correct",    m_owlLiteLang || !a.isEnumeratedClass() );
@@ -887,7 +887,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.toUnionClass", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass a = m.createClass( NS + "A" );
 
                     assertTrue( "enumerated class test not correct",    !a.isEnumeratedClass() );
@@ -909,7 +909,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.toComplementClass", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass a = m.createClass( NS + "A" );
 
                     assertTrue( "enumerated class test not correct",    !a.isEnumeratedClass() );
@@ -930,7 +930,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.toRestriction", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass a = m.createClass( NS + "A" );
 
                     assertTrue( "enumerated class test not correct",    m_owlLiteLang || !a.isEnumeratedClass() );
@@ -954,7 +954,7 @@ public class TestClassExpression
             // restriction type testing
             new OntTestCase( "Restriction.isAllValuesFrom", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass b = m.createClass( NS + "B" );
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createAllValuesFromRestriction( null, p, b );
@@ -969,7 +969,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.isSomeValuesFrom", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass b = m.createClass( NS + "B" );
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createSomeValuesFromRestriction( null, p, b );
@@ -984,7 +984,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.isHasValue", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass b = m.createClass( NS + "B" );
                     Individual x = m.createIndividual( b );
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
@@ -1000,7 +1000,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.isCardinality", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createCardinalityRestriction( null, p, 3 );
 
@@ -1014,7 +1014,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.isMinCardinality", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createMinCardinalityRestriction( null, p, 1 );
 
@@ -1028,7 +1028,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.isMaxCardinality", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createMaxCardinalityRestriction( null, p, 5 );
 
@@ -1044,7 +1044,7 @@ public class TestClassExpression
             // restriction conversions
             new OntTestCase( "Restriction.convertToAllValuesFrom", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createRestriction( p );
 
@@ -1068,7 +1068,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.convertToSomeValuesFrom", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createRestriction( p );
 
@@ -1092,7 +1092,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.convertToHasValue", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createRestriction( p );
 
@@ -1117,7 +1117,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.convertCardinality", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createRestriction( p );
 
@@ -1140,7 +1140,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.convertMinCardinality", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createRestriction( p );
 
@@ -1163,7 +1163,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Restriction.convertMaxCardinality", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     Restriction a = m.createRestriction( p );
 
@@ -1186,7 +1186,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.listInstances", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
 
@@ -1201,7 +1201,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.listDefinedProperties", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     //OntClass B = m.createClass( NS + "B" );
                     OntClass C = m.createClass( NS + "C" );
@@ -1232,7 +1232,7 @@ public class TestClassExpression
             },
             new OntTestCase( "OntClass.listDefinedProperties.notAll", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass C = m.createClass( NS + "C" );
                     C.addSuperClass(A);
@@ -1254,7 +1254,7 @@ public class TestClassExpression
             },
             new OntTestCase( "DataRange.oneOf", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Literal x = m.createTypedLiteral( 42 );
                     Literal y = m.createTypedLiteral( true );
                     Literal z = m.createTypedLiteral( "life" );
@@ -1289,7 +1289,7 @@ public class TestClassExpression
 
             new OntTestCase( "Remove intersection", true, true, false )  {
                 @Override
-                protected void ontTest(OntModel m) throws Exception {
+                protected void ontTest(OntModel m) {
                     String ns = "http://example.com/foo#";
                     OntClass a = m.createClass(ns + "A");
                     OntClass b = m.createClass(ns + "B");
@@ -1305,7 +1305,7 @@ public class TestClassExpression
             },
             new OntTestCase( "Remove union", true, false, false )  {
                 @Override
-                protected void ontTest(OntModel m) throws Exception {
+                protected void ontTest(OntModel m) {
                     String ns = "http://example.com/foo#";
                     OntClass a = m.createClass(ns + "A");
                     OntClass b = m.createClass(ns + "B");

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestIndividual.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestIndividual.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestIndividual.java
index 97c7c3d..1374aea 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestIndividual.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestIndividual.java
@@ -72,7 +72,7 @@ public class TestIndividual
             new OntTestCase( "Individual.sameAs", true, false, false ) {
                 /** Note: 6/Nov/2003 - updated to use sameAs not sameIndividualAs, following changes to OWL spec */
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntClass A = m.createClass( NS + "A" );
                     Individual x = m.createIndividual( A );
@@ -101,7 +101,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.hasOntClass", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
                     Individual x = m.createIndividual( A );
@@ -113,7 +113,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.hasOntClass direct", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
                     A.addSubClass( B );
@@ -132,7 +132,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.hasOntClass string", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
 
                     Individual x = m.createIndividual( A );
@@ -143,7 +143,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.getOntClass", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     Individual x = m.createIndividual( A );
 
@@ -153,7 +153,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.getOntClass direct", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
                     A.addSubClass( B );
@@ -168,7 +168,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.listOntClasses", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
                     A.addSubClass( B );
@@ -187,7 +187,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.listOntClasses direct", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
                     A.addSubClass( B );
@@ -206,7 +206,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.addOntClass", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
                     A.addSubClass( B );
@@ -228,7 +228,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.setOntClass", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
                     A.addSubClass( B );
@@ -250,7 +250,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.removeOntClass", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
 
@@ -272,7 +272,7 @@ public class TestIndividual
 
             new OntTestCase( "Individual.canAs", true, true, false ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     Resource r = m.createResource( NS + "r" );
                     Resource s = m.createResource( NS + "s" );
@@ -290,7 +290,7 @@ public class TestIndividual
             /** Test case for SF bug 945436 - a xml:lang='' in the dataset causes string index exception in getLabel() */
             new OntTestCase( "Individual.canAs", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     String SOURCE=
                         "<?xml version='1.0'?>" +
                         "<!DOCTYPE owl [" +
@@ -318,7 +318,7 @@ public class TestIndividual
 
             new OntTestCase( "OntResource.isIndividual 1", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntModel defModel = ModelFactory.createOntologyModel();
                     OntClass c = defModel.createClass( "http://example.com/test#A" );
                     Individual i = c.createIndividual();
@@ -328,7 +328,7 @@ public class TestIndividual
             /** User report of builtin classes showing up as individuals */
             new OntTestCase( "OntResource.isIndividual 1", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     String NS = "http://jena.hpl.hp.com/example#";
                     m = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 
@@ -343,7 +343,7 @@ public class TestIndividual
 
             new OntTestCase( "OntResource.isIndividual 1", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     String NS = "http://jena.hpl.hp.com/example#";
                     m = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM_MICRO_RULE_INF);
 
@@ -359,7 +359,7 @@ public class TestIndividual
             /** Edge case - suppose we imagine that user has materialised results of offline inference */
             new OntTestCase( "OntResource.isIndividual 1", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     String NS = "http://jena.hpl.hp.com/example#";
                     m = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
 
@@ -375,7 +375,7 @@ public class TestIndividual
 
             new OntTestCase( "OntResource.isIndividual 1", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     String NS = "http://jena.hpl.hp.com/example#";
                     m = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
 
@@ -391,7 +391,7 @@ public class TestIndividual
 
             new OntTestCase( "OntResource.isIndividual 1", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     String NS = "http://jena.hpl.hp.com/example#";
                     m = ModelFactory.createOntologyModel(OntModelSpec.RDFS_MEM);
 
@@ -408,7 +408,7 @@ public class TestIndividual
             /** But we do allow punning */
             new OntTestCase( "OntResource.isIndividual 1", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     String NS = "http://jena.hpl.hp.com/example#";
                     m = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 
@@ -423,7 +423,7 @@ public class TestIndividual
 
             new OntTestCase( "OntResource.isIndividual 1", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     String NS = "http://jena.hpl.hp.com/example#";
                     m = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM_MICRO_RULE_INF);
 

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
index f57a48d..dc41c35 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
@@ -76,11 +76,10 @@ public class TestOntTools
     //////////////////////////////////
 
     /**
-     * @throws java.lang.Exception
      * @see junit.framework.TestCase#setUp()
      */
     @Override
-    protected void setUp() throws Exception {
+    protected void setUp() {
         m_model = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM_MICRO_RULE_INF );
         m_a = m_model.createClass( NS + "A" );
         m_b = m_model.createClass( NS + "B" );

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntology.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntology.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntology.java
index c153c95..ec9addc 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntology.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntology.java
@@ -68,7 +68,7 @@ public class TestOntology
         return new OntTestCase[] {
             new OntTestCase( "Ontology.imports", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     Ontology x = m.createOntology( NS + "x" );
                     Ontology y = m.createOntology( NS + "y" );
@@ -94,7 +94,7 @@ public class TestOntology
             },
             new OntTestCase( "Ontology.backwardCompatibleWith", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     Ontology x = m.createOntology( NS + "x" );
                     Ontology y = m.createOntology( NS + "y" );
@@ -120,7 +120,7 @@ public class TestOntology
             },
             new OntTestCase( "Ontology.priorVersion", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     Ontology x = m.createOntology( NS + "x" );
                     Ontology y = m.createOntology( NS + "y" );
@@ -146,7 +146,7 @@ public class TestOntology
             },
             new OntTestCase( "Ontology.incompatibleWith", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     Ontology x = m.createOntology( NS + "x" );
                     Ontology y = m.createOntology( NS + "y" );

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestProperty.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestProperty.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestProperty.java
index 94bbbec..c4beaa2 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestProperty.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestProperty.java
@@ -74,7 +74,7 @@ public class TestProperty
         return new OntTestCase[] {
             new OntTestCase( "OntProperty.super-property", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createOntProperty( NS + "p" );
                     OntProperty q = m.createOntProperty( NS + "q" );
@@ -104,7 +104,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.sub-property", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createOntProperty( NS + "p" );
                     OntProperty q = m.createOntProperty( NS + "q" );
@@ -132,7 +132,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.domain", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createOntProperty( NS + "p" );
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
@@ -158,7 +158,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.range", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createOntProperty( NS + "p" );
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
@@ -184,7 +184,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.equivalentProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
                     OntProperty q = m.createObjectProperty( NS + "q" );
@@ -210,7 +210,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.inverseOf", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntProperty p = m.createObjectProperty( NS + "p" );
                     OntProperty q = m.createObjectProperty( NS + "q" );
@@ -241,7 +241,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.subproperty.fromFile", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     String lang = m_owlLang ? "owl" : "rdfs" ;
                     String fileName = "file:testing/ontology/" + lang + "/Property/test.rdf";
                     m.read( fileName );
@@ -255,7 +255,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.domain.fromFile", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     String lang = m_owlLang ? "owl" : "rdfs" ;
                     String fileName = "file:testing/ontology/" + lang + "/Property/test.rdf";
                     m.read( fileName );
@@ -268,7 +268,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.range.fromFile", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     String lang = m_owlLang ? "owl" : "rdfs" ;
                     String fileName = "file:testing/ontology/" + lang + "/Property/test.rdf";
                     m.read( fileName );
@@ -281,7 +281,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.equivalentProeprty.fromFile", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     String lang = m_owlLang ? "owl" : "rdfs" ;
                     String fileName = "file:testing/ontology/" + lang + "/Property/test.rdf";
                     m.read( fileName );
@@ -294,7 +294,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.inversePropertyOf.fromFile", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     String lang = m_owlLang ? "owl" : "rdfs" ;
                     String fileName = "file:testing/ontology/" + lang + "/Property/test.rdf";
                     m.read( fileName );
@@ -309,7 +309,7 @@ public class TestProperty
             // type tests
             new OntTestCase( "OntProperty.isFunctionalProperty dt", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createDatatypeProperty( NS + "p", true );
 
                     assertTrue( "isFunctionalProperty not correct",         p.isFunctionalProperty() );
@@ -324,7 +324,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.isFunctionalProperty object", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createObjectProperty( NS + "p", true );
 
                     assertTrue( "isFunctionalProperty not correct",         p.isFunctionalProperty() );
@@ -339,7 +339,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.isDatatypeProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createDatatypeProperty( NS + "p", false );
 
                     assertTrue( "isFunctionalProperty not correct",         !p.isFunctionalProperty() );
@@ -354,7 +354,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.isObjectProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createObjectProperty( NS + "p", false );
 
                     assertTrue( "isFunctionalProperty not correct",         !p.isFunctionalProperty() );
@@ -369,7 +369,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.isTransitiveProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createTransitiveProperty( NS + "p" );
 
                     assertTrue( "isFunctionalProperty not correct",         !p.isFunctionalProperty() );
@@ -384,7 +384,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.isInverseFunctionalProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createInverseFunctionalProperty( NS + "p" );
 
                     assertTrue( "isFunctionalProperty not correct",         !p.isFunctionalProperty() );
@@ -399,7 +399,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.isSymmetricProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntProperty p = m.createSymmetricProperty( NS + "p" );
 
                     assertTrue( "isFunctionalProperty not correct",         !p.isFunctionalProperty() );
@@ -414,7 +414,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.convertToFunctionalProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Property pSimple = m.createProperty( NS, "p" );
                     pSimple.addProperty( RDF.type, RDF.Property );
                     OntProperty p = pSimple.as( OntProperty.class );
@@ -438,7 +438,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.convertToDatatypeProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Property pSimple = m.createProperty( NS, "p" );
                     pSimple.addProperty( RDF.type, RDF.Property );
                     OntProperty p = pSimple.as( OntProperty.class );
@@ -462,7 +462,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.convertToObjectProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Property pSimple = m.createProperty( NS, "p" );
                     pSimple.addProperty( RDF.type, RDF.Property );
                     OntProperty p = pSimple.as( OntProperty.class );
@@ -486,7 +486,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.convertToTransitiveProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Property pSimple = m.createProperty( NS, "p" );
                     pSimple.addProperty( RDF.type, RDF.Property );
                     OntProperty p = pSimple.as( OntProperty.class );
@@ -510,7 +510,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.convertToInverseFunctionalProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Property pSimple = m.createProperty( NS, "p" );
                     pSimple.addProperty( RDF.type, RDF.Property );
                     OntProperty p = pSimple.as( OntProperty.class );
@@ -534,7 +534,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.convertToSymmetricProperty", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Property pSimple = m.createProperty( NS, "p" );
                     pSimple.addProperty( RDF.type, RDF.Property );
                     OntProperty p = pSimple.as( OntProperty.class );
@@ -558,7 +558,7 @@ public class TestProperty
             },
             new OntTestCase( "ObjectProperty.inverse", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS + "p" );
                     ObjectProperty q = m.createObjectProperty( NS + "q" );
                     ObjectProperty r = m.createObjectProperty( NS + "r" );
@@ -576,7 +576,7 @@ public class TestProperty
             },
             new OntTestCase( "OntProperty.listReferringRestrictions", true, true, false ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     ObjectProperty p = m.createObjectProperty( NS+"p" );
                     ObjectProperty q = m.createObjectProperty( NS+"q" );
                     Restriction r0 = m.createCardinalityRestriction( null, p, 2 );
@@ -594,7 +594,7 @@ public class TestProperty
             },
             new OntTestCase( "no duplication from imported models", true, true, true ) {
                 @Override
-                protected void ontTest( OntModel m ) throws Exception {
+                protected void ontTest( OntModel m ) {
                     OntModel m0 = ModelFactory.createOntologyModel( OntModelSpec.OWL_DL_MEM_RULE_INF, null );
                     FileManager.get().readModel( m0, "file:testing/ontology/testImport9/a.ttl" );
 

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestResource.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestResource.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestResource.java
index 8216e88..8505331 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestResource.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestResource.java
@@ -73,7 +73,7 @@ public class TestResource extends OntTestBase
         return new OntTestCase[] {
             new OntTestCase( "OntResource.sameAs", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
                     OntResource b = m.getResource( NS + "b" ).as( OntResource.class );
@@ -102,7 +102,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.differentFrom", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
                     OntResource b = m.getResource( NS + "b" ).as( OntResource.class );
@@ -131,7 +131,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.seeAlso", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
                     OntResource b = m.getResource( NS + "b" ).as( OntResource.class );
@@ -160,7 +160,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.isDefinedBy", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
                     OntResource b = m.getResource( NS + "b" ).as( OntResource.class );
@@ -189,7 +189,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.versionInfo", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
 
@@ -216,7 +216,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.label.nolang", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
 
@@ -243,7 +243,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.label.lang", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
 
                     a.addLabel( "good", "EN" );
@@ -278,7 +278,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.comment.nolang", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Profile prof = m.getProfile();
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
 
@@ -305,7 +305,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.comment.lang", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
 
                     a.addComment( "good", "EN" );
@@ -340,7 +340,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.type (no inference)", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
                     A.addSubClass( B );
@@ -376,7 +376,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.remove", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntClass A = m.createClass( NS + "A" );
                     OntClass B = m.createClass( NS + "B" );
                     OntClass C = m.createClass( NS + "C" );
@@ -399,7 +399,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.asClass", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Resource r = m.createResource();
                     r.addProperty( RDF.type, m.getProfile().CLASS() );
                     OntResource or = r.as( OntResource.class );
@@ -419,7 +419,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.asAnnotationProperty", true, true, false) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     if (m.getProfile().ANNOTATION_PROPERTY() == null) {
                         throw new ProfileException(null,null);
                     }
@@ -443,7 +443,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.asObjectProperty", true, true, false) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     if (m.getProfile().OBJECT_PROPERTY() == null) {
                         throw new ProfileException(null,null);
                     }
@@ -467,7 +467,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.asDatatypeProperty", true, true, false) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     if (m.getProfile().DATATYPE_PROPERTY() == null) {
                         throw new ProfileException(null,null);
                     }
@@ -491,7 +491,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.asAllDifferent", true, true, false) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     if (m.getProfile().ALL_DIFFERENT() == null) {
                         throw new ProfileException(null,null);
                     }
@@ -515,7 +515,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.asProperty", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Resource r = m.createResource();
                     r.addProperty( RDF.type, m.getProfile().PROPERTY() );
                     OntResource or = r.as( OntResource.class );
@@ -536,7 +536,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.asIndividual", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     Resource r = m.createResource();
                     Resource s = m.createResource();
                     s.addProperty( RDF.type, m.getProfile().CLASS() );
@@ -559,7 +559,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.asDataRange", true, false, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     if (m.getProfile().DATARANGE() == null) {
                         throw new ProfileException(null,null);
                     }
@@ -583,7 +583,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.asOntology", true, true, false ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     if (m.getProfile().ONTOLOGY() == null) {
                         throw new ProfileException(null,null);
                     }
@@ -607,7 +607,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.isLanguageTerm", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     // class is defined (differently) in every profile
                     OntResource or = m.getProfile().CLASS().inModel(m).as( OntResource.class );
                     assertTrue( "should be a lang term", or.isOntLanguageTerm() );
@@ -618,7 +618,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.getOntModel", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntResource or = m.createOntResource( "http://foo/bar" );
                     OntModel m0 = or.getOntModel();
                     assertEquals( m, m0 );
@@ -626,7 +626,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.getPropertyValue - object prop", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntResource a = m.createOntResource( "http://foo/bar#a" );
                     Resource b = m.createResource( "http://foo/bar#b" );
                     OntProperty p = m.createOntProperty( "http://foo/bar#p" );
@@ -638,7 +638,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.getPropertyValue - missing prop", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntResource a = m.createOntResource( "http://foo/bar#a" );
                     Resource b = m.createResource( "http://foo/bar#b" );
                     OntProperty p = m.createOntProperty( "http://foo/bar#p" );
@@ -650,7 +650,7 @@ public class TestResource extends OntTestBase
             },
             new OntTestCase( "OntResource.listPropertyValues - object prop", true, true, true ) {
                 @Override
-                public void ontTest( OntModel m ) throws Exception {
+                public void ontTest( OntModel m ) {
                     OntResource a = m.createOntResource( "http://foo/bar#a" );
                     Resource b = m.createResource( "http://foo/bar#b" );
                     OntProperty p = m.createOntProperty( "http://foo/bar#p" );

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/AbstractContainerMethods.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/AbstractContainerMethods.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/AbstractContainerMethods.java
index 304ff06..9fd1034 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/AbstractContainerMethods.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/AbstractContainerMethods.java
@@ -42,7 +42,7 @@ public abstract class AbstractContainerMethods extends AbstractModelTestBase
 	protected abstract Resource getContainerType();
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		resource = model.createResource();

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/AbstractModelTestBase.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/AbstractModelTestBase.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/AbstractModelTestBase.java
index 8fa388c..4c0b963 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/AbstractModelTestBase.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/AbstractModelTestBase.java
@@ -149,7 +149,7 @@ public abstract class AbstractModelTestBase extends TestCase
 	 * sets the model instance variable
 	 */
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		model = createModel();
 	}
@@ -158,7 +158,7 @@ public abstract class AbstractModelTestBase extends TestCase
 	 * Closes the model instance variable and shuts it down.
 	 */
 	@Override
-	public void tearDown() throws Exception
+	public void tearDown()
 	{
 		model.close();
 		model = null;

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/IsomorphicTests.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/IsomorphicTests.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/IsomorphicTests.java
index 9f15642..96eef1a 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/IsomorphicTests.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/IsomorphicTests.java
@@ -242,7 +242,7 @@ public class IsomorphicTests extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		random = new Random();
@@ -250,7 +250,7 @@ public class IsomorphicTests extends AbstractModelTestBase
 	}
 
 	@Override
-	public void tearDown() throws Exception
+	public void tearDown()
 	{
 		model.close();
 		super.tearDown();

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestAddAndContains.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestAddAndContains.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestAddAndContains.java
index 7c464f4..8dd6fbb 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestAddAndContains.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestAddAndContains.java
@@ -40,7 +40,7 @@ public class TestAddAndContains extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		S = model.createResource("http://nowhere.man/subject");
@@ -48,7 +48,7 @@ public class TestAddAndContains extends AbstractModelTestBase
 	}
 
 	@Override
-	public void tearDown() throws Exception
+	public void tearDown()
 	{
 		S = null;
 		P = null;

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestAddModel.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestAddModel.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestAddModel.java
index a4fcbf0..a336115 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestAddModel.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestAddModel.java
@@ -50,14 +50,14 @@ public class TestAddModel extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		model2 = createModel();
 	}
 
 	@Override
-	public void tearDown() throws Exception
+	public void tearDown()
 	{
 		super.tearDown();
 		model2.close();

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrency.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrency.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrency.java
index 3d73470..937a04e 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrency.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrency.java
@@ -99,7 +99,7 @@ public class TestConcurrency  extends TestSuite
         }
 
         @Override
-        protected void runTest() throws Throwable
+        protected void runTest()
         {
             boolean gotException = false ;
             try {
@@ -140,7 +140,7 @@ public class TestConcurrency  extends TestSuite
         }
         
         @Override
-        protected void runTest() throws Throwable
+        protected void runTest()
         {
             Model model = ModelFactory.createDefaultModel() ;
             Thread threads[] = new Thread[threadTotal] ;

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyNesting.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyNesting.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyNesting.java
index 8353c29..d381f77 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyNesting.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyNesting.java
@@ -105,7 +105,7 @@ public class TestConcurrencyNesting extends AbstractModelTestBase
 		workingModels[TestConcurrencyNesting.MODEL2].close();
 	}
 
-	public void testNesting() throws Throwable
+	public void testNesting()
 	{
 		boolean gotException = false;
 		try

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyParallel.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyParallel.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyParallel.java
index 74a7aa9..e5f9871 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyParallel.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyParallel.java
@@ -109,7 +109,7 @@ public class TestConcurrencyParallel extends AbstractModelTestBase
 
 	// Example operations
 
-	public void testParallel() throws Throwable
+	public void testParallel()
 	{
 
 		final Thread threads[] = new Thread[threadTotal];

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestCopyInOutOfModel.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestCopyInOutOfModel.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestCopyInOutOfModel.java
index f543792..765aedc 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestCopyInOutOfModel.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestCopyInOutOfModel.java
@@ -35,7 +35,7 @@ public class TestCopyInOutOfModel extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		S = ResourceFactory.createResource();

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestGet.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestGet.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestGet.java
index cbbaa79..a965373 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestGet.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestGet.java
@@ -35,7 +35,7 @@ public class TestGet extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		S = model.createResource("http://nowhere.man/subject");
@@ -43,7 +43,7 @@ public class TestGet extends AbstractModelTestBase
 	}
 
 	@Override
-	public void tearDown() throws Exception
+	public void tearDown()
 	{
 		S = null;
 		P = null;

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestIterators.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestIterators.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestIterators.java
index abc54ef..7ab3a6b 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestIterators.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestIterators.java
@@ -40,7 +40,7 @@ public class TestIterators extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestListStatements.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestListStatements.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestListStatements.java
index 1a7df75..04a85da 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestListStatements.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestListStatements.java
@@ -35,7 +35,7 @@ public class TestListStatements
 	private static Property p;
 
 	@BeforeClass
-	public static void setUpBeforeClass() throws Exception
+	public static void setUpBeforeClass()
 	{
 		TestListStatements.m = ModelFactory.createDefaultModel();
 		final Resource s = TestListStatements.m
@@ -58,7 +58,7 @@ public class TestListStatements
 	}
 
 	@AfterClass
-	public static void tearDownAfterClass() throws Exception
+	public static void tearDownAfterClass()
 	{
 		TestListStatements.m = null;
 		TestListStatements.s = null;

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestListSubjects.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestListSubjects.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestListSubjects.java
index 9604484..1f4eee5 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestListSubjects.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestListSubjects.java
@@ -143,7 +143,7 @@ public class TestListSubjects extends AbstractModelTestBase
 	// }
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		fillModel();

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestLiteralsInModel.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestLiteralsInModel.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestLiteralsInModel.java
index b980717..d46dcfe 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestLiteralsInModel.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestLiteralsInModel.java
@@ -37,7 +37,7 @@ public class TestLiteralsInModel extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		X = ModelHelper.resource("X");

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelEvents.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelEvents.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelEvents.java
index 983192c..319ea58 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelEvents.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelEvents.java
@@ -170,7 +170,7 @@ public class TestModelEvents extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		SL = new RecordingModelListener();

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelSetOperations.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelSetOperations.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelSetOperations.java
index 58b81f8..997dca8 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelSetOperations.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelSetOperations.java
@@ -39,14 +39,14 @@ public class TestModelSetOperations extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		model2 = createModel();
 	}
 
 	@Override
-	public void tearDown() throws Exception
+	public void tearDown()
 	{
 		super.tearDown();
 		model2.close();

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjectOfProperties.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjectOfProperties.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjectOfProperties.java
index 2e07a44..a6794f8 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjectOfProperties.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjectOfProperties.java
@@ -120,7 +120,7 @@ public class TestObjectOfProperties extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		// tvLitObj = { model.createTypedLiteral(new LitTestObjF()),

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjects.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjects.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjects.java
index ea149a2..eb0a65d 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjects.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjects.java
@@ -105,7 +105,7 @@ public class TestObjects extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		super.setUp();
 		S = model.createResource("http://nowhere.man/subject");
@@ -123,7 +123,7 @@ public class TestObjects extends AbstractModelTestBase
 	}
 
 	@Override
-	public void tearDown() throws Exception
+	public void tearDown()
 	{
 		S = null;
 		P = null;

http://git-wip-us.apache.org/repos/asf/jena/blob/a251dd9a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReifiedStatements.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReifiedStatements.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReifiedStatements.java
index 25ce20d..86c8815 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReifiedStatements.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReifiedStatements.java
@@ -61,7 +61,7 @@ public class TestReifiedStatements extends AbstractModelTestBase
 	}
 
 	@Override
-	public void setUp() throws Exception
+	public void setUp()
 	{
 		model = createModel();
 		final Resource S2 = model.createResource(TestReifiedStatements.anchor