You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-dev@jackrabbit.apache.org by Michael Dürig <md...@apache.org> on 2014/03/17 10:39:10 UTC
Re: svn commit: r1578129 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
Hi,
I reverted these changes at http://svn.apache.org/r1578277 since they
caused tests to fail [1]. We probably need to adapt the expectations of
those tests first before we change the overall test setup, if at all.
Michael
[1] http://markmail.org/message/btqcvpcwiljk3mob
On 16.3.14 7:03 , tripod@apache.org wrote:
> Author: tripod
> Date: Sun Mar 16 18:03:13 2014
> New Revision: 1578129
>
> URL: http://svn.apache.org/r1578129
> Log:
> @trivial add missing conflict providers
>
> Modified:
> jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
>
> Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java?rev=1578129&r1=1578128&r2=1578129&view=diff
> ==============================================================================
> --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java (original)
> +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java Sun Mar 16 18:03:13 2014
> @@ -40,6 +40,8 @@ import org.apache.jackrabbit.oak.api.Con
> import org.apache.jackrabbit.oak.api.ContentSession;
> import org.apache.jackrabbit.oak.api.Root;
> import org.apache.jackrabbit.oak.namepath.NamePathMapper;
> +import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider;
> +import org.apache.jackrabbit.oak.plugins.commit.JcrConflictHandler;
> import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
> import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
> import org.apache.jackrabbit.oak.plugins.index.reference.ReferenceEditorProvider;
> @@ -81,12 +83,14 @@ public abstract class AbstractSecurityTe
> public void before() throws Exception {
> Oak oak = new Oak()
> .with(new InitialContent())
> + .with(JcrConflictHandler.JCR_CONFLICT_HANDLER)
> .with(new NamespaceEditorProvider())
> .with(new ReferenceEditorProvider())
> .with(new ReferenceIndexProvider())
> .with(new PropertyIndexEditorProvider())
> .with(new PropertyIndexProvider())
> .with(new TypeEditorProvider())
> + .with(new ConflictValidatorProvider())
> .with(getSecurityProvider());
> withEditors(oak);
> contentRepository = oak.createContentRepository();
>
>
Re: svn commit: r1578129 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
Posted by Tobias Bocanegra <tr...@apache.org>.
ok, fair enough. but driving the test as close to a productive system
is important. we can't just disable some of validators in order to
make the tests pass...
regards, toby
On Mon, Mar 17, 2014 at 2:39 AM, Michael Dürig <md...@apache.org> wrote:
>
> Hi,
>
> I reverted these changes at http://svn.apache.org/r1578277 since they caused
> tests to fail [1]. We probably need to adapt the expectations of those tests
> first before we change the overall test setup, if at all.
>
> Michael
>
> [1] http://markmail.org/message/btqcvpcwiljk3mob
>
>
> On 16.3.14 7:03 , tripod@apache.org wrote:
>>
>> Author: tripod
>> Date: Sun Mar 16 18:03:13 2014
>> New Revision: 1578129
>>
>> URL: http://svn.apache.org/r1578129
>> Log:
>> @trivial add missing conflict providers
>>
>> Modified:
>>
>> jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
>>
>> Modified:
>> jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
>> URL:
>> http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java?rev=1578129&r1=1578128&r2=1578129&view=diff
>>
>> ==============================================================================
>> ---
>> jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
>> (original)
>> +++
>> jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
>> Sun Mar 16 18:03:13 2014
>> @@ -40,6 +40,8 @@ import org.apache.jackrabbit.oak.api.Con
>> import org.apache.jackrabbit.oak.api.ContentSession;
>> import org.apache.jackrabbit.oak.api.Root;
>> import org.apache.jackrabbit.oak.namepath.NamePathMapper;
>> +import
>> org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider;
>> +import org.apache.jackrabbit.oak.plugins.commit.JcrConflictHandler;
>> import
>> org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
>> import
>> org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
>> import
>> org.apache.jackrabbit.oak.plugins.index.reference.ReferenceEditorProvider;
>> @@ -81,12 +83,14 @@ public abstract class AbstractSecurityTe
>> public void before() throws Exception {
>> Oak oak = new Oak()
>> .with(new InitialContent())
>> + .with(JcrConflictHandler.JCR_CONFLICT_HANDLER)
>> .with(new NamespaceEditorProvider())
>> .with(new ReferenceEditorProvider())
>> .with(new ReferenceIndexProvider())
>> .with(new PropertyIndexEditorProvider())
>> .with(new PropertyIndexProvider())
>> .with(new TypeEditorProvider())
>> + .with(new ConflictValidatorProvider())
>> .with(getSecurityProvider());
>> withEditors(oak);
>> contentRepository = oak.createContentRepository();
>>
>>
>