You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/11/06 12:03:03 UTC
[isis] branch master updated: ISIS-2441: house keeping: remove
@Incubating annot.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new d506807 ISIS-2441: house keeping: remove @Incubating annot.
d506807 is described below
commit d506807da396ff8970376bb9c8f12a905e256278
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Nov 6 13:02:51 2020 +0100
ISIS-2441: house keeping: remove @Incubating annot.
---
.../org/apache/isis/testdomain/Incubating.java | 45 ----------------------
.../testdomain/auditing/AuditerServiceTest.java | 4 +-
.../bootstrapping/JpaBootstrappingTest.java | 3 +-
.../domainmodel/SpecloaderPerformanceTest.java | 3 +-
...ServerTest.java => LdapEmbeddedServerTest.java} | 6 +--
.../publishing/PublisherServiceTest.java | 2 -
.../isis/testdomain/shiro/ShiroLdapTest.java | 3 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 2 -
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 9 ++---
.../isis/testdomain/shiro/ShiroSecmanTest.java | 2 -
10 files changed, 8 insertions(+), 71 deletions(-)
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/Incubating.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/Incubating.java
deleted file mode 100644
index 51a9823..0000000
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/Incubating.java
+++ /dev/null
@@ -1,45 +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.isis.testdomain;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-
-/**
- * To be used on test classes, that are not considered to produce stable results (incubating).
- * @deprecated not deprecated, but a trick to signal test classes that need attention
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@DisabledIfSystemProperty(named = "surefire.real.class.path", matches = ".*surefire.*") // does not work if explicit inclusions are specified with pom file
-public @interface Incubating {
-
- /**
- * The reason this annotated test class is incubating.
- */
- String value() default "";
-
-
-}
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index 300f588..7c595df 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -44,7 +44,6 @@ import org.apache.isis.applib.services.wrapper.control.ExceptionHandlerAbstract;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
@@ -68,8 +67,7 @@ import lombok.val;
IsisPresets.SilenceWicket
,IsisPresets.UseLog4j2Test
})
-@DirtiesContext // because of the temporary installed AuditerServiceProbe
-@Incubating("possibly fails when run with surefire")
+@DirtiesContext // because of the temporary installed AuditerServiceProbe ?
class AuditerServiceTest extends IsisIntegrationTestAbstract {
@Inject private RepositoryService repository;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/bootstrapping/JpaBootstrappingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/bootstrapping/JpaBootstrappingTest.java
index 91c86ef..a9c540c 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/bootstrapping/JpaBootstrappingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/bootstrapping/JpaBootstrappingTest.java
@@ -46,7 +46,6 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.conf.Configuration_usingJpa;
import org.apache.isis.testdomain.jpa.entities.JpaBook;
import org.apache.isis.testdomain.jpa.entities.JpaInventory;
@@ -61,7 +60,7 @@ import lombok.val;
)
@TestPropertySource(IsisPresets.UseLog4j2Test)
@Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-@Incubating("JPA support is under construction")
+//XXX JPA support is under construction
class JpaBootstrappingTest /*extends IsisIntegrationTestAbstract*/ {
@Inject private Optional<PlatformTransactionManager> platformTransactionManager;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
index f09ad05..4edb644 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
@@ -40,7 +40,6 @@ import org.apache.isis.commons.internal.reflection._Annotations;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.good.Configuration_usingValidDomain;
@@ -61,7 +60,7 @@ import lombok.extern.log4j.Log4j2;
IsisPresets.SilenceProgrammingModel,
//IsisPresets.DebugProgrammingModel,
})
-@Incubating("not a real test, just for performance tuning")
+//XXX not a real test, just for performance tuning
@Log4j2
class SpecloaderPerformanceTest {
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/ldap/UnstableLdapEmbeddedServerTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
similarity index 95%
rename from regressiontests/incubating/src/test/java/org/apache/isis/testdomain/ldap/UnstableLdapEmbeddedServerTest.java
rename to regressiontests/incubating/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
index a597411..1f66a1f 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/ldap/UnstableLdapEmbeddedServerTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
@@ -25,7 +25,6 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.runners.model.InitializationError;
import org.springframework.boot.test.context.SpringBootTest;
@@ -35,17 +34,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testdomain.Incubating;
import lombok.val;
@SpringBootTest(
classes = {LdapServerService.class}
)
-@Disabled // not sure why...
-@Incubating("teardown issues?")
@TestPropertySource(IsisPresets.UseLog4j2Test)
-class UnstableLdapEmbeddedServerTest {
+class LdapEmbeddedServerTest {
@Inject LdapServerService ldapServerService;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index 2b6950b..8260a67 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -45,7 +45,6 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.control.AsyncControl;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
@@ -71,7 +70,6 @@ import lombok.val;
})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@DirtiesContext // because of the temporary installed PublisherServiceProbe
-@Incubating("possibly fails when run with surefire")
class PublisherServiceTest extends IsisIntegrationTestAbstract {
@Inject private RepositoryService repository;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
index 270f2b7..b1fb122 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
@@ -39,7 +39,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.ldap.LdapConstants;
import org.apache.isis.testdomain.ldap.LdapServerService;
@@ -55,7 +54,7 @@ import lombok.extern.log4j.Log4j2;
LdapServerService.class,
})
@TestPropertySource(IsisPresets.UseLog4j2Test)
-@Incubating("inconsistent state when run in a test batch")
+//XXX inconsistent state when run in a test batch
@Log4j2
class ShiroLdapTest extends AbstractShiroTest {
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index b4a1644..c3d2185 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -47,7 +47,6 @@ import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanE
import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
-import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.ldap.LdapConstants;
@@ -77,7 +76,6 @@ import lombok.val;
IsisModuleExtSecmanPersistenceJdo.class,
IsisModuleExtSecmanEncryptionJbcrypt.class,
})
-@Incubating("does not work with surefire")
class ShiroSecmanLdapTest extends AbstractShiroTest {
@Inject FixtureScripts fixtureScripts;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index 519afc8..6c6f58f 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -37,14 +37,11 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
-import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
-import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
-import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.ldap.LdapServerService;
@@ -81,14 +78,14 @@ import lombok.val;
IsisModuleExtSecmanPersistenceJdo.class,
IsisModuleExtSecmanEncryptionJbcrypt.class,
})
-@Incubating("does not work, when executed in sequence with other smoketests")
+//XXX "does not work, when executed in sequence with other smoketests
class ShiroSecmanLdap_restfulStressTest extends AbstractShiroTest {
@Inject FixtureScripts fixtureScripts;
@Inject RestEndpointService restService;
@Inject LdapServerService ldapServerService;
- @Inject ApplicationUserRepository applicationUserRepository;
- @Inject ApplicationRoleRepository applicationRoleRepository;
+// @Inject ApplicationUserRepository applicationUserRepository;
+// @Inject ApplicationRoleRepository applicationRoleRepository;
@Inject SecurityModuleConfig securityConfig;
@Inject ServiceInjector serviceInjector;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
index 32d35d1..3b79e12 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
@@ -43,7 +43,6 @@ import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanE
import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
-import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import lombok.val;
@@ -60,7 +59,6 @@ import lombok.val;
IsisModuleExtSecmanEncryptionJbcrypt.class,
})
@TestPropertySource(IsisPresets.UseLog4j2Test)
-@Incubating("does not work with surefire")
class ShiroSecmanTest extends AbstractShiroTest {
@Inject SecurityModuleConfig securityConfig;