You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jena.apache.org by Claude Warren <cl...@xenei.com> on 2015/01/20 11:18:26 UTC
Re: jena git commit: JENA-854 : Temporary kludge to git
inconsistencey problem.
Andy,
Did I not check in the StaticSecurityEvaluator this AM? I thought I did it
before I left for work.
Claude
On Tue, Jan 20, 2015 at 10:06 AM, <an...@apache.org> wrote:
> Repository: jena
> Updated Branches:
> refs/heads/master 43382fa07 -> 8b4624a09
>
>
> JENA-854 : Temporary kludge to git inconsistencey problem.
>
> Project: http://git-wip-us.apache.org/repos/asf/jena/repo
> Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8b4624a0
> Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8b4624a0
> Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8b4624a0
>
> Branch: refs/heads/master
> Commit: 8b4624a09312d59c98a14e1ab6157a2eccbc307e
> Parents: 43382fa
> Author: Andy Seaborne <an...@apache.org>
> Authored: Tue Jan 20 10:06:11 2015 +0000
> Committer: Andy Seaborne <an...@apache.org>
> Committed: Tue Jan 20 10:06:11 2015 +0000
>
> ----------------------------------------------------------------------
> .../jena/security/SecuredAssemblerTest.java | 104 ++++++++++---------
> 1 file changed, 53 insertions(+), 51 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/jena/blob/8b4624a0/jena-security/src/test/java/org/apache/jena/security/SecuredAssemblerTest.java
> ----------------------------------------------------------------------
> diff --git
> a/jena-security/src/test/java/org/apache/jena/security/SecuredAssemblerTest.java
> b/jena-security/src/test/java/org/apache/jena/security/SecuredAssemblerTest.java
> index 7d6f8c2..cf7ddfa 100644
> ---
> a/jena-security/src/test/java/org/apache/jena/security/SecuredAssemblerTest.java
> +++
> b/jena-security/src/test/java/org/apache/jena/security/SecuredAssemblerTest.java
> @@ -32,55 +32,57 @@ import org.junit.Test;
>
> public class SecuredAssemblerTest
> {
> - private Assembler assembler;
> - private Model model;
> -
> - public SecuredAssemblerTest()
> - {
> - assembler = Assembler.general;
> - }
> -
> - @Before
> - public void setUp() throws Exception {
> - model = ModelFactory.createDefaultModel();
> - URL url =
> SecuredAssemblerTest.class.getClassLoader().getResource(
> SecuredAssemblerTest.class.getName().replace(".", "/")+".ttl");
> - model.read( url.toURI().toString(), "TURTLE" );
> - //model.write( System.out, "TURTLE" );
> - }
> -
> - @Test
> - public void testCreation() throws Exception {
> -
> - Resource r = model.createResource( "
> http://apache.org/jena/security/test#secModel");
> - Object o = assembler.open( r );
> - Assert.assertTrue( o instanceof Model);
> - Assert.assertTrue( o instanceof SecuredModel );
> - }
> -
> - @Test
> - public void testCreationWithArgs() throws Exception {
> -
> - Resource r = model.createResource( "
> http://apache.org/jena/security/test#secModel2");
> - Object o = assembler.open( r );
> - Assert.assertTrue( o instanceof Model);
> - Assert.assertTrue( o instanceof SecuredModel );
> - }
> -
> - @Test
> - public void testSecurityEvaluatorWithStringArgs() throws Exception
> {
> -
> - Resource r = model.createResource( "
> http://apache.org/jena/security/test#secEvaluator");
> - Object o = assembler.open( r );
> - Assert.assertTrue( o instanceof SecurityEvaluator );
> - Assert.assertTrue( o instanceof StaticSecurityEvaluator );
> - }
> -
> - @Test
> - public void testSecurityEvaluatorWithModelArgs() throws Exception {
> -
> - Resource r = model.createResource( "
> http://apache.org/jena/security/test#secEvaluator2");
> - Object o = assembler.open( r );
> - Assert.assertTrue( o instanceof SecurityEvaluator );
> - Assert.assertTrue( o instanceof
> ModelBasedSecurityEvaluator );
> - }
> + // 2015-01-20 : Does not compile (missing StaticSecurityEvaluator)
> +
> +// private Assembler assembler;
> +// private Model model;
> +//
> +// public SecuredAssemblerTest()
> +// {
> +// assembler = Assembler.general;
> +// }
> +//
> +// @Before
> +// public void setUp() throws Exception {
> +// model = ModelFactory.createDefaultModel();
> +// URL url =
> SecuredAssemblerTest.class.getClassLoader().getResource(
> SecuredAssemblerTest.class.getName().replace(".", "/")+".ttl");
> +// model.read( url.toURI().toString(), "TURTLE" );
> +// //model.write( System.out, "TURTLE" );
> +// }
> +//
> +// @Test
> +// public void testCreation() throws Exception {
> +//
> +// Resource r = model.createResource( "
> http://apache.org/jena/security/test#secModel");
> +// Object o = assembler.open( r );
> +// Assert.assertTrue( o instanceof Model);
> +// Assert.assertTrue( o instanceof SecuredModel );
> +// }
> +//
> +// @Test
> +// public void testCreationWithArgs() throws Exception {
> +//
> +// Resource r = model.createResource( "
> http://apache.org/jena/security/test#secModel2");
> +// Object o = assembler.open( r );
> +// Assert.assertTrue( o instanceof Model);
> +// Assert.assertTrue( o instanceof SecuredModel );
> +// }
> +//
> +// @Test
> +// public void testSecurityEvaluatorWithStringArgs() throws Exception
> {
> +//
> +// Resource r = model.createResource( "
> http://apache.org/jena/security/test#secEvaluator");
> +// Object o = assembler.open( r );
> +// Assert.assertTrue( o instanceof SecurityEvaluator );
> +// Assert.assertTrue( o instanceof StaticSecurityEvaluator );
> +// }
> +//
> +// @Test
> +// public void testSecurityEvaluatorWithModelArgs() throws Exception {
> +//
> +// Resource r = model.createResource( "
> http://apache.org/jena/security/test#secEvaluator2");
> +// Object o = assembler.open( r );
> +// Assert.assertTrue( o instanceof SecurityEvaluator );
> +// Assert.assertTrue( o instanceof
> ModelBasedSecurityEvaluator );
> +// }
> }
>
>
--
I like: Like Like - The likeliest place on the web
<http://like-like.xenei.com>
LinkedIn: http://www.linkedin.com/in/claudewarren
Re: jena git commit: JENA-854 : Temporary kludge to git inconsistencey
problem.
Posted by Andy Seaborne <an...@apache.org>.
On 20/01/15 10:18, Claude Warren wrote:
> Andy,
>
> Did I not check in the StaticSecurityEvaluator this AM? I thought I did it
> before I left for work.
The git diff disagrees with you. The machine wins!
I've had to comment out the tests and push that because this blocks
everything including the snapshots being built and I was trying to fix
the windows build problem so I'm not just working locally ATM.
It looks to me like a problem in the tests themselves. As per the other
message:
Andy
> On 20/01/15 07:20, claude@apache.org wrote:
>> Repository: jena
>> Updated Branches:
>> refs/heads/master 0361959fa -> 7e8d5f00c
>>
>>
>> Added StaticSecurityEvaluator for testing as part of JENA-854
>
> This only adds ModelBasedSecurityEvaluator, not StaticSecurityEvaluator, so the code does not compile.
>
> Removing that one test that references StaticSecurityEvaluator, then causes other problems running SecuredAssemblerTest because it fails in testCreationWithArgs().
>
> Andy
Andy