You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/03/24 13:18:28 UTC
[1/3] directory-fortress-core git commit: FC-83 - Cleanup core test
processing
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 5ebefc138 -> 037bf91ae
FC-83 - Cleanup core test processing
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/f524648d
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/f524648d
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/f524648d
Branch: refs/heads/master
Commit: f524648d40c1b2015d42236e310ac18c47ed8305
Parents: b0ea93b
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Mar 24 07:04:37 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Mar 24 07:04:37 2015 -0500
----------------------------------------------------------------------
ldap/setup/RbacAcceleratorTestUsers.xml | 5 +++
.../fortress/core/DefaultTestCase.java | 30 ++++++++++++++++++
.../fortress/core/UnstableTestCase.java | 33 ++++++++++++++++++++
.../fortress/core/rbac/AccelMgrImplTest.java | 3 ++
.../fortress/core/rbac/FortressJUnitTest.java | 5 +++
.../core/rbac/accelerator/TestAccelerator.java | 3 ++
.../apacheds/FortressJUnitApachedsTest.java | 3 ++
.../core/samples/AllSamplesJUnitTest.java | 3 ++
8 files changed, 85 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f524648d/ldap/setup/RbacAcceleratorTestUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/RbacAcceleratorTestUsers.xml b/ldap/setup/RbacAcceleratorTestUsers.xml
index 061b9f2..759bcf7 100644
--- a/ldap/setup/RbacAcceleratorTestUsers.xml
+++ b/ldap/setup/RbacAcceleratorTestUsers.xml
@@ -107,6 +107,11 @@
<permgrant objName="/rbac/cal2.jsp" opName="6pm" roleNm="rbacrole1"/>
</addpermgrant>
+ <addorgunit>
+ <orgunit name="demousrs1" typeName="USER" description="Test User Org for Rbac Accelerator Sample"/>
+ <orgunit name="demoapps1" typeName="PERM" description="Test Perm Org for Rbac Accelerator Sample"/>
+ </addorgunit>
+
</FortressAdmin>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f524648d/src/test/java/org/apache/directory/fortress/core/DefaultTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/DefaultTestCase.java b/src/test/java/org/apache/directory/fortress/core/DefaultTestCase.java
new file mode 100644
index 0000000..57fd16a
--- /dev/null
+++ b/src/test/java/org/apache/directory/fortress/core/DefaultTestCase.java
@@ -0,0 +1,30 @@
+/*
+ * 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.directory.fortress.core;
+
+/**
+ * DefaultTestCase.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version 1.0
+ */
+public class DefaultTestCase
+{
+}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f524648d/src/test/java/org/apache/directory/fortress/core/UnstableTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/UnstableTestCase.java b/src/test/java/org/apache/directory/fortress/core/UnstableTestCase.java
new file mode 100644
index 0000000..661495e
--- /dev/null
+++ b/src/test/java/org/apache/directory/fortress/core/UnstableTestCase.java
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ *
+ */
+/**
+ * UnstableTestCase.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version 1.0
+ */
+package org.apache.directory.fortress.core;
+
+/**
+ * Created by smckinn on 3/24/15.
+ */
+public class UnstableTestCase
+{
+}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f524648d/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
index d40e4d5..7fc2d0a 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
@@ -27,6 +27,8 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,6 +45,7 @@ import org.apache.directory.fortress.core.util.LogUtil;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
+@Category(org.apache.directory.fortress.core.DefaultTestCase.class)
public class AccelMgrImplTest extends TestCase
{
private static final String CLS_NM = AccelMgrImplTest.class.getName();
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f524648d/src/test/java/org/apache/directory/fortress/core/rbac/FortressJUnitTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/FortressJUnitTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/FortressJUnitTest.java
index 7df3744..7f2f83a 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/FortressJUnitTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/FortressJUnitTest.java
@@ -23,6 +23,8 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import junit.framework.TestCase;
import org.apache.directory.fortress.core.GlobalIds;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
/**
* This JUnit test class drives all of the Fortress Administration APIs contained within {@link AdminMgrImplTest},
@@ -47,6 +49,8 @@ import org.apache.directory.fortress.core.GlobalIds;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
+//@Ignore
+
public class FortressJUnitTest extends TestCase
{
private static boolean adminEnabled;
@@ -84,6 +88,7 @@ public class FortressJUnitTest extends TestCase
/**
* @return
*/
+ @Category(org.apache.directory.fortress.core.DefaultTestCase.class)
public static Test suite()
{
TestSuite suite = new TestSuite();
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f524648d/src/test/java/org/apache/directory/fortress/core/rbac/accelerator/TestAccelerator.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/accelerator/TestAccelerator.java b/src/test/java/org/apache/directory/fortress/core/rbac/accelerator/TestAccelerator.java
index 9593e14..051de79 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/accelerator/TestAccelerator.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/accelerator/TestAccelerator.java
@@ -23,7 +23,9 @@ import org.apache.directory.fortress.core.*;
import org.apache.directory.fortress.core.SecurityException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.directory.fortress.core.AccelMgr;
@@ -35,6 +37,7 @@ import org.apache.directory.fortress.core.rbac.UserRole;
import static org.junit.Assert.*;
+@Category(org.apache.directory.fortress.core.DefaultTestCase.class)
public class TestAccelerator
{
private static final Logger LOG = LoggerFactory.getLogger( TestAccelerator.class );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f524648d/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/FortressJUnitApachedsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/FortressJUnitApachedsTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/FortressJUnitApachedsTest.java
index 8649332..533415c 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/FortressJUnitApachedsTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/FortressJUnitApachedsTest.java
@@ -29,7 +29,9 @@ import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,6 +57,7 @@ import org.apache.directory.fortress.core.rbac.UserTestData;
import org.apache.directory.fortress.core.util.cache.CacheMgr;
+@Category(org.apache.directory.fortress.core.DefaultTestCase.class)
@RunWith(FrameworkRunner.class)
@CreateDS(name = "classDS", partitions =
{ @CreatePartition(name = "example", suffix = "dc=example,dc=com") })
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f524648d/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java b/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
index 2fc988b..47d99d9 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
@@ -22,12 +22,15 @@ package org.apache.directory.fortress.core.samples;
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.framework.TestCase;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
/**
* This Junit test class calls all of the Samples.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
+@Category(org.apache.directory.fortress.core.DefaultTestCase.class)
public class AllSamplesJUnitTest extends TestCase
{
private static boolean isFirstRun = getFirstRun();
[2/3] directory-fortress-core git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-fortress-core
Posted by sm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-fortress-core
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/0998257a
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/0998257a
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/0998257a
Branch: refs/heads/master
Commit: 0998257a79e365a2448ba6920d9c5a299073579e
Parents: f524648 5ebefc1
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Mar 24 07:05:35 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Mar 24 07:05:35 2015 -0500
----------------------------------------------------------------------
pom.xml | 1630 ++++++++++++++++++++++++++++------------------------------
1 file changed, 788 insertions(+), 842 deletions(-)
----------------------------------------------------------------------
[3/3] directory-fortress-core git commit: FC-83 - Cleanup core test
processing
Posted by sm...@apache.org.
FC-83 - Cleanup core test processing
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/037bf91a
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/037bf91a
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/037bf91a
Branch: refs/heads/master
Commit: 037bf91ae83760bb9decfaa46099272d69b06837
Parents: 0998257
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Mar 24 07:18:16 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Mar 24 07:18:16 2015 -0500
----------------------------------------------------------------------
pom.xml | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/037bf91a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c561648..facc2e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -451,6 +451,16 @@
<systemPropertyVariables>
<version>${project.version}</version>
</systemPropertyVariables>
+ <testFailureIgnore>true</testFailureIgnore>
+ <excludes>
+ <exclude>${exclude.tests}</exclude>
+ </excludes>
+ <includes>
+ <include>${include.tests}</include>
+ </includes>
+ <groups>${testcase.groups}</groups>
+ <forkMode>never</forkMode>
+ <runOrder>random</runOrder>
</configuration>
</plugin>
@@ -762,6 +772,23 @@
</profile>
<profile>
+ <id>stable-tests</id>
+ <properties>
+ <exclude.tests>**/accelerator/**/*.java</exclude.tests>
+ <include.tests>**/rbac/**/*.java</include.tests>
+ <testcase.groups>org.apache.directory.fortress.core.DefaultTestCase</testcase.groups>
+ </properties>
+ </profile>
+ <profile>
+ <id>unstable-tests</id>
+ <properties>
+ <exclude.tests>**/accelerator/**/*.java</exclude.tests>
+ <include.tests>**/rbac/**/*.java</include.tests>
+ <testcase.groups>org.apache.directory.fortress.core.DefaultTestCase</testcase.groups>
+ </properties>
+ </profile>
+
+ <profile>
<id>apache-release</id>
<build>
<plugins>