SONAR-8368 move package org.sonar.api.issue.condition to server-common

24 files changed, 14 insertions, 270 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/Condition.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/Condition.java
index 312803c5406..1a19769e2e6 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/Condition.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/Condition.java
@@ -17,13 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.api.issue.condition;
+package org.sonar.server.issue.workflow;
 
 import org.sonar.api.issue.Issue;
 
-/**
- * @since 3.6
- */
 public interface Condition {
 
   boolean matches(Issue issue);
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/HasResolution.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/HasResolution.java
index 151babcbc9f..fb7f855aae1 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/HasResolution.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/HasResolution.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.api.issue.condition;
+package org.sonar.server.issue.workflow;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -25,9 +25,6 @@ import org.sonar.api.issue.Issue;
 
 import static java.util.Arrays.asList;
 
-/**
- * @since 3.6
- */
 public class HasResolution implements Condition {
 
   private final Set<String> resolutions;
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/HasType.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/HasType.java
index 4767298a0e5..2f90d6cdcad 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/HasType.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/HasType.java
@@ -22,7 +22,6 @@ package org.sonar.server.issue.workflow;
 import java.util.EnumSet;
 import java.util.Set;
 import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.condition.Condition;
 import org.sonar.api.rules.RuleType;
 import org.sonar.core.issue.DefaultIssue;
 
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java
index caae1b0c59c..29e004a0e9d 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java
@@ -20,7 +20,6 @@
 package org.sonar.server.issue.workflow;
 
 import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.condition.Condition;
 import org.sonar.core.issue.DefaultIssue;
 
 enum IsBeingClosed implements Condition {
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsManualVulnerability.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsManualVulnerability.java
index 7eadb25831f..4402d30ef9c 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsManualVulnerability.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsManualVulnerability.java
@@ -20,7 +20,6 @@
 package org.sonar.server.issue.workflow;
 
 import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.condition.Condition;
 import org.sonar.api.rules.RuleType;
 import org.sonar.core.issue.DefaultIssue;
 
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsNotHotspotNorManualVulnerability.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsNotHotspotNorManualVulnerability.java
index af9c359247c..34993a634f6 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsNotHotspotNorManualVulnerability.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsNotHotspotNorManualVulnerability.java
@@ -20,7 +20,6 @@
 package org.sonar.server.issue.workflow;
 
 import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.condition.Condition;
 import org.sonar.api.rules.RuleType;
 import org.sonar.core.issue.DefaultIssue;
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/IsUnResolved.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsUnResolved.java
index 3c83faeb009..456698c445d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/IsUnResolved.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IsUnResolved.java
@@ -17,13 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.api.issue.condition;
+package org.sonar.server.issue.workflow;
 
 import org.sonar.api.issue.Issue;
 
-/**
- * @since 3.6
- */
 public class IsUnResolved implements Condition {
 
   @Override
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java
index cf97490ad55..5eaa9d556e6 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java
@@ -24,8 +24,6 @@ import org.picocontainer.Startable;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.issue.DefaultTransitions;
 import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.condition.HasResolution;
-import org.sonar.api.issue.condition.NotCondition;
 import org.sonar.api.rules.RuleType;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.web.UserRole;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/NotCondition.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/NotCondition.java
index 02d8e98b386..bd9cdd7f8af 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/NotCondition.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/NotCondition.java
@@ -17,13 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.api.issue.condition;
+package org.sonar.server.issue.workflow;
 
 import org.sonar.api.issue.Issue;
 
-/**
- * @since 3.6
- */
 public class NotCondition implements Condition {
   private final Condition condition;
 
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/Transition.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/Transition.java
index 778b2397775..7e507c716d8 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/Transition.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/workflow/Transition.java
@@ -26,7 +26,6 @@ import java.util.List;
 import javax.annotation.CheckForNull;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.condition.Condition;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/HasResolutionTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/HasResolutionTest.java
index 5235a67248e..b00c3b59a02 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/HasResolutionTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/HasResolutionTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.api.issue.condition;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 import org.sonar.api.issue.Issue;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/IsUnResolvedTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/IsUnResolvedTest.java
index d428a5ca97c..a1bfa74bea3 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/IsUnResolvedTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/IsUnResolvedTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.api.issue.condition;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 import org.sonar.api.issue.Issue;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/NotConditionTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/NotConditionTest.java
index 13ba1e56c04..9d5b8efbd54 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/NotConditionTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/NotConditionTest.java
@@ -17,11 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.api.issue.condition;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.sonar.api.issue.Issue;
+import org.sonar.server.issue.workflow.Condition;
+import org.sonar.server.issue.workflow.NotCondition;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java
index ede5b240413..e525662259b 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java
@@ -20,7 +20,6 @@
 package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
-import org.sonar.api.issue.condition.Condition;
 import org.sonar.api.web.UserRole;
 import org.sonar.core.issue.DefaultIssue;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java
index ac81874ef50..62ba0c2d35b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import org.sonar.api.issue.condition.IsUnResolved;
+import org.sonar.server.issue.workflow.IsUnResolved;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.server.rule.RuleTagFormat;
 import org.sonar.core.issue.DefaultIssue;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/Action.java b/server/sonar-server/src/main/java/org/sonar/server/issue/Action.java
index 24f00e1895e..121bdac804d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/Action.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/Action.java
@@ -25,11 +25,11 @@ import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import org.sonar.api.issue.condition.Condition;
 import org.sonar.api.server.ServerSide;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.IssueChangeContext;
 import org.sonar.db.component.ComponentDto;
+import org.sonar.server.issue.workflow.Condition;
 import org.sonar.server.user.UserSession;
 
 import static com.google.common.collect.Lists.newArrayList;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java
index 5a2054cfab4..f89ff123ee4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java
@@ -24,13 +24,13 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
-import org.sonar.api.issue.condition.IsUnResolved;
 import org.sonar.api.rules.RuleType;
 import org.sonar.api.server.ServerSide;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.user.UserDto;
+import org.sonar.server.issue.workflow.IsUnResolved;
 import org.sonar.server.user.UserSession;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java
index 9af025a683f..02db14c29dd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java
@@ -22,7 +22,7 @@ package org.sonar.server.issue;
 import java.util.Collection;
 import java.util.Map;
 import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.condition.IsUnResolved;
+import org.sonar.server.issue.workflow.IsUnResolved;
 import org.sonar.api.rules.RuleType;
 import org.sonar.api.server.ServerSide;
 import org.sonar.core.issue.DefaultIssue;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java
index 8b6d7f67759..71c870b066c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java
@@ -22,7 +22,7 @@ package org.sonar.server.issue;
 import java.util.Collection;
 import java.util.Map;
 import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.condition.IsUnResolved;
+import org.sonar.server.issue.workflow.IsUnResolved;
 import org.sonar.api.rules.RuleType;
 import org.sonar.api.web.UserRole;
 import org.sonar.core.issue.DefaultIssue;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/HasIssuePropertyCondition.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/HasIssuePropertyCondition.java
deleted file mode 100644
index 3675bc2f979..00000000000
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/HasIssuePropertyCondition.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.api.issue.condition;
-
-import com.google.common.base.Preconditions;
-import org.apache.commons.lang.StringUtils;
-import org.sonar.api.issue.Issue;
-
-import static org.apache.commons.lang.StringUtils.isEmpty;
-
-/**
- * @since 3.6
- */
-public final class HasIssuePropertyCondition implements Condition {
-
-  private final String propertyKey;
-
-  public HasIssuePropertyCondition(String propertyKey) {
-    Preconditions.checkArgument(!isEmpty(propertyKey));
-    this.propertyKey = propertyKey;
-  }
-
-  public String getPropertyKey() {
-    return propertyKey;
-  }
-
-  @Override
-  public boolean matches(Issue issue) {
-    return !StringUtils.isEmpty(issue.attribute(propertyKey));
-  }
-}
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/HasStatus.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/HasStatus.java
deleted file mode 100644
index 6f123dd3081..00000000000
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/HasStatus.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.api.issue.condition;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.sonar.api.issue.Issue;
-
-import static java.util.Arrays.asList;
-
-/**
- * @since 3.6
- */
-public class HasStatus implements Condition {
-
-  private final Set<String> statuses;
-
-  public HasStatus(String first, String... others) {
-    this.statuses = new HashSet<>();
-    this.statuses.add(first);
-    this.statuses.addAll(asList(others));
-  }
-
-  @Override
-  public boolean matches(Issue issue) {
-    return issue.status() != null && statuses.contains(issue.status());
-  }
-}
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/package-info.java
deleted file mode 100644
index c292cf4a7dd..00000000000
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.api.issue.condition;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/HasIssuePropertyConditionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/HasIssuePropertyConditionTest.java
deleted file mode 100644
index 5f74c899255..00000000000
--- a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/HasIssuePropertyConditionTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.api.issue.condition;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.sonar.api.issue.Issue;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class HasIssuePropertyConditionTest {
-
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
-
-  Issue issue = mock(Issue.class);
-
-  @Test
-  public void should_match() {
-    HasIssuePropertyCondition condition = new HasIssuePropertyCondition("foo");
-
-    assertThat(condition.matches(issue)).isFalse();
-
-    when(issue.attribute("foo")).thenReturn("");
-    assertThat(condition.matches(issue)).isFalse();
-
-    when(issue.attribute("foo")).thenReturn("bar");
-    assertThat(condition.matches(issue)).isTrue();
-  }
-
-  @Test
-  public void should_get_property_key() {
-    HasIssuePropertyCondition condition = new HasIssuePropertyCondition("foo");
-    assertThat(condition.getPropertyKey()).isEqualTo("foo");
-  }
-
-  @Test
-  public void shoul_fail_if_null_property() {
-    thrown.expect(IllegalArgumentException.class);
-    new HasIssuePropertyCondition(null);
-  }
-
-  @Test
-  public void should_fail_if_empty_property() {
-    thrown.expect(IllegalArgumentException.class);
-    new HasIssuePropertyCondition("");
-  }
-
-}
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/HasStatusTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/HasStatusTest.java
deleted file mode 100644
index 606e5e65c60..00000000000
--- a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/HasStatusTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.api.issue.condition;
-
-import org.junit.Test;
-import org.sonar.api.issue.Issue;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class HasStatusTest {
-
-  Issue issue = mock(Issue.class);
-
-  @Test
-  public void should_match() {
-    HasStatus condition = new HasStatus("OPEN", "REOPENED", "CONFIRMED");
-
-    when(issue.status()).thenReturn("OPEN");
-    assertThat(condition.matches(issue)).isTrue();
-
-    when(issue.status()).thenReturn("REOPENED");
-    assertThat(condition.matches(issue)).isTrue();
-
-    when(issue.status()).thenReturn("CONFIRMED");
-    assertThat(condition.matches(issue)).isTrue();
-
-    when(issue.status()).thenReturn("open");
-    assertThat(condition.matches(issue)).isFalse();
-
-    when(issue.status()).thenReturn("CLOSED");
-    assertThat(condition.matches(issue)).isFalse();
-  }
-
-}