Ard Schrijvers pushed to branch master at cms / hippo-repository
Commits: 5c8deb68 by Ard Schrijvers at 2016-02-15T20:29:29+01:00 REPO-1 remove deprecated hardhandle usage in unit test fixtures - - - - - d78161d1 by Ard Schrijvers at 2016-02-15T20:36:42+01:00 Reintegrate bugfix/REPO-1 - - - - - 18 changed files: - config/src/test/java/org/hippoecm/repository/LocalizedTest.java - deprecated/facetsearch/src/test/java/org/hippoecm/faceteddate/DerivedDateTest.java - deprecated/facetsearch/src/test/java/org/hippoecm/repository/FacetedSearchFreeTextTest.java - deprecated/facetselectmirror/src/test/java/org/hippoecm/repository/FacetSelectTest.java - deprecated/facetselectmirror/src/test/java/org/hippoecm/repository/FacetedSelectVersioningTest.java - engine/src/test/java/org/hippoecm/repository/NodeIndexerTest.java - test/src/test/java/org/hippoecm/repository/FacetedAuthorizationTest.java - test/src/test/java/org/hippoecm/repository/FacetedNavigationNamespaceTest.java - test/src/test/java/org/hippoecm/repository/HREPTWO1493Test.java - test/src/test/java/org/hippoecm/repository/decorating/MirrorCombiFacetSelectTest.java - test/src/test/java/org/hippoecm/repository/decorating/MirrorTest.java - test/src/test/java/org/hippoecm/repository/facetnavigation/AbstractDateFacetNavigationTest.java - test/src/test/java/org/hippoecm/repository/facetnavigation/AbstractRangesFacetNavigationTest.java - test/src/test/java/org/hippoecm/repository/facetnavigation/FacetedNavigationConcurrencyTest.java - test/src/test/java/org/hippoecm/repository/facetnavigation/FreeTextSearchTest.java - test/src/test/java/org/hippoecm/repository/test/MirrorPerfTestCase.java - workflow/src/test/java/org/hippoecm/faceteddate/DerivedDateTest.java - workflow/src/test/java/org/hippoecm/repository/translation/TranslationWorkflowTest.java Changes: ===================================== config/src/test/java/org/hippoecm/repository/LocalizedTest.java ===================================== --- a/config/src/test/java/org/hippoecm/repository/LocalizedTest.java +++ b/config/src/test/java/org/hippoecm/repository/LocalizedTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2011-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,6 @@ public class LocalizedTest extends RepositoryTestCase { "hippo:language", "nl", "hippo:message", "aap", "/test/folder/document", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "jcr:mixinTypes", "hippo:translated", "/test/folder/document/hippo:translation", "hippo:translation", "hippo:language", "en", ===================================== deprecated/facetsearch/src/test/java/org/hippoecm/faceteddate/DerivedDateTest.java ===================================== --- a/deprecated/facetsearch/src/test/java/org/hippoecm/faceteddate/DerivedDateTest.java +++ b/deprecated/facetsearch/src/test/java/org/hippoecm/faceteddate/DerivedDateTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -100,7 +100,7 @@ public class DerivedDateTest extends RepositoryTestCase { docs.addMixin("mix:referenceable"); Node handle = docs.addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node doc = handle.addNode("doc", "hippo:datedocument1"); doc.addMixin("mix:versionable"); doc = doc.addNode("hippo:d"); @@ -122,7 +122,7 @@ public class DerivedDateTest extends RepositoryTestCase { public void testSearchMultiLevel() throws Exception { root.addNode("docs","nt:unstructured").addMixin("mix:referenceable"); Node handle = root.getNode("docs").addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node doc = handle.addNode("doc", "hippo:datedocument1"); doc.addMixin("mix:versionable"); doc = doc.addNode("hippo:d"); @@ -158,7 +158,6 @@ public class DerivedDateTest extends RepositoryTestCase { child3.addMixin("mix:versionable"); for (int i4 = 0; i4 < level4; i4++) { Node handle = child3.addNode("document" + i4, "hippo:handle"); - handle.addMixin("hippo:hardhandle"); Node document = handle.addNode("document" + i4, "hippo:datedocument1"); document.addMixin("mix:versionable"); Node date = document.addNode("hippo:d"); ===================================== deprecated/facetsearch/src/test/java/org/hippoecm/repository/FacetedSearchFreeTextTest.java ===================================== --- a/deprecated/facetsearch/src/test/java/org/hippoecm/repository/FacetedSearchFreeTextTest.java +++ b/deprecated/facetsearch/src/test/java/org/hippoecm/repository/FacetedSearchFreeTextTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2010-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,14 +36,12 @@ public class FacetedSearchFreeTextTest extends RepositoryTestCase { "/test/docs", "nt:unstructured", "jcr:mixinTypes", "mix:referenceable", "/test/docs/a", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/docs/a/a", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "x", "a", "y", "z", "text", "aap", "/test/docs/b", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/docs/b/b", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "x", "b", ===================================== deprecated/facetselectmirror/src/test/java/org/hippoecm/repository/FacetSelectTest.java ===================================== --- a/deprecated/facetselectmirror/src/test/java/org/hippoecm/repository/FacetSelectTest.java +++ b/deprecated/facetselectmirror/src/test/java/org/hippoecm/repository/FacetSelectTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,6 @@ public class FacetSelectTest extends RepositoryTestCase { "/test/docs", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "/test/docs/doc", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/docs/doc/doc", "hippo:document", "jcr:mixinTypes", "mix:versionable", "/test/mirror", "hippo:facetselect", @@ -72,25 +71,21 @@ public class FacetSelectTest extends RepositoryTestCase { "/test/docs", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "/test/docs/one", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/docs/one/one", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "vehicle", "car", "color", "red", "/test/docs/two", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/docs/two/two", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "vehicle", "car", "color", "blue", "/test/docs/three", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/docs/three/three", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "vehicle", "bike", "color", "red", "/test/docs/four", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/docs/four/four", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "vehicle", "bike", @@ -142,7 +137,6 @@ public class FacetSelectTest extends RepositoryTestCase { "/test/docs", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "/test/docs/doc", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "jcr:mixinTypes", "hippo:translated", "/test/docs/doc/hippo:translation", "hippo:translation", "hippo:language", "", @@ -231,7 +225,6 @@ public class FacetSelectTest extends RepositoryTestCase { "/test/docs", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "/test/docs/doc", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "jcr:mixinTypes", "hippo:translated", "/test/docs/doc/hippo:translation", "hippo:translation", "hippo:language", "", @@ -554,7 +547,6 @@ public class FacetSelectTest extends RepositoryTestCase { "/test/docs", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "/test/docs/doc", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/docs/doc/doc", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "/test/test4", "hippo:facetselect", ===================================== deprecated/facetselectmirror/src/test/java/org/hippoecm/repository/FacetedSelectVersioningTest.java ===================================== --- a/deprecated/facetselectmirror/src/test/java/org/hippoecm/repository/FacetedSelectVersioningTest.java +++ b/deprecated/facetselectmirror/src/test/java/org/hippoecm/repository/FacetedSelectVersioningTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ public class FacetedSelectVersioningTest extends RepositoryTestCase { String[] content1 = new String[] { "/test", "nt:unstructured", "/test/doc", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/doc/doc", "hippo:realdocument", "jcr:mixinTypes", "mix:versionable" }; ===================================== engine/src/test/java/org/hippoecm/repository/NodeIndexerTest.java ===================================== --- a/engine/src/test/java/org/hippoecm/repository/NodeIndexerTest.java +++ b/engine/src/test/java/org/hippoecm/repository/NodeIndexerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2013-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,6 @@ public class NodeIndexerTest extends RepositoryTestCase { static String[] content = { "/test", "nt:unstructured", "/test/doc", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/doc/doc", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable" }; ===================================== test/src/test/java/org/hippoecm/repository/FacetedAuthorizationTest.java ===================================== --- a/test/src/test/java/org/hippoecm/repository/FacetedAuthorizationTest.java +++ b/test/src/test/java/org/hippoecm/repository/FacetedAuthorizationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -322,7 +322,7 @@ public class FacetedAuthorizationTest extends RepositoryTestCase { public void testDocumentsAreOrderedBelowHandle() throws RepositoryException { Node testRoot = session.getRootNode().getNode(TEST_DATA_NODE); final Node handle = testRoot.addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node doc = handle.addNode("doc", "hippo:authtestdocument"); doc = handle.addNode("doc", "hippo:authtestdocument"); @@ -343,7 +343,7 @@ public class FacetedAuthorizationTest extends RepositoryTestCase { public void testDocumentsAreOrderedBelowHandleWithOtherNodesPresent() throws RepositoryException { Node testRoot = session.getRootNode().getNode(TEST_DATA_NODE); final Node handle = testRoot.addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + handle.addMixin("hippo:translated"); Node doc = handle.addNode("doc", "hippo:authtestdocument"); @@ -370,7 +370,7 @@ public class FacetedAuthorizationTest extends RepositoryTestCase { public void testDocumentsAreOrderedAfterModification() throws RepositoryException { Node testData = session.getRootNode().getNode(TEST_DATA_NODE); final Node handle = testData.addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node doc = handle.addNode("doc", "hippo:authtestdocument"); doc = handle.addNode("doc", "hippo:authtestdocument"); @@ -398,7 +398,7 @@ public class FacetedAuthorizationTest extends RepositoryTestCase { public void testAccessIsNotCached() throws RepositoryException { Node testData = session.getRootNode().getNode(TEST_DATA_NODE); final Node handle = testData.addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node doc = handle.addNode("doc", "hippo:authtestdocument"); doc = handle.addNode("doc", "hippo:authtestdocument"); @@ -424,7 +424,7 @@ public class FacetedAuthorizationTest extends RepositoryTestCase { public void testAccessIsNotCachedWhenHandleChanges() throws RepositoryException { Node testData = session.getRootNode().getNode(TEST_DATA_NODE); final Node handle = testData.addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node doc = handle.addNode("doc", "hippo:authtestdocument"); doc.setProperty("authtest", "canread"); @@ -450,7 +450,7 @@ public class FacetedAuthorizationTest extends RepositoryTestCase { public void testDocumentAccessIsSwitched() throws RepositoryException { Node testData = session.getRootNode().getNode(TEST_DATA_NODE); final Node handle = testData.addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node doc1 = handle.addNode("doc", "hippo:authtestdocument"); Node doc2 = handle.addNode("doc", "hippo:authtestdocument"); @@ -475,7 +475,7 @@ public class FacetedAuthorizationTest extends RepositoryTestCase { public void testAccessChangesBasedWhenPropertyIsUpdated() throws RepositoryException { Node testData = session.getRootNode().getNode(TEST_DATA_NODE); final Node handle = testData.addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node doc1 = handle.addNode("doc", "hippo:authtestdocument"); doc1.setProperty("authtest", "cannotread"); @@ -501,7 +501,7 @@ public class FacetedAuthorizationTest extends RepositoryTestCase { public void testAccessForChildNodeFollowsParent() throws RepositoryException { Node testData = session.getRootNode().getNode(TEST_DATA_NODE); final Node handle = testData.addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node doc = handle.addNode("doc", "hippo:authtestdocument"); doc.addMixin("hippo:container"); ===================================== test/src/test/java/org/hippoecm/repository/FacetedNavigationNamespaceTest.java ===================================== --- a/test/src/test/java/org/hippoecm/repository/FacetedNavigationNamespaceTest.java +++ b/test/src/test/java/org/hippoecm/repository/FacetedNavigationNamespaceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,9 +47,6 @@ public class FacetedNavigationNamespaceTest extends RepositoryTestCase { Node normalNode = docNode.addNode("normal", "hippo:handle"); Node namespaceNode = docNode.addNode("namespace", "hippo:handle"); Node bothNode = docNode.addNode("both", "hippo:handle"); - normalNode.addMixin("hippo:hardhandle"); - namespaceNode.addMixin("hippo:hardhandle"); - bothNode.addMixin("hippo:hardhandle"); Node node; for (int j = 0; j < PROP_COUNT; j++) { ===================================== test/src/test/java/org/hippoecm/repository/HREPTWO1493Test.java ===================================== --- a/test/src/test/java/org/hippoecm/repository/HREPTWO1493Test.java +++ b/test/src/test/java/org/hippoecm/repository/HREPTWO1493Test.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,7 @@ public class HREPTWO1493Test extends RepositoryTestCase { "/test/docs", "nt:unstructured", "jcr:mixinTypes", "mix:referenceable", "/test/docs/doc", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/docs/doc", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/docs/doc/doc", "hippo:testdocument", "jcr:mixinTypes", "mix:versionable", "hippo:x", "test" ===================================== test/src/test/java/org/hippoecm/repository/decorating/MirrorCombiFacetSelectTest.java ===================================== --- a/test/src/test/java/org/hippoecm/repository/decorating/MirrorCombiFacetSelectTest.java +++ b/test/src/test/java/org/hippoecm/repository/decorating/MirrorCombiFacetSelectTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,6 @@ public class MirrorCombiFacetSelectTest extends RepositoryTestCase { "/test/documents/articles/foo", "nt:unstructured", "jcr:mixinTypes", "mix:referenceable", "/test/documents/articles/foo/brave-new-world", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/documents/articles/foo/brave-new-world/brave-new-world", "hippo:testdocument", "language","english", "state","published", ===================================== test/src/test/java/org/hippoecm/repository/decorating/MirrorTest.java ===================================== --- a/test/src/test/java/org/hippoecm/repository/decorating/MirrorTest.java +++ b/test/src/test/java/org/hippoecm/repository/decorating/MirrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,6 @@ public class MirrorTest extends RepositoryTestCase { "lachen", "zucht", "/test/documents/test3/test4/test5", "nt:unstructured", "/test/documents/test5", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/documents/test5/test5", "hippo:document", "jcr:mixinTypes", "mix:versionable", "/test/documents/testmore", "nt:unstructured", ===================================== test/src/test/java/org/hippoecm/repository/facetnavigation/AbstractDateFacetNavigationTest.java ===================================== --- a/test/src/test/java/org/hippoecm/repository/facetnavigation/AbstractDateFacetNavigationTest.java +++ b/test/src/test/java/org/hippoecm/repository/facetnavigation/AbstractDateFacetNavigationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2010-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -102,7 +102,6 @@ public abstract class AbstractDateFacetNavigationTest extends RepositoryTestCase PathNotFoundException, NoSuchNodeTypeException, LockException, VersionException, ConstraintViolationException, RepositoryException { Node carDoc = carDocs.addNode(name, "hippo:handle"); - carDoc.addMixin("hippo:hardhandle"); carDoc = carDoc.addNode(name, "hippo:testcardocument"); carDoc.addMixin("mix:versionable"); carDoc.setProperty("hippo:date", cal); ===================================== test/src/test/java/org/hippoecm/repository/facetnavigation/AbstractRangesFacetNavigationTest.java ===================================== --- a/test/src/test/java/org/hippoecm/repository/facetnavigation/AbstractRangesFacetNavigationTest.java +++ b/test/src/test/java/org/hippoecm/repository/facetnavigation/AbstractRangesFacetNavigationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2010-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -134,7 +134,6 @@ public abstract class AbstractRangesFacetNavigationTest extends RepositoryTestCa throws ItemExistsException, PathNotFoundException, NoSuchNodeTypeException, LockException, VersionException, ConstraintViolationException, RepositoryException { Node carDoc = dateDocs.addNode(name, "hippo:handle"); - carDoc.addMixin("hippo:hardhandle"); carDoc = carDoc.addNode(name, "hippo:testcardocument"); carDoc.addMixin("mix:versionable"); carDoc.setProperty("hippo:date", cal); ===================================== test/src/test/java/org/hippoecm/repository/facetnavigation/FacetedNavigationConcurrencyTest.java ===================================== --- a/test/src/test/java/org/hippoecm/repository/facetnavigation/FacetedNavigationConcurrencyTest.java +++ b/test/src/test/java/org/hippoecm/repository/facetnavigation/FacetedNavigationConcurrencyTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2011-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -281,7 +281,6 @@ public class FacetedNavigationConcurrencyTest extends RepositoryTestCase { // add a car String carName = "car"+System.currentTimeMillis(); Node car = cars.addNode(carName, "hippo:handle"); - car.addMixin("hippo:hardhandle"); car = car.addNode(carName, "hippo:testcardocument"); car.addMixin("mix:versionable"); car.setProperty("hippo:brand", "mercedes"); @@ -318,13 +317,13 @@ public class FacetedNavigationConcurrencyTest extends RepositoryTestCase { * car that has no facets, so should not be visible at all in facet */ Node car = cars.addNode("car0", "hippo:handle"); - car.addMixin("hippo:hardhandle"); + car = car.addNode("car0", "hippo:testcardocument"); car.addMixin("mix:versionable"); // car 1 car = cars.addNode("car1", "hippo:handle"); - car.addMixin("hippo:hardhandle"); + car = car.addNode("car1", "hippo:testcardocument"); car.addMixin("mix:versionable"); car.setProperty("hippo:brand", "mercedes"); @@ -336,7 +335,6 @@ public class FacetedNavigationConcurrencyTest extends RepositoryTestCase { // car 2 car = cars.addNode("car2", "hippo:handle"); - car.addMixin("hippo:hardhandle"); car = car.addNode("car2", "hippo:testcardocument"); car.addMixin("mix:versionable"); car.setProperty("hippo:brand", "volkswagen"); @@ -348,7 +346,6 @@ public class FacetedNavigationConcurrencyTest extends RepositoryTestCase { // car 3 car = cars.addNode("car3", "hippo:handle"); - car.addMixin("hippo:hardhandle"); car = car.addNode("car3", "hippo:testcardocument"); car.addMixin("mix:versionable"); car.setProperty("hippo:brand", "peugeot"); @@ -362,7 +359,6 @@ public class FacetedNavigationConcurrencyTest extends RepositoryTestCase { // car 4 car = cars.addNode("car4", "hippo:handle"); - car.addMixin("hippo:hardhandle"); car = car.addNode("car4", "hippo:testcardocument"); car.addMixin("mix:versionable"); ===================================== test/src/test/java/org/hippoecm/repository/facetnavigation/FreeTextSearchTest.java ===================================== --- a/test/src/test/java/org/hippoecm/repository/facetnavigation/FreeTextSearchTest.java +++ b/test/src/test/java/org/hippoecm/repository/facetnavigation/FreeTextSearchTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2011-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -99,7 +99,6 @@ public class FreeTextSearchTest extends RepositoryTestCase { private void addCarDoc(Node carDocs, String name, Calendar cal, String contents, String brand, String color) throws RepositoryException { Node carDoc = carDocs.addNode(name, "hippo:handle"); - carDoc.addMixin("hippo:hardhandle"); carDoc = carDoc.addNode(name, "hippo:testcardocument"); carDoc.addMixin("mix:versionable"); carDoc.setProperty("hippo:date", cal); ===================================== test/src/test/java/org/hippoecm/repository/test/MirrorPerfTestCase.java ===================================== --- a/test/src/test/java/org/hippoecm/repository/test/MirrorPerfTestCase.java +++ b/test/src/test/java/org/hippoecm/repository/test/MirrorPerfTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2011-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,7 +59,6 @@ public class MirrorPerfTestCase extends RepositoryTestCase { } for(int i=0; i<docsPerNode; i++) { Node child = node.addNode("document"+i, "hippo:handle"); - child.addMixin("hippo:hardhandle"); child = child.addNode("document"+i, "hippo:testdocument"); child.addMixin("mix:versionable"); ++total; @@ -67,7 +66,6 @@ public class MirrorPerfTestCase extends RepositoryTestCase { } else { for(int i=0; i<docsPerLeaf; i++) { Node child = node.addNode("document"+i, "hippo:handle"); - child.addMixin("hippo:hardhandle"); child = child.addNode("document"+i, "hippo:testdocument"); child.addMixin("mix:versionable"); ++total; ===================================== workflow/src/test/java/org/hippoecm/faceteddate/DerivedDateTest.java ===================================== --- a/workflow/src/test/java/org/hippoecm/faceteddate/DerivedDateTest.java +++ b/workflow/src/test/java/org/hippoecm/faceteddate/DerivedDateTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -116,7 +116,7 @@ public class DerivedDateTest extends RepositoryTestCase { @Test public void testFacetedDateCustom() throws Exception { Node handle = session.getNode("/test").addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node node = handle.addNode("doc", "hippo:datedocument2"); node.addMixin("mix:versionable"); node.setProperty("hippo:d1", date); @@ -129,7 +129,7 @@ public class DerivedDateTest extends RepositoryTestCase { @Test public void testFacetedDateOptional() throws Exception { Node handle = session.getNode("/test").addNode("doc", "hippo:handle"); - handle.addMixin("hippo:hardhandle"); + Node node = handle.addNode("doc", "hippo:datedocument2"); node.addMixin("mix:versionable"); node.setProperty("hippo:d1", date); ===================================== workflow/src/test/java/org/hippoecm/repository/translation/TranslationWorkflowTest.java ===================================== --- a/workflow/src/test/java/org/hippoecm/repository/translation/TranslationWorkflowTest.java +++ b/workflow/src/test/java/org/hippoecm/repository/translation/TranslationWorkflowTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2010-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,6 @@ public class TranslationWorkflowTest extends RepositoryTestCase { "/test/folder", "hippostd:folder", "jcr:mixinTypes", "mix:versionable", "/test/folder/document", "hippo:handle", - "jcr:mixinTypes", "hippo:hardhandle", "/test/folder/document/document", "hippo:testdocument", "hippostd:state", "unpublished", "hippostd:holder", "admin", View it on GitLab: https://code.onehippo.org/cms/hippo-repository/compare/b1644a24e0529c4c894a1951093bea9db098bf4e...d78161d116e81e37aeaebf1b9058ba86d54fdac9
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
