From 4eb8c7f8657ebe5544fcd2283145d175713ab567 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 23 Nov 2017 22:01:21 +0100 Subject: Support build of SonarQube with JDK 9 --- server/sonar-ce/pom.xml | 6 ------ .../sonar/ce/queue/InternalCeQueueImplTest.java | 22 +++++++++------------- 2 files changed, 9 insertions(+), 19 deletions(-) (limited to 'server/sonar-ce') diff --git a/server/sonar-ce/pom.xml b/server/sonar-ce/pom.xml index 301c2cb31f4..42dc89d5de0 100644 --- a/server/sonar-ce/pom.xml +++ b/server/sonar-ce/pom.xml @@ -52,12 +52,6 @@ assertj-guava test - - - org.hamcrest - hamcrest-all - test - org.mockito mockito-core diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java index 74b2a9503f7..753928597ed 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java @@ -19,23 +19,13 @@ */ package org.sonar.ce.queue; -import static com.google.common.base.Preconditions.checkArgument; -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.sonar.ce.container.ComputeEngineStatus.Status.STARTED; -import static org.sonar.ce.container.ComputeEngineStatus.Status.STOPPING; - +import com.google.common.collect.ImmutableSet; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.List; import java.util.Optional; import java.util.Random; - import javax.annotation.Nullable; - -import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -59,7 +49,13 @@ import org.sonar.server.computation.task.step.TypedException; import org.sonar.server.organization.DefaultOrganization; import org.sonar.server.organization.DefaultOrganizationProvider; -import com.google.common.collect.ImmutableSet; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.sonar.ce.container.ComputeEngineStatus.Status.STARTED; +import static org.sonar.ce.container.ComputeEngineStatus.Status.STOPPING; public class InternalCeQueueImplTest { @@ -531,7 +527,7 @@ public class InternalCeQueueImplTest { CeQueueDto queueDto = db.getDbClient().ceQueueDao().selectByUuid(db.getSession(), task.getUuid()).get(); expectedException.expect(IllegalStateException.class); - expectedException.expectMessage(Matchers.startsWith("Task is in progress and can't be canceled")); + expectedException.expectMessage("Task is in progress and can't be canceled"); underTest.cancel(db.getSession(), queueDto); } -- cgit v1.2.3 _cred_in_files_external'>artonge/feat/compare_hashed_password_when_updating_global_cred_in_files_external Nextcloud server, a safe home for all your data: https://github.com/nextcloud/serverwww-data

about summary refs log tree commit diff stats

path: root/l10n/pl/user_webdavauth.po

blob: 5425308d943806406403fff750dc2be92fe143e4 (plain)