Tests reorg

hawkular · Jun 26, 2015 · d8068e1 · d8068e1
1 parent 14bf6a4
commit d8068e1
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 40 deletions.
diff --git a/.../clients/ptrans/fullstack/MetricData.java → ...trics/clients/ptrans/data/MetricData.java b/.../clients/ptrans/fullstack/MetricData.java → ...trics/clients/ptrans/data/MetricData.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans.fullstack;
+package org.hawkular.metrics.clients.ptrans.data;
 
 /**
  * @author Thomas Segismont
  */
-final class MetricData {
+public final class MetricData {
     long timestamp;
     double value;
 

diff --git a/.../clients/ptrans/fullstack/MetricName.java → ...trics/clients/ptrans/data/MetricName.java b/.../clients/ptrans/fullstack/MetricName.java → ...trics/clients/ptrans/data/MetricName.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans.fullstack;
+package org.hawkular.metrics.clients.ptrans.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
  * @author Thomas Segismont
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-class MetricName {
+public class MetricName {
     String id;
 
     public String getId() {

diff --git a/...trics/clients/ptrans/fullstack/Point.java → ...ar/metrics/clients/ptrans/data/Point.java b/...trics/clients/ptrans/fullstack/Point.java → ...ar/metrics/clients/ptrans/data/Point.java
@@ -14,40 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans.fullstack;
+package org.hawkular.metrics.clients.ptrans.data;
 
 /**
  * @author Thomas Segismont
  */
-class Point {
+public class Point {
     final String name;
     final long timestamp;
     final double value;
 
-    Point(String name, long timestamp, double value) {
+    public Point(String name, long timestamp, double value) {
         this.name = name;
         this.timestamp = timestamp;
         this.value = value;
     }
 
-    String getName() {
+    public String getName() {
         return name;
     }
 
-    long getTimestamp() {
+    public long getTimestamp() {
         return timestamp;
     }
 
-    double getValue() {
+    public double getValue() {
         return value;
     }
 
     @Override
     public String toString() {
         return "Point[" +
-               "name='" + name + '\'' +
-               ", timestamp=" + timestamp +
-               ", value=" + value +
-               ']';
+                "name='" + name + '\'' +
+                ", timestamp=" + timestamp +
+                ", value=" + value +
+                ']';
     }
 }
diff --git a/...ts/ptrans/fullstack/ServerDataHelper.java → ...clients/ptrans/data/ServerDataHelper.java b/...ts/ptrans/fullstack/ServerDataHelper.java → ...clients/ptrans/data/ServerDataHelper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans.fullstack;
+package org.hawkular.metrics.clients.ptrans.data;
 
 import static java.util.stream.Collectors.toList;
 
@@ -37,7 +37,7 @@
  *
  * @author Thomas Segismont
  */
-class ServerDataHelper {
+public class ServerDataHelper {
     public static final String BASE_URI = System.getProperty(
             "hawkular-metrics.base-uri",
             "127.0.0.1:8080/hawkular/metrics"

diff --git a/...cs/clients/ptrans/ConfigurationITest.java → ...ients/ptrans/exec/ConfigurationITest.java b/...cs/clients/ptrans/ConfigurationITest.java → ...ients/ptrans/exec/ConfigurationITest.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.exec;
 
 import static java.util.stream.Collectors.joining;
+
 import static org.hamcrest.CoreMatchers.allOf;
-import static org.hawkular.metrics.clients.ptrans.CanReadMatcher.canRead;
 import static org.hawkular.metrics.clients.ptrans.ConfigurationKey.SERVICES;
-import static org.hawkular.metrics.clients.ptrans.IsFileMatcher.isFile;
+import static org.hawkular.metrics.clients.ptrans.matchers.CanReadMatcher.canRead;
+import static org.hawkular.metrics.clients.ptrans.matchers.IsFileMatcher.isFile;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThat;

diff --git a/...s/clients/ptrans/ExecutableITestBase.java → ...ents/ptrans/exec/ExecutableITestBase.java b/...s/clients/ptrans/ExecutableITestBase.java → ...ents/ptrans/exec/ExecutableITestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.exec;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 
+import org.hawkular.metrics.clients.ptrans.util.PrintOutputOnFailureWatcher;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;

diff --git a/...rics/clients/ptrans/OpenedPortsITest.java → ...clients/ptrans/exec/OpenedPortsITest.java b/...rics/clients/ptrans/OpenedPortsITest.java → ...clients/ptrans/exec/OpenedPortsITest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.exec;
 
 import static org.hawkular.metrics.clients.ptrans.ConfigurationKey.SERVICES;
 
@@ -28,6 +28,8 @@
 import java.net.Socket;
 import java.util.Properties;
 
+import org.hawkular.metrics.clients.ptrans.Configuration;
+import org.hawkular.metrics.clients.ptrans.Service;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;

diff --git a/.../metrics/clients/ptrans/OptionsITest.java → ...ics/clients/ptrans/exec/OptionsITest.java b/.../metrics/clients/ptrans/OptionsITest.java → ...ics/clients/ptrans/exec/OptionsITest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.exec;
 
 import static org.hamcrest.CoreMatchers.allOf;
-import static org.hawkular.metrics.clients.ptrans.CanReadMatcher.canRead;
-import static org.hawkular.metrics.clients.ptrans.ContainsMatcher.contains;
-import static org.hawkular.metrics.clients.ptrans.HasSizeMatcher.hasSize;
-import static org.hawkular.metrics.clients.ptrans.IsFileMatcher.isFile;
+import static org.hawkular.metrics.clients.ptrans.matchers.CanReadMatcher.canRead;
+import static org.hawkular.metrics.clients.ptrans.matchers.ContainsMatcher.contains;
+import static org.hawkular.metrics.clients.ptrans.matchers.HasSizeMatcher.hasSize;
+import static org.hawkular.metrics.clients.ptrans.matchers.IsFileMatcher.isFile;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThat;

diff --git a/.../metrics/clients/ptrans/PidFileITest.java → ...ics/clients/ptrans/exec/PidFileITest.java b/.../metrics/clients/ptrans/PidFileITest.java → ...ics/clients/ptrans/exec/PidFileITest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.exec;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+
 import static org.hamcrest.CoreMatchers.allOf;
-import static org.hawkular.metrics.clients.ptrans.CanReadMatcher.canRead;
-import static org.hawkular.metrics.clients.ptrans.ContainsMatcher.contains;
-import static org.hawkular.metrics.clients.ptrans.IsFileMatcher.isFile;
-import static org.hawkular.metrics.clients.ptrans.WriteLockedMatcher.writeLocked;
+import static org.hawkular.metrics.clients.ptrans.matchers.CanReadMatcher.canRead;
+import static org.hawkular.metrics.clients.ptrans.matchers.ContainsMatcher.contains;
+import static org.hawkular.metrics.clients.ptrans.matchers.IsFileMatcher.isFile;
+import static org.hawkular.metrics.clients.ptrans.matchers.WriteLockedMatcher.writeLocked;
 import static org.hawkular.metrics.clients.ptrans.util.ProcessUtil.getPid;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;

diff --git a/...translator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/CollectdITest.java b/...translator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/CollectdITest.java
@@ -37,8 +37,9 @@
 import java.util.stream.Stream;
 
 import org.hawkular.metrics.clients.ptrans.ConfigurationKey;
-import org.hawkular.metrics.clients.ptrans.PrintOutputOnFailureWatcher;
 import org.hawkular.metrics.clients.ptrans.Service;
+import org.hawkular.metrics.clients.ptrans.data.Point;
+import org.hawkular.metrics.clients.ptrans.util.PrintOutputOnFailureWatcher;
 import org.junit.After;
 import org.junit.Rule;
 

diff --git a/...ranslator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/FullStackITest.java b/...ranslator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/FullStackITest.java
@@ -20,7 +20,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.stream.Collectors.joining;
 
-import static org.hawkular.metrics.clients.ptrans.fullstack.ServerDataHelper.BASE_URI;
+import static org.hawkular.metrics.clients.ptrans.data.ServerDataHelper.BASE_URI;
 import static org.hawkular.metrics.clients.ptrans.util.ProcessUtil.kill;
 import static org.hawkular.metrics.clients.ptrans.util.TenantUtil.getRandomTenantId;
 import static org.junit.Assert.assertEquals;
@@ -36,7 +36,9 @@
 import java.util.Properties;
 
 import org.hawkular.metrics.clients.ptrans.ConfigurationKey;
-import org.hawkular.metrics.clients.ptrans.ExecutableITestBase;
+import org.hawkular.metrics.clients.ptrans.data.Point;
+import org.hawkular.metrics.clients.ptrans.data.ServerDataHelper;
+import org.hawkular.metrics.clients.ptrans.exec.ExecutableITestBase;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/...translator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/GraphiteITest.java b/...translator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/GraphiteITest.java
@@ -30,6 +30,7 @@
 
 import org.hawkular.metrics.clients.ptrans.ConfigurationKey;
 import org.hawkular.metrics.clients.ptrans.Service;
+import org.hawkular.metrics.clients.ptrans.data.Point;
 import org.jmxtrans.embedded.EmbeddedJmxTrans;
 import org.jmxtrans.embedded.QueryResult;
 import org.jmxtrans.embedded.config.ConfigurationParser;

diff --git a/...etrics/clients/ptrans/CanReadMatcher.java → ...ients/ptrans/matchers/CanReadMatcher.java b/...etrics/clients/ptrans/CanReadMatcher.java → ...ients/ptrans/matchers/CanReadMatcher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.matchers;
 
 import java.io.File;
 

diff --git a/...trics/clients/ptrans/ContainsMatcher.java → ...ents/ptrans/matchers/ContainsMatcher.java b/...trics/clients/ptrans/ContainsMatcher.java → ...ents/ptrans/matchers/ContainsMatcher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.matchers;
 
 import static org.hawkular.metrics.clients.ptrans.util.Arguments.checkArgument;
 

diff --git a/...etrics/clients/ptrans/HasSizeMatcher.java → ...ients/ptrans/matchers/HasSizeMatcher.java b/...etrics/clients/ptrans/HasSizeMatcher.java → ...ients/ptrans/matchers/HasSizeMatcher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.matchers;
 
 import java.io.File;
 

diff --git a/...metrics/clients/ptrans/IsFileMatcher.java → ...lients/ptrans/matchers/IsFileMatcher.java b/...metrics/clients/ptrans/IsFileMatcher.java → ...lients/ptrans/matchers/IsFileMatcher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.matchers;
 
 import java.io.File;
 

diff --git a/...cs/clients/ptrans/WriteLockedMatcher.java → ...s/ptrans/matchers/WriteLockedMatcher.java b/...cs/clients/ptrans/WriteLockedMatcher.java → ...s/ptrans/matchers/WriteLockedMatcher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.matchers;
 
 import java.io.File;
 import java.io.RandomAccessFile;

diff --git a/...s/ptrans/PrintOutputOnFailureWatcher.java → ...ans/util/PrintOutputOnFailureWatcher.java b/...s/ptrans/PrintOutputOnFailureWatcher.java → ...ans/util/PrintOutputOnFailureWatcher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.metrics.clients.ptrans;
+package org.hawkular.metrics.clients.ptrans.util;
 
 import java.io.File;
 import java.io.IOException;