Mercurial > hg > release > thermostat-0.9

changeset 1068:8cb15af2c328

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move TestUtils to test package Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-January/005055.html
author Omair Majid <omajid@redhat.com>
date Wed, 17 Apr 2013 16:09:53 -0400
parents f0f0027e0724
children 3b90181d422b
files agent/core/pom.xml agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentConfigsUtilsTest.java agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentOptionParserTest.java agent/core/src/test/java/com/redhat/thermostat/utils/ProcDataSourceTest.java common/core/src/main/java/com/redhat/thermostat/common/TestUtils.java common/test/src/main/java/com/redhat/thermostat/testutils/TestUtils.java system-backend/pom.xml system-backend/src/test/java/com/redhat/thermostat/backend/system/DistributionInformationTest.java system-backend/src/test/java/com/redhat/thermostat/backend/system/ProcessEnvironmentBuilderTest.java
diffstat 9 files changed, 123 insertions(+), 93 deletions(-) [+]
line wrap: on
line diff
--- a/agent/core/pom.xml	Wed Apr 17 14:34:38 2013 -0400
+++ b/agent/core/pom.xml	Wed Apr 17 16:09:53 2013 -0400
@@ -63,6 +63,13 @@
     </dependency>
     <dependency>
       <groupId>com.redhat.thermostat</groupId>
+      <artifactId>thermostat-common-test</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.redhat.thermostat</groupId>
       <artifactId>thermostat-common-core</artifactId>
       <version>${project.version}</version>
     </dependency>
--- a/agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentConfigsUtilsTest.java	Wed Apr 17 14:34:38 2013 -0400
+++ b/agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentConfigsUtilsTest.java	Wed Apr 17 16:09:53 2013 -0400
@@ -42,8 +42,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.redhat.thermostat.common.TestUtils;
 import com.redhat.thermostat.common.config.InvalidConfigurationException;
+import com.redhat.thermostat.testutils.TestUtils;
 
 public class AgentConfigsUtilsTest {
     
--- a/agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentOptionParserTest.java	Wed Apr 17 14:34:38 2013 -0400
+++ b/agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentOptionParserTest.java	Wed Apr 17 16:09:53 2013 -0400
@@ -45,9 +45,9 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.redhat.thermostat.common.TestUtils;
 import com.redhat.thermostat.common.cli.SimpleArguments;
 import com.redhat.thermostat.common.config.InvalidConfigurationException;
+import com.redhat.thermostat.testutils.TestUtils;
 
 public class AgentOptionParserTest {
     
--- a/agent/core/src/test/java/com/redhat/thermostat/utils/ProcDataSourceTest.java	Wed Apr 17 14:34:38 2013 -0400
+++ b/agent/core/src/test/java/com/redhat/thermostat/utils/ProcDataSourceTest.java	Wed Apr 17 16:09:53 2013 -0400
@@ -43,7 +43,7 @@
 
 import org.junit.Test;
 
-import com.redhat.thermostat.common.TestUtils;
+import com.redhat.thermostat.testutils.TestUtils;
 import com.redhat.thermostat.utils.ProcDataSource;
 
 public class ProcDataSourceTest {
--- a/common/core/src/main/java/com/redhat/thermostat/common/TestUtils.java	Wed Apr 17 14:34:38 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright 2012, 2013 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.common;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.util.Properties;
-import java.util.Random;
-
-public class TestUtils {
-
-    public static int getProcessId() {
-        String name = ManagementFactory.getRuntimeMXBean().getName();
-        String pidPart = name.split("@")[0];
-        return Integer.parseInt(pidPart);
-    }
-
-    public static boolean isLinux() {
-        return (System.getProperty("os.name").toLowerCase().contains("linux"));
-    }
-        
-    public static String setupAgentConfigs() throws IOException {
-        // need to create dummy config files for the tests
-        Random random = new Random();
-
-        String tmpDir = System.getProperty("java.io.tmpdir") + File.separatorChar +
-                Math.abs(random.nextInt()) + File.separatorChar;
-
-        System.setProperty("THERMOSTAT_HOME", tmpDir);
-        File agent = new File(tmpDir, "agent");
-        agent.mkdirs();
-
-        File tmpConfigs = new File(agent, "agent.properties");
-
-        new File(agent, "run").mkdirs();
-        new File(agent, "logs").mkdirs();
-
-        File backends = new File(tmpDir, "backends");
-        File system = new File(backends, "system");
-        system.mkdirs();
-
-        Properties props = new Properties();
-        
-        props.setProperty("SAVE_ON_EXIT", "true");
-        props.setProperty("CONFIG_LISTEN_ADDRESS", "42.42.42.42:42");
-        
-        props.store(new FileOutputStream(tmpConfigs), "thermostat agent test properties");
-        
-        return tmpDir;
-    }
-}
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/test/src/main/java/com/redhat/thermostat/testutils/TestUtils.java	Wed Apr 17 16:09:53 2013 -0400
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2012, 2013 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.testutils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.management.ManagementFactory;
+import java.util.Properties;
+import java.util.Random;
+
+// FIXME the methods in this class can probably be split more sanely
+public class TestUtils {
+
+    /**
+     * @return the process id of the current process
+     */
+    public static int getProcessId() {
+        String name = ManagementFactory.getRuntimeMXBean().getName();
+        String pidPart = name.split("@")[0];
+        return Integer.parseInt(pidPart);
+    }
+
+    /**
+     * @return true if the current os is linux
+     */
+    public static boolean isLinux() {
+        return (System.getProperty("os.name").toLowerCase().contains("linux"));
+    }
+
+    /**
+     * Creates and initializes a directory suitable for use as the agent's
+     * configuration directory
+     *
+     * @return a String containing the path to the temporary configuration directory
+     * @throws IOException
+     */
+    public static String setupAgentConfigs() throws IOException {
+        // need to create dummy config files for the tests
+        Random random = new Random();
+
+        String tmpDir = System.getProperty("java.io.tmpdir") + File.separatorChar +
+                Math.abs(random.nextInt()) + File.separatorChar;
+
+        System.setProperty("THERMOSTAT_HOME", tmpDir);
+        File agent = new File(tmpDir, "agent");
+        agent.mkdirs();
+
+        File tmpConfigs = new File(agent, "agent.properties");
+
+        new File(agent, "run").mkdirs();
+        new File(agent, "logs").mkdirs();
+
+        File backends = new File(tmpDir, "backends");
+        File system = new File(backends, "system");
+        system.mkdirs();
+
+        Properties props = new Properties();
+        
+        props.setProperty("SAVE_ON_EXIT", "true");
+        props.setProperty("CONFIG_LISTEN_ADDRESS", "42.42.42.42:42");
+        
+        try (OutputStream propsOutputStream = new FileOutputStream(tmpConfigs)) {
+            props.store(propsOutputStream, "thermostat agent test properties");
+        }
+
+        return tmpDir;
+    }
+}
+
--- a/system-backend/pom.xml	Wed Apr 17 14:34:38 2013 -0400
+++ b/system-backend/pom.xml	Wed Apr 17 16:09:53 2013 -0400
@@ -61,6 +61,12 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.redhat.thermostat</groupId>
+      <artifactId>thermostat-common-test</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>com.redhat.thermostat</groupId>
--- a/system-backend/src/test/java/com/redhat/thermostat/backend/system/DistributionInformationTest.java	Wed Apr 17 14:34:38 2013 -0400
+++ b/system-backend/src/test/java/com/redhat/thermostat/backend/system/DistributionInformationTest.java	Wed Apr 17 16:09:53 2013 -0400
@@ -40,7 +40,7 @@
 
 import org.junit.Test;
 
-import com.redhat.thermostat.common.TestUtils;
+import com.redhat.thermostat.testutils.TestUtils;
 
 public class DistributionInformationTest {
 
--- a/system-backend/src/test/java/com/redhat/thermostat/backend/system/ProcessEnvironmentBuilderTest.java	Wed Apr 17 14:34:38 2013 -0400
+++ b/system-backend/src/test/java/com/redhat/thermostat/backend/system/ProcessEnvironmentBuilderTest.java	Wed Apr 17 16:09:53 2013 -0400
@@ -55,7 +55,7 @@
 
 import org.junit.Test;
 
-import com.redhat.thermostat.common.TestUtils;
+import com.redhat.thermostat.testutils.TestUtils;
 import com.redhat.thermostat.utils.ProcDataSource;
 
 public class ProcessEnvironmentBuilderTest {