aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2019-05-02 15:27:24 +0200
committerSonarTech <sonartech@sonarsource.com>2019-06-03 20:21:20 +0200
commitc44b4310a0b6713501cc744d45f22a5641f6a701 (patch)
treee1080f9df7ecd8a69d9c9388d3271af12d0d9694
parent67a7a29761ccccd1ee4cb5780061b09cffd67726 (diff)
downloadsonarqube-c44b4310a0b6713501cc744d45f22a5641f6a701.tar.gz
sonarqube-c44b4310a0b6713501cc744d45f22a5641f6a701.zip
SONAR-12043 delete dead code in sonar-process tests
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java135
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/test/InfiniteTerminationProcess.java85
2 files changed, 0 insertions, 220 deletions
diff --git a/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java b/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java
deleted file mode 100644
index 610ab36383b..00000000000
--- a/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2019 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.process.test;
-
-import org.apache.commons.io.FileUtils;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.server.handler.ContextHandler;
-import org.sonar.process.Monitored;
-import org.sonar.process.sharedmemoryfile.ProcessCommands;
-import org.sonar.process.ProcessEntryPoint;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Http server used for testing (see MonitorTest).
- * It accepts HTTP commands /ping, /restart to request restart of all child processes and /kill to hardly exit.
- * It also pushes status to temp files, so test can verify what was really done (when server went ready state and
- * if it was gracefully terminated)
- */
-public class HttpProcess implements Monitored {
-
- private final int httpPort;
- private final Server server;
- private boolean ready = false;
- // temp dir is specific to this process
- private final File tempDir = new File(System.getProperty("java.io.tmpdir"));
- private final ProcessCommands processCommands;
-
- public HttpProcess(int httpPort, ProcessCommands processCommands) {
- this.httpPort = httpPort;
- this.processCommands = processCommands;
- this.server = new Server(httpPort);
- }
-
- @Override
- public void start() {
- writeTimeToFile("startingAt");
- ContextHandler context = new ContextHandler();
- context.setContextPath("/");
- context.setClassLoader(Thread.currentThread().getContextClassLoader());
- server.setHandler(context);
- context.setHandler(new AbstractHandler() {
- @Override
- public void handle(String target, Request request, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws IOException {
- if ("/ping".equals(target)) {
- request.setHandled(true);
- httpServletResponse.getWriter().print("ping");
- } else if ("/restart".equals(target)) {
- writeTimeToFile("restartAskedAt");
- request.setHandled(true);
- processCommands.askForRestart();
- httpServletResponse.getWriter().print("ok");
- } else if ("/kill".equals(target)) {
- writeTimeToFile("killedAt");
- System.exit(0);
- }
- }
- });
- try {
- server.start();
- } catch (Exception e) {
- throw new IllegalStateException("Fail to start Jetty", e);
- }
- }
-
- @Override
- public Status getStatus() {
- if (ready) {
- return Status.OPERATIONAL;
- }
- if (server.isStarted()) {
- ready = true;
- writeTimeToFile("readyAt");
- }
- return ready ? Status.OPERATIONAL : Status.DOWN;
- }
-
- @Override
- public void awaitStop() {
- try {
- server.join();
- } catch (InterruptedException ignore) {
-
- }
- }
-
- @Override
- public void hardStop() {
- try {
- if (!server.isStopped()) {
- server.stop();
- writeTimeToFile("terminatedAt");
- }
- } catch (Exception e) {
- throw new IllegalStateException("Fail to stop Jetty", e);
- }
- }
-
- private void writeTimeToFile(String filename) {
- try {
- FileUtils.write(new File(tempDir, httpPort + "-" + filename), System.currentTimeMillis() + ",", true);
- } catch (IOException e) {
- throw new IllegalStateException(e);
- }
- }
-
- public static void main(String[] args) {
- ProcessEntryPoint entryPoint = ProcessEntryPoint.createForArguments(args);
- entryPoint.launch(new HttpProcess(entryPoint.getProps().valueAsInt("httpPort"), entryPoint.getCommands()));
- }
-}
diff --git a/server/sonar-process/src/test/java/org/sonar/process/test/InfiniteTerminationProcess.java b/server/sonar-process/src/test/java/org/sonar/process/test/InfiniteTerminationProcess.java
deleted file mode 100644
index c6679eb3d65..00000000000
--- a/server/sonar-process/src/test/java/org/sonar/process/test/InfiniteTerminationProcess.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2019 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.process.test;
-
-import org.sonar.process.Monitored;
-import org.sonar.process.ProcessEntryPoint;
-import org.sonar.process.Lifecycle.State;
-
-public class InfiniteTerminationProcess implements Monitored {
-
- private State state = State.INIT;
-
- private final Thread daemon = new Thread() {
- @Override
- public void run() {
- try {
- while (true) {
- Thread.sleep(100L);
- }
- } catch (InterruptedException e) {
- // return
- }
- }
- };
-
- /**
- * Blocks until started()
- */
- @Override
- public void start() {
- state = State.STARTING;
- daemon.start();
- state = State.STARTED;
- }
-
- @Override
- public Status getStatus() {
- return state == State.STARTED ? Status.OPERATIONAL : Status.DOWN;
- }
-
- @Override
- public void awaitStop() {
- try {
- daemon.join();
- } catch (InterruptedException e) {
- // interrupted by call to terminate()
- }
- }
-
- /**
- * Blocks until stopped
- */
- @Override
- public void hardStop() {
- state = State.STOPPING;
- try {
- daemon.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- state = State.STOPPED;
- }
-
- public static void main(String[] args) {
- ProcessEntryPoint entryPoint = ProcessEntryPoint.createForArguments(args);
- entryPoint.launch(new InfiniteTerminationProcess());
- }
-}