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/31 13:52:41 UTC
directory-fortress-core git commit: FC-83 - Cleanup core tests -
simplified
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 7154dd19f -> 34b530ab6
FC-83 - Cleanup core tests - simplified
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/34b530ab
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/34b530ab
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/34b530ab
Branch: refs/heads/master
Commit: 34b530ab65e4591245d3b2ccd20b030a043be170
Parents: 7154dd1
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Mar 31 06:52:28 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Mar 31 06:52:28 2015 -0500
----------------------------------------------------------------------
pom.xml | 3 ++
.../fortress/core/DefaultTestCase.java | 30 ------------------
.../fortress/core/UnstableTestCase.java | 33 --------------------
.../fortress/core/rbac/AccelMgrImplTest.java | 3 --
.../fortress/core/rbac/FortressJUnitTest.java | 4 ---
.../core/rbac/accelerator/TestAccelerator.java | 3 --
.../apacheds/FortressJUnitApachedsTest.java | 3 --
.../core/samples/AllSamplesJUnitTest.java | 3 --
8 files changed, 3 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/34b530ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 30a88cc..7f29fe0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,6 +442,7 @@
<artifactId>maven-site-plugin</artifactId>
</plugin>
+ <!-- Fires on 'mvn -Dtest=ClassName' where ClassName is junit test class name -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -870,6 +871,7 @@
</build>
</profile>
+<!--
<profile>
<id>stable-tests</id>
<properties>
@@ -882,6 +884,7 @@
<testcase.groups>org.apache.directory.fortress.core.UnstableTestCase</testcase.groups>
</properties>
</profile>
+-->
<profile>
<id>apache-release</id>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/34b530ab/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
deleted file mode 100644
index 57fd16a..0000000
--- a/src/test/java/org/apache/directory/fortress/core/DefaultTestCase.java
+++ /dev/null
@@ -1,30 +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.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/34b530ab/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
deleted file mode 100644
index 661495e..0000000
--- a/src/test/java/org/apache/directory/fortress/core/UnstableTestCase.java
+++ /dev/null
@@ -1,33 +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.
- *
- */
-/**
- * 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/34b530ab/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 7fc2d0a..d40e4d5 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,8 +27,6 @@ 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;
@@ -45,7 +43,6 @@ 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/34b530ab/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 c8e950a..7df3744 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,8 +23,6 @@ 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},
@@ -49,7 +47,6 @@ import org.junit.experimental.categories.Category;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-@Category(org.apache.directory.fortress.core.DefaultTestCase.class)
public class FortressJUnitTest extends TestCase
{
private static boolean adminEnabled;
@@ -87,7 +84,6 @@ 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/34b530ab/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 051de79..9593e14 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,9 +23,7 @@ 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;
@@ -37,7 +35,6 @@ 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/34b530ab/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 533415c..8649332 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,9 +29,7 @@ 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;
@@ -57,7 +55,6 @@ 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/34b530ab/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 47d99d9..2fc988b 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,15 +22,12 @@ 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();