From 69be5c846eea73142fdbb1be4de5934481637035 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Tue, 5 Jul 2016 17:47:28 +0200 Subject: [PATCH] Fix compilation issue in Eclipse --- .../scanner/rule/DefaultRulesLoaderTest.java | 16 +++++++--------- .../response.protobuf | 0 2 files changed, 7 insertions(+), 9 deletions(-) rename sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/{DefaultRulesLoader => DefaultRulesLoaderTest}/response.protobuf (100%) diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultRulesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultRulesLoaderTest.java index 93b88fada89..e289211e79f 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultRulesLoaderTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultRulesLoaderTest.java @@ -19,21 +19,19 @@ */ package org.sonar.scanner.rule; -import static org.mockito.Mockito.mock; -import org.junit.rules.ExpectedException; -import org.sonar.scanner.WsTestUtil; -import org.sonar.scanner.bootstrap.BatchWsClient; -import org.sonar.scanner.rule.DefaultRulesLoader; -import org.sonarqube.ws.Rules.ListResponse.Rule; import com.google.common.io.ByteSource; import com.google.common.io.Resources; - import java.io.IOException; import java.io.InputStream; import java.util.List; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.sonar.scanner.WsTestUtil; +import org.sonar.scanner.bootstrap.BatchWsClient; +import org.sonarqube.ws.Rules.ListResponse.Rule; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import static org.mockito.Mockito.mock; public class DefaultRulesLoaderTest { @org.junit.Rule @@ -42,7 +40,7 @@ public class DefaultRulesLoaderTest { @Test public void testParseServerResponse() throws IOException { BatchWsClient wsClient = mock(BatchWsClient.class); - InputStream is = Resources.asByteSource(this.getClass().getResource("DefaultRulesLoader/response.protobuf")).openBufferedStream(); + InputStream is = Resources.asByteSource(this.getClass().getResource("DefaultRulesLoaderTest/response.protobuf")).openBufferedStream(); WsTestUtil.mockStream(wsClient, is); DefaultRulesLoader loader = new DefaultRulesLoader(wsClient); List ruleList = loader.load(); diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/DefaultRulesLoader/response.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/DefaultRulesLoaderTest/response.protobuf similarity index 100% rename from sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/DefaultRulesLoader/response.protobuf rename to sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/DefaultRulesLoaderTest/response.protobuf -- 2.39.5