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/07/13 14:22:14 UTC
jena git commit: Stablize tests for the case where inner classes are
already loaded.
Repository: jena
Updated Branches:
refs/heads/master 2452bd666 -> 80ba36d9a
Stablize tests for the case where inner classes are already loaded.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/80ba36d9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/80ba36d9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/80ba36d9
Branch: refs/heads/master
Commit: 80ba36d9a7e17419bb36680f3ec8fbfb80955a91
Parents: 2452bd6
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 13 13:21:57 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 13 13:21:57 2015 +0100
----------------------------------------------------------------------
.../apache/jena/assembler/test/TestAssemblerGroup.java | 12 +++++++-----
.../apache/jena/assembler/test/TestAssemblerHelp.java | 12 ++++++++----
2 files changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/80ba36d9/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java
index f0df74c..79d04b0 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java
@@ -70,18 +70,20 @@ public class TestAssemblerGroup extends AssemblerTestBase
public static boolean loaded = false;
- public static class Trivial
- {
- static {
- loaded = true;
- }
+ public static class Trivial {
+ // Use the hook static method - copes with classes already loaded.
+ public static void whenRequiredByAssembler(AssemblerGroup ag) {
+ loaded = true;
}
+ }
public void testLoadsClasses()
{
AssemblerGroup a = AssemblerGroup.create();
a.implementWith( resource( "T" ), new MockAssembler() );
Resource root = resourceInModel( "x rdf:type T; _c ja:loadClass '" + TestAssemblerGroup.class.getName() + "$Trivial'" );
+ // In case already loaded.
+ loaded = false;
assertFalse( "something has pre-loaded Trivial, so we can't test if it gets loaded", loaded );
assertEquals( "mockmockmock", a.open( root ) );
assertTrue( "the assembler group did not obey the ja:loadClass directive", loaded );
http://git-wip-us.apache.org/repos/asf/jena/blob/80ba36d9/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java
index bcdc473..9daa763 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java
@@ -164,17 +164,19 @@ public class TestAssemblerHelp extends AssemblerTestBase
public static boolean impIsLoaded = false;
public static boolean impIsConstructed = false;
- public static class Imp extends AssemblerBase
- {
- static { impIsLoaded = true; }
-
+ public static class Imp extends AssemblerBase {
public Imp()
{ impIsConstructed = true; }
@Override
public Object open( Assembler a, Resource root, Mode irrelevant )
{ return null; }
+
+ // Set when assmbler hook called - in case already java-loaded
+ public static void whenRequiredByAssembler(AssemblerGroup ag) {
+ impIsLoaded = true;
}
+ }
static Model gremlinModel = modelWithStatements( "eh:Wossname ja:assembler 'org.apache.jena.assembler.test.TestAssemblerHelp$Gremlin'" );
@@ -201,6 +203,8 @@ public class TestAssemblerHelp extends AssemblerTestBase
{
String className = "org.apache.jena.assembler.test.TestAssemblerHelp$Imp";
AssemblerGroup group = AssemblerGroup.create();
+ // In case already loaded.
+ impIsLoaded = false ;
Model m = model( "eh:Wossname ja:assembler '" + className + "'" );
assertEquals( false, impIsLoaded );
AssemblerHelp.loadAssemblerClasses( group, m );