jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1384406 - in /jackrabbit/oak/trunk/oak-jcr: pom.xml src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Date Thu, 13 Sep 2012 17:09:05 GMT
Author: mduerig
Date: Thu Sep 13 17:09:05 2012
New Revision: 1384406

URL: http://svn.apache.org/viewvc?rev=1384406&view=rev
Log:
OAK-6: Setup integration tests and TCK tests
tweak to stop tests throwing NotExecutableException due to mixin not supported on testnode/node1
update test exclusions

Modified:
    jackrabbit/oak/trunk/oak-jcr/pom.xml
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java

Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1384406&r1=1384405&r2=1384406&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Thu Sep 13 17:09:05 2012
@@ -38,6 +38,7 @@ org.apache.jackrabbit.test.api.SessionTe
 org.apache.jackrabbit.test.api.SessionTest#testMoveConstraintViolationExceptionDest<!--OAK-132-->
 org.apache.jackrabbit.test.api.SessionTest#testSaveConstraintViolationException<!--OAK-66-->
 org.apache.jackrabbit.test.api.SessionTest#testHasCapability
+org.apache.jackrabbit.test.api.SessionTest#testMoveLockException
 org.apache.jackrabbit.test.api.SessionUUIDTest#testSaveReferentialIntegrityException<!--OAK-66-->
 org.apache.jackrabbit.test.api.SessionUUIDTest#testSaveMovedRefNode<!--OAK-66-->
 org.apache.jackrabbit.test.api.NodeTest#testSaveConstraintViolationException<!--OAK-66-->
@@ -46,11 +47,22 @@ org.apache.jackrabbit.test.api.NodeTest#
 org.apache.jackrabbit.test.api.NodeTest#testRefreshInvalidItemStateException<!--OAK-141-->
 org.apache.jackrabbit.test.api.NodeTest#testPrimaryTypeProtected<!--OAK-66-->
 org.apache.jackrabbit.test.api.NodeTest#testMixinTypesProtected<!--OAK-66-->
+org.apache.jackrabbit.test.api.NodeTest#testRemoveNodeLockedItself
+org.apache.jackrabbit.test.api.NodeTest#testRemoveNodeParentLocked
 org.apache.jackrabbit.test.api.NodeUUIDTest#testSaveReferentialIntegrityException<!--OAK-66-->
 org.apache.jackrabbit.test.api.NodeUUIDTest#testSaveMovedRefNode<!--OAK-66-->
 org.apache.jackrabbit.test.api.NodeOrderableChildNodesTest#testOrderBeforeUnsupportedRepositoryOperationException<!--OAK-169-->
 org.apache.jackrabbit.test.api.NodeOrderableChildNodesTest#testOrderBeforePlaceAtEndParentSave<!--OAK-169-->
 org.apache.jackrabbit.test.api.NodeOrderableChildNodesTest#testOrderBeforePlaceAtEndSessionSave<!--OAK-169-->
+org.apache.jackrabbit.test.api.SetValueValueFormatExceptionTest#testNodeNotReferenceable
+org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testLocked
+org.apache.jackrabbit.test.api.WorkspaceCopyReferenceableTest#testCopyNodesNewUUID
+org.apache.jackrabbit.test.api.WorkspaceCopyVersionableTest#testCopyNodesVersionableAndCheckedIn
+org.apache.jackrabbit.test.api.WorkspaceMoveReferenceableTest#testMoveNodesReferenceableNodesNewUUID
+org.apache.jackrabbit.test.api.WorkspaceMoveVersionableTest#testMoveNodesVersionableAndCheckedIn
+org.apache.jackrabbit.test.api.SessionRemoveItemTest#testRemoveLockedNode
+org.apache.jackrabbit.test.api.SessionRemoveItemTest#testRemoveLockedChildItem
+org.apache.jackrabbit.test.api.SessionRemoveItemTest#testRemoveCheckedInItem
 org.apache.jackrabbit.test.api.nodetype.CanSetPropertyDoubleTest#testConversions        
 <!-- OAK-66 -->
 org.apache.jackrabbit.test.api.nodetype.CanSetPropertyDoubleTest#testConversionsMultiple
 <!-- OAK-66 -->
 org.apache.jackrabbit.test.api.nodetype.CanSetPropertyLongTest#testConversions          
 <!-- OAK-66 -->
@@ -73,12 +85,17 @@ org.apache.jackrabbit.test.api.SetProper
 org.apache.jackrabbit.test.api.SetPropertyAssumeTypeTest#testValuesConstraintViolationExceptionBecauseOfInvalidTypeParameter
 org.apache.jackrabbit.test.api.SetPropertyAssumeTypeTest#testStringConstraintViolationExceptionBecauseOfInvalidTypeParameter
 org.apache.jackrabbit.test.api.NodeAddMixinTest#testAddInheritedMixin
+org.apache.jackrabbit.test.api.NodeAddMixinTest#testLocked
+org.apache.jackrabbit.test.api.NodeCanAddMixinTest#testLocked
+org.apache.jackrabbit.test.api.NodeRemoveMixinTest#testLocked
 org.apache.jackrabbit.test.api.ValueFactoryTest#testValueFormatException<!--OAK-204-->
 org.apache.jackrabbit.test.api.WorkspaceCopySameNameSibsTest
 org.apache.jackrabbit.test.api.WorkspaceCopyTest#testCopyNodesConstraintViolationException
 org.apache.jackrabbit.test.api.WorkspaceCopyTest#testCopyNodesAccessDenied
+org.apache.jackrabbit.test.api.WorkspaceCopyTest#testCopyNodesLocked
 org.apache.jackrabbit.test.api.WorkspaceMoveSameNameSibsTest
 org.apache.jackrabbit.test.api.WorkspaceMoveTest#testMoveNodesConstraintViolationException
+org.apache.jackrabbit.test.api.WorkspaceMoveTest#testMoveNodesLocked
 org.apache.jackrabbit.test.api.WorkspaceMoveTest#testMoveNodesAccessDenied
 org.apache.jackrabbit.test.api.ImpersonateTest
 org.apache.jackrabbit.test.api.CheckPermissionTest
@@ -87,6 +104,118 @@ org.apache.jackrabbit.test.api.Serializa
 org.apache.jackrabbit.test.api.HasPermissionTest
 org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddInvalidLockToken
 org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockNonLockable
+org.apache.jackrabbit.test.api.lock.LockTest#testGetNode
+org.apache.jackrabbit.test.api.lock.LockTest#testAddRemoveLockToken
+org.apache.jackrabbit.test.api.lock.LockTest#testNodeLocked
+org.apache.jackrabbit.test.api.lock.LockTest#testGetLockOwnerProperty
+org.apache.jackrabbit.test.api.lock.LockTest#testGetLockOwner
+org.apache.jackrabbit.test.api.lock.LockTest#testShallowLock
+org.apache.jackrabbit.test.api.lock.LockTest#testParentChildLock
+org.apache.jackrabbit.test.api.lock.LockTest#testParentChildDeepLock
+org.apache.jackrabbit.test.api.lock.LockTest#testIsDeep
+org.apache.jackrabbit.test.api.lock.LockTest#testIsSessionScoped
+org.apache.jackrabbit.test.api.lock.LockTest#testLogout
+org.apache.jackrabbit.test.api.lock.LockTest#testLockTransfer
+org.apache.jackrabbit.test.api.lock.LockTest#testOpenScopedLocks
+org.apache.jackrabbit.test.api.lock.LockTest#testRefresh
+org.apache.jackrabbit.test.api.lock.LockTest#testRefreshNotLive
+org.apache.jackrabbit.test.api.lock.LockTest#testGetLock
+org.apache.jackrabbit.test.api.lock.LockTest#testMoveLocked
+org.apache.jackrabbit.test.api.lock.SetValueLockExceptionTest#testSetValueLockException
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testParentChildDeepLock
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetNodeOnLockObtainedFromChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetNodeOnLockObtainedFromNewChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testDeepLockAboveLockedChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testShallowLockAboveLockedChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testRemoveLockedChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLive
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsDeep
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsSessionScoped
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testRefresh
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testRefreshNotLive
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testLockHoldingNode
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testNodeIsLocked
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testNodeHoldsLocked
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testLockVisibility
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLockOwningSession
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetSecondsRemaining
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetSecondsRemainingAfterUnlock
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testLockExpiration
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testOwnerHint
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testUnlock
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testUnlockByOtherSession
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLockedChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLockedNewChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testHoldsLockChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testHoldsLockNewChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetLockOnChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetLockOnNewChild
+org.apache.jackrabbit.test.api.lock.DeepLockTest#testRemoveMixLockableFromLockedNode
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockWithPendingChanges
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testNullOwnerHint
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testGetLockTokens
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testGetLockTokensAfterUnlock
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testGetLockTokensSessionScoped
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddLockToken
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddLockTokenToAnotherSession
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken2
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken3
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockTokenTwice
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddLockTokenAgain
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer2
+org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer3
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetLockToken
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLive
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsDeep
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsSessionScoped
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testRefresh
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testRefreshNotLive
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testLockHoldingNode
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testNodeIsLocked
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testNodeHoldsLocked
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testLockVisibility
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLockOwningSession
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetSecondsRemaining
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetSecondsRemainingAfterUnlock
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testLockExpiration
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testOwnerHint
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testUnlock
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testUnlockByOtherSession
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLockedChild
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLockedNewChild
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testHoldsLockChild
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testHoldsLockNewChild
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetLockOnChild
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetLockOnNewChild
+org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testRemoveMixLockableFromLockedNode
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetLockToken
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testImplicitUnlock
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testImplicitUnlock2
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLive
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsDeep
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsSessionScoped
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testRefresh
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testRefreshNotLive
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testLockHoldingNode
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testNodeIsLocked
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testNodeHoldsLocked
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testLockVisibility
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLockOwningSession
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetSecondsRemaining
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetSecondsRemainingAfterUnlock
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testLockExpiration
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testOwnerHint
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testUnlock
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testUnlockByOtherSession
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLockedChild
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLockedNewChild
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testHoldsLockChild
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testHoldsLockNewChild
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetLockOnChild
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetLockOnNewChild
+org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testRemoveMixLockableFromLockedNode
 org.apache.jackrabbit.test.api.nodetype.PropertyDefTest#testIsMandatory
 org.apache.jackrabbit.test.api.LifecycleTest
 org.apache.jackrabbit.test.api.query.ElementTest#testElementTestNameTestSomeNTWithSNS<!--
OAK-203 -->
@@ -94,8 +223,25 @@ org.apache.jackrabbit.test.api.query.Get
 org.apache.jackrabbit.test.api.query.SaveTest#testConstraintViolationException
 org.apache.jackrabbit.test.api.query.SaveTest#testItemExistsException<!-- OAK-203 -->
 org.apache.jackrabbit.test.api.query.SimpleSelectionTest#testSingleProperty
+org.apache.jackrabbit.test.api.query.SaveTest#testLockException
+org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoin
+org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinNtBase
+org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinFilterPrimaryType
+org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinSNS
 org.apache.jackrabbit.test.api.query.qom.ColumnTest#testExpandColumnsForNodeType
 org.apache.jackrabbit.test.api.query.qom.SelectorTest#testUnknownNodeType
+org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testInnerJoin
+org.apache.jackrabbit.test.api.query.qom.NodeNameTest#testReferenceLiteral
+org.apache.jackrabbit.test.api.query.qom.NodeNameTest#testWeakReferenceLiteral
+org.apache.jackrabbit.test.api.query.qom.ChildNodeJoinConditionTest#testRightOuterJoin
+org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testRightOuterJoin
+org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testLeftOuterJoin
+org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testInnerJoin
+org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testRightOuterJoin
+org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testLeftOuterJoin
+org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testInnerJoinWithPath
+org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testLeftOuterJoinWithPath
+org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testRightOuterJoinWithPath
 org.apache.jackrabbit.test.api.observation.EventTest#testGetUserId
 org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveNode
 org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveTree
@@ -114,6 +260,9 @@ org.apache.jackrabbit.test.api.observati
 org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testPropertyRemoved
 org.apache.jackrabbit.test.api.observation.GetUserDataTest#testSave
 org.apache.jackrabbit.test.api.observation.GetUserDataTest#testWorkspaceOperation
+org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testUUID
+org.apache.jackrabbit.test.api.observation.LockingTest#testAddLockToNode
+org.apache.jackrabbit.test.api.observation.LockingTest#testRemoveLockFromNode
     </known.issues>
   </properties>
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1384406&r1=1384405&r2=1384406&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Thu Sep 13 17:09:05 2012
@@ -72,6 +72,7 @@ import org.apache.jackrabbit.oak.commons
 import org.apache.jackrabbit.oak.core.DefaultConflictHandler;
 import org.apache.jackrabbit.oak.jcr.value.ValueConverter;
 import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
+import org.apache.jackrabbit.oak.plugins.type.NodeTypeConstants;
 import org.apache.jackrabbit.oak.util.TODO;
 import org.apache.jackrabbit.value.ValueHelper;
 import org.slf4j.Logger;
@@ -1382,11 +1383,13 @@ public class NodeImpl extends ItemImpl<N
     }
 
     // TODO: hack to filter for a subset of supported mixins for now
-    // this allows exactly one (harmless) mixin type so that other code like
-    // addMixin gets test coverage
+    // this allows only harmless mixin types so that other code like addMixin gets test coverage
     private boolean isSupportedMixinName(String mixinName) throws RepositoryException {
         String oakName = sessionDelegate.getOakPathOrThrow(mixinName);
-        return "mix:title".equals(oakName);
+        return "mix:title".equals(oakName) ||
+            NodeTypeConstants.MIX_REFERENCEABLE.equals(oakName) ||
+            NodeTypeConstants.MIX_VERSIONABLE.equals(oakName) ||
+            NodeTypeConstants.MIX_LOCKABLE.equals(oakName);
     }
 
     private void checkValidWorkspace(String workspaceName) throws RepositoryException {



Mime
View raw message