From cc647efb5da50344ee96a8e7a79ffd72c28489c4 Mon Sep 17 00:00:00 2001 From: Jukka Zitting Date: Wed, 4 Jul 2012 11:06:58 +0200 Subject: [PATCH] OAK-163: Move the JCR TCK back to the integrationTesting profile Rename JcrTckTest to JcrTckIT so it'll get picked up only in the integrationTesting profile. Add support for an OAK_INTEGRATION_TESTING=always environment setting to enable the integrationTesting profile. --- .../org/apache/jackrabbit/oak/jcr/JcrTckIT.java | 32 ++++++++++++++++++++ .../org/apache/jackrabbit/oak/jcr/JcrTckTest.java | 32 -------------------- oak-parent/pom.xml | 6 ++++ 3 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckIT.java delete mode 100644 oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckTest.java diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckIT.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckIT.java new file mode 100644 index 0000000..70a8a78 --- /dev/null +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckIT.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jackrabbit.oak.jcr; + +import junit.framework.Test; +import junit.framework.TestCase; +import org.apache.jackrabbit.test.JCRTestSuite; + +/** + * Test suite that includes all test suites from jackrabbit-jcr-tests. + */ +public class JcrTckIT extends TestCase { + + public static Test suite() { + return new JCRTestSuite(); + } + +} diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckTest.java deleted file mode 100644 index f0d184a..0000000 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/JcrTckTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.jackrabbit.oak.jcr; - -import junit.framework.Test; -import junit.framework.TestCase; -import org.apache.jackrabbit.test.JCRTestSuite; - -/** - * Test suite that includes all test suites from jackrabbit-jcr-tests. - */ -public class JcrTckTest extends TestCase { - - public static Test suite() { - return new JCRTestSuite(); - } - -} diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml index b828a09..db320a5 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -188,6 +188,12 @@ integrationTesting + + + OAK_INTEGRATION_TESTING + always + + -- 1.7.7.3