- * You also can specify additional roles that have been created.
+ * You also can specify additional roles that have been created.
*
* @param importedRole A role from which to import attributes.
*/
diff --git a/splunk/com/splunk/SSLSecurityProtocol.java b/splunk/src/main/java/com/splunk/SSLSecurityProtocol.java
similarity index 100%
rename from splunk/com/splunk/SSLSecurityProtocol.java
rename to splunk/src/main/java/com/splunk/SSLSecurityProtocol.java
diff --git a/splunk/com/splunk/SavedSearch.java b/splunk/src/main/java/com/splunk/SavedSearch.java
similarity index 98%
rename from splunk/com/splunk/SavedSearch.java
rename to splunk/src/main/java/com/splunk/SavedSearch.java
index c0c49efc..b01fe17d 100644
--- a/splunk/com/splunk/SavedSearch.java
+++ b/splunk/src/main/java/com/splunk/SavedSearch.java
@@ -58,6 +58,7 @@ public void acknowledge() {
* Runs the saved search.
*
* @return The search job.
+ * @throws InterruptedException The InterruptedException instance
*/
public Job dispatch() throws InterruptedException {
return dispatch(null);
@@ -67,15 +68,16 @@ public Job dispatch() throws InterruptedException {
* Runs the saved search using dispatch arguments.
*
* @param args Dispatch arguments: args) {
+ ResponseMessage response = service.get(actionPath("history"), args);
+ return parseHistoryResponse(response);
+ }
+
+ /**
+ * Parses response message from history action path
+ *
+ * @param response
+ * @return result An array of Job
+ */
+ private Job[] parseHistoryResponse(final ResponseMessage response) {
AtomFeed feed;
try {
feed = AtomFeed.parseStream(response.getContent());
@@ -167,7 +192,7 @@ public String getActionEmailCc() {
*
* Generally, this command is a template search pipeline that is realized
* with values from the saved search. To reference saved search field
- * values, wrap them in "$". For example, use "$name$" to reference the
+ * values, wrap them in "$". For example, use "$name$" to reference the
* saved search name, or use "$search$" to reference the search query.
*
* @return The search command (or pipeline).
@@ -627,7 +652,7 @@ public String getActionSummaryIndexName() {
*
* Generally, this command is a template search pipeline that is realized
* with values from the saved search. To reference saved search field
- * values, wrap them in "$". For example, use "$name$" to reference the
+ * values, wrap them in "$". For example, use "$name$" to reference the
* saved search name, or use "$search$" to reference the search query.
*
* @return The search command (or pipeline).
@@ -903,7 +928,7 @@ public int getDispatchMaxCount() {
public int getDispatchMaxTime() {
return getInteger("dispatch.max_time");
}
-
+
/**
* Returns how frequently Splunk runs the MapReduce reduce phase
* on accumulated map values.
@@ -925,7 +950,7 @@ public int getDispatchReduceFrequency() {
public boolean getDispatchRtBackfill() {
return getDispatchRealTimeBackfill();
}
-
+
/**
* Indicates whether to back fill the real-time window for this search.
* This attribute only applies to real-time searches.
@@ -1232,7 +1257,7 @@ public void setActionEmailCc(String cc) {
*
* Generally, this command is a template search pipeline that is realized
* with values from the saved search. To reference saved search field
- * values, wrap them in "$". For example, use "$name$" to reference the
+ * values, wrap them in "$". For example, use "$name$" to reference the
* saved search name, or use "$search$" to reference the search query.
*
* @param command The search command (or pipeline).
@@ -1544,7 +1569,7 @@ public void setActionPopulateLookupTtl(String ttl) {
*
* Generally, this command is a template search pipeline that is realized
* with values from the saved search. To reference saved search field
- * values, wrap them in "$". For example, use "$name$" to reference the
+ * values, wrap them in "$". For example, use "$name$" to reference the
* saved search name, or use "$search$" to reference the search query.
*
* @param command The search command (or pipeline).
@@ -1611,7 +1636,7 @@ public void setActionRssTtl(String ttl) {
*
* Generally, this command is a template search pipeline that is realized
* with values from the saved search. To reference saved search field
- * values, wrap them in "$". For example, use "$name$" to reference the
+ * values, wrap them in "$". For example, use "$name$" to reference the
* saved search name, or use "$search$" to reference the search query.
*
* @param command The search command (or pipeline).
@@ -1699,7 +1724,7 @@ public void setActionSummaryIndexName(String name) {
*
* Generally, this command is a template search pipeline that is realized
* with values from the saved search. To reference saved search field
- * values, wrap them in "$". For example, use "$name$" to reference the
+ * values, wrap them in "$". For example, use "$name$" to reference the
* saved search name, or use "$search$" to reference the search query.
*
* @param command The search command (or pipeline).
@@ -1951,7 +1976,7 @@ public void setDisabled(boolean disabled) {
public void setDispatchBuckets(String buckets) {
setDispatchBuckets(Integer.parseInt(buckets));
}
-
+
/**
* Sets the maximum number of timeline buckets.
*
@@ -2158,7 +2183,7 @@ public void setRequestUiDispatchView(String view) {
public void setRestartOnSearchpeerAdd(boolean restart) {
setRestartOnSearchPeerAdd(restart);
}
-
+
/**
* Sets whether a real-time search managed by the scheduler is
* restarted when a search peer becomes available for this saved search.
diff --git a/splunk/com/splunk/SavedSearchCollection.java b/splunk/src/main/java/com/splunk/SavedSearchCollection.java
similarity index 100%
rename from splunk/com/splunk/SavedSearchCollection.java
rename to splunk/src/main/java/com/splunk/SavedSearchCollection.java
diff --git a/splunk/com/splunk/SavedSearchCollectionArgs.java b/splunk/src/main/java/com/splunk/SavedSearchCollectionArgs.java
similarity index 100%
rename from splunk/com/splunk/SavedSearchCollectionArgs.java
rename to splunk/src/main/java/com/splunk/SavedSearchCollectionArgs.java
diff --git a/splunk/com/splunk/SavedSearchDispatchArgs.java b/splunk/src/main/java/com/splunk/SavedSearchDispatchArgs.java
similarity index 100%
rename from splunk/com/splunk/SavedSearchDispatchArgs.java
rename to splunk/src/main/java/com/splunk/SavedSearchDispatchArgs.java
diff --git a/splunk/com/splunk/ScriptInput.java b/splunk/src/main/java/com/splunk/ScriptInput.java
similarity index 100%
rename from splunk/com/splunk/ScriptInput.java
rename to splunk/src/main/java/com/splunk/ScriptInput.java
diff --git a/splunk/com/splunk/SearchResults.java b/splunk/src/main/java/com/splunk/SearchResults.java
similarity index 100%
rename from splunk/com/splunk/SearchResults.java
rename to splunk/src/main/java/com/splunk/SearchResults.java
diff --git a/splunk/com/splunk/Service.java b/splunk/src/main/java/com/splunk/Service.java
similarity index 90%
rename from splunk/com/splunk/Service.java
rename to splunk/src/main/java/com/splunk/Service.java
index 8617a0c4..57609010 100644
--- a/splunk/com/splunk/Service.java
+++ b/splunk/src/main/java/com/splunk/Service.java
@@ -19,9 +19,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.net.Socket;
-import java.net.URLEncoder;
-import java.net.URLStreamHandler;
+import java.net.*;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
/**
@@ -66,6 +66,9 @@ public class Service extends BaseService {
/** The version of this Splunk instance, once logged in. */
public String version = null;
+ /** The type of this Splunk instance, once logged in. */
+ public String instanceType = null;
+
/** The default host name, which is used when a host name is not provided.*/
public static String DEFAULT_HOST = "localhost";
@@ -115,6 +118,7 @@ public Service(String host, int port, String scheme) {
* @param port The port number of the service.
* @param scheme Scheme for accessing the service ({@code http} or
* {@code https}).
+ * @param httpsHandler The URLStreamHandler instance
*/
public Service(String host, int port, String scheme,
URLStreamHandler httpsHandler) {
@@ -151,6 +155,7 @@ public Service(ServiceArgs args) {
this.httpsHandler = Args.get(args, "httpsHandler", null);
this.setSslSecurityProtocol(Args.get(args, "SSLSecurityProtocol", Service.getSslSecurityProtocol()));
this.addCookie((String)args.get("cookie"));
+ this.setCustomHeaders((Map) args.get("customHeaders"));
}
/**
@@ -221,7 +226,13 @@ public InputStream export(String search, Map args) {
if (!args.containsKey("segmentation")) {
args.put("segmentation", "none");
}
- ResponseMessage response = get(JobCollection.REST_PATH + "/export", args);
+ ResponseMessage response;
+
+ if(enableV2SearchApi())
+ response = post(JobCollection.REST_PATH_V2 + "/export", args);
+ else {
+ response = post(JobCollection.REST_PATH + "/export", args);
+ }
return new ExportResultsStream(response.getContent());
}
@@ -373,6 +384,7 @@ public String[] getCapabilities() {
/**
* Returns the collection of data models.
+ * @return DataModelCollection instance
*/
public DataModelCollection getDataModels() {
return new DataModelCollection(this);
@@ -582,6 +594,35 @@ public ServiceInfo getInfo() {
return new ServiceInfo(this);
}
+ /**
+ * Returns list of all applicable Cluster Master Hosts for the SearchHead Service.
+ *
+ * @return List of Cluster Master Host(s).
+ */
+ public List getClusterMasters(){
+ Entity caps = new Entity(this, "cluster/config");
+ List hosts = new ArrayList();
+ try {
+ String clusterMasterURIs = caps.getString("master_uri");
+ URL clusterMasterUrl;
+ //for multi-cluster environment, there might be more than cluster master for the searchHead
+ if(clusterMasterURIs.contains(",")){
+ String[] masterURIs = clusterMasterURIs.split(",");
+ for(String uri : masterURIs){
+ clusterMasterUrl = new URL(uri);
+ hosts.add(clusterMasterUrl.getHost());
+ }
+ }else {
+ clusterMasterUrl = new URL(clusterMasterURIs);
+ hosts.add(clusterMasterUrl.getHost());
+ }
+ return hosts;
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ return hosts;
+ }
+
/**
* Returns a collection of configured inputs.
*
@@ -1011,6 +1052,16 @@ public SavedSearchCollection getSavedSearches(Args args) {
return new SavedSearchCollection(this, args);
}
+ /**
+ * Returns a Saved Search by the provided title key.
+ *
+ * @param title The title for a job.
+ * @return A SavedSearch.
+ */
+ public SavedSearch getSavedSearch(String title) {
+ return new SavedSearch(this, JobCollection.REST_PATH + "/" + title);
+ }
+
/**
* Returns service configuration information for an instance of Splunk.
*
@@ -1093,7 +1144,7 @@ public UserCollection getUsers(Args args) {
* @return The current {@code Service} instance.
*/
public Service login() {
- if (!this.cookieStore.isEmpty() && (this.username == null || this.password == null)) {
+ if (this.cookieStore.hasSplunkAuthCookie() && (this.username == null || this.password == null)) {
return this;
}
else if (this.username == null || this.password == null) {
@@ -1128,6 +1179,7 @@ public Service login(String username, String password) {
.getTextContent();
this.token = "Splunk " + sessionKey;
this.version = this.getInfo().getVersion();
+ this.instanceType = this.getInfo().getInstanceType();
if (versionCompare("4.3") >= 0)
this.passwordEndPoint = "storage/passwords";
@@ -1211,7 +1263,7 @@ public InputStream oneshotSearch(String query, Args args) {
* @param port The port to open. This port must already have been
* created as an allowable TCP input to the service.
* @return The socket.
- * @throws java.io.IOException
+ * @throws java.io.IOException The IOException instance
*/
public Socket open(int port) throws IOException {
return new Socket(this.host, port);
@@ -1238,7 +1290,11 @@ public ResponseMessage parse(String query) {
*/
public ResponseMessage parse(String query, Map args) {
args = Args.create(args).add("q", query);
- return get("search/parser", args);
+
+ if(enableV2SearchApi())
+ return post("search/v2/parser", args);
+ else
+ return get("search/parser", args);
}
/**
@@ -1289,7 +1345,7 @@ public Job search(String query, Map args) {
*/
@Override public ResponseMessage send(String path, RequestMessage request) {
// cookieStore is a protected member of HttpService
- if (token != null && cookieStore.isEmpty()) {
+ if (token != null && !cookieStore.hasSplunkAuthCookie() ) {
request.getHeader().put("Authorization", token);
}
return super.send(fullpath(path), request);
@@ -1307,6 +1363,38 @@ public void setToken(String value) {
this.token = value;
}
+ /**
+ * Provides a session token having Splunk added before token.
+ * This method is specifically used when user just have token value.
+ *
+ * @param value The token value
+ */
+ public void setSplunkToken(String value) {
+ this.token = value.contains("Splunk") ? value : "Splunk " + value;
+ }
+
+ /**
+ * Provides a session token having Bearer added before token.
+ * This method is specifically used when user just have token value.
+ *
+ * @param value The token value
+ */
+ public void setBearerToken(String value) {
+ this.token = value.contains("Splunk") || value.contains("Bearer") ? value : "Bearer " + value;
+ }
+
+
+ public boolean enableV2SearchApi(){
+ if(null == this.instanceType){
+ this.instanceType = this.getInfo().getInstanceType();
+ }
+ if(this.instanceType.equalsIgnoreCase("cloud")) {
+ return versionIsAtLeast("9.0.2209");
+ }else{
+ return versionIsAtLeast("9.0.2");
+ }
+ }
+
/**
* Returns true if this Splunk instance's version is no earlier than
* the version specified in {@code version}.
@@ -1355,6 +1443,9 @@ boolean versionIsEarlierThan(String version) {
* or 1 if this version is greater than the given version.
*/
public int versionCompare(String otherVersion) {
+ if(null == this.version){
+ this.version = this.getInfo().getVersion();
+ }
String[] components1 = this.version.split("\\.");
String[] components2 = otherVersion.split("\\.");
int numComponents = Math.max(components1.length, components2.length);
diff --git a/splunk/com/splunk/ServiceArgs.java b/splunk/src/main/java/com/splunk/ServiceArgs.java
similarity index 94%
rename from splunk/com/splunk/ServiceArgs.java
rename to splunk/src/main/java/com/splunk/ServiceArgs.java
index 38670741..bf8f7f03 100644
--- a/splunk/com/splunk/ServiceArgs.java
+++ b/splunk/src/main/java/com/splunk/ServiceArgs.java
@@ -17,6 +17,7 @@
package com.splunk;
import java.net.URLStreamHandler;
+import java.util.Map;
/**
* The {@code ServiceArgs} class contains a collection of arguments that are
@@ -164,4 +165,12 @@ public void setUsername(String username) {
public void setCookie(String cookie) {
this.put("cookie", cookie);
}
+
+ /**
+ * @param httpHeaders
+ * A map of customHeaders.
+ */
+ public void setHttpHeaders(Map httpHeaders) {
+ this.put("customHeaders", httpHeaders);
+ }
}
diff --git a/splunk/com/splunk/ServiceInfo.java b/splunk/src/main/java/com/splunk/ServiceInfo.java
similarity index 98%
rename from splunk/com/splunk/ServiceInfo.java
rename to splunk/src/main/java/com/splunk/ServiceInfo.java
index 72f556bd..16ec8aaa 100644
--- a/splunk/com/splunk/ServiceInfo.java
+++ b/splunk/src/main/java/com/splunk/ServiceInfo.java
@@ -155,6 +155,8 @@ public String getVersion() {
return getString("version");
}
+ public String getInstanceType() {return getString("instance_type", "");}
+
/**
* Indicates whether this Splunk instance is running under a free license.
*
diff --git a/splunk/com/splunk/Settings.java b/splunk/src/main/java/com/splunk/Settings.java
similarity index 100%
rename from splunk/com/splunk/Settings.java
rename to splunk/src/main/java/com/splunk/Settings.java
diff --git a/splunk/com/splunk/SimpleCookieStore.java b/splunk/src/main/java/com/splunk/SimpleCookieStore.java
similarity index 86%
rename from splunk/com/splunk/SimpleCookieStore.java
rename to splunk/src/main/java/com/splunk/SimpleCookieStore.java
index afc1219c..4fd60664 100644
--- a/splunk/com/splunk/SimpleCookieStore.java
+++ b/splunk/src/main/java/com/splunk/SimpleCookieStore.java
@@ -28,6 +28,8 @@
*/
class SimpleCookieStore {
+ public static final String SPLUNK_AUTH_COOKIE = "splunkd_";
+
private Map cookieJar = new HashMap();
/**
* Adds cookies from a "Set-Cookie" header to the cookie store.
@@ -69,6 +71,18 @@ public Boolean isEmpty() {
return cookieJar.isEmpty();
}
+ public boolean hasSplunkAuthCookie(){
+ if(cookieJar.isEmpty()){
+ return false;
+ }
+ for(String cookie : cookieJar.keySet()){
+ if(cookie.startsWith(SPLUNK_AUTH_COOKIE)){
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Removes all cookies from SimpleCookieStore
*/
diff --git a/splunk/com/splunk/SortDirection.java b/splunk/src/main/java/com/splunk/SortDirection.java
similarity index 100%
rename from splunk/com/splunk/SortDirection.java
rename to splunk/src/main/java/com/splunk/SortDirection.java
diff --git a/splunk/com/splunk/SplunkException.java b/splunk/src/main/java/com/splunk/SplunkException.java
similarity index 100%
rename from splunk/com/splunk/SplunkException.java
rename to splunk/src/main/java/com/splunk/SplunkException.java
diff --git a/splunk/com/splunk/StatsFunction.java b/splunk/src/main/java/com/splunk/StatsFunction.java
similarity index 100%
rename from splunk/com/splunk/StatsFunction.java
rename to splunk/src/main/java/com/splunk/StatsFunction.java
diff --git a/splunk/com/splunk/StreamIterableBase.java b/splunk/src/main/java/com/splunk/StreamIterableBase.java
similarity index 95%
rename from splunk/com/splunk/StreamIterableBase.java
rename to splunk/src/main/java/com/splunk/StreamIterableBase.java
index 8f69e8f1..8c423d3d 100644
--- a/splunk/com/splunk/StreamIterableBase.java
+++ b/splunk/src/main/java/com/splunk/StreamIterableBase.java
@@ -61,7 +61,7 @@ public void remove() {
/**
* Get the next element.
* @return null if the end is reached.
- * @throws IOException
+ * @throws IOException The IOException instance
*/
abstract T getNextElement() throws IOException;
diff --git a/splunk/com/splunk/StringComparison.java b/splunk/src/main/java/com/splunk/StringComparison.java
similarity index 100%
rename from splunk/com/splunk/StringComparison.java
rename to splunk/src/main/java/com/splunk/StringComparison.java
diff --git a/splunk/com/splunk/StringPivotColumnSplit.java b/splunk/src/main/java/com/splunk/StringPivotColumnSplit.java
similarity index 100%
rename from splunk/com/splunk/StringPivotColumnSplit.java
rename to splunk/src/main/java/com/splunk/StringPivotColumnSplit.java
diff --git a/splunk/com/splunk/StringPivotFilter.java b/splunk/src/main/java/com/splunk/StringPivotFilter.java
similarity index 100%
rename from splunk/com/splunk/StringPivotFilter.java
rename to splunk/src/main/java/com/splunk/StringPivotFilter.java
diff --git a/splunk/com/splunk/StringPivotRowSplit.java b/splunk/src/main/java/com/splunk/StringPivotRowSplit.java
similarity index 100%
rename from splunk/com/splunk/StringPivotRowSplit.java
rename to splunk/src/main/java/com/splunk/StringPivotRowSplit.java
diff --git a/splunk/com/splunk/TcpConnections.java b/splunk/src/main/java/com/splunk/TcpConnections.java
similarity index 100%
rename from splunk/com/splunk/TcpConnections.java
rename to splunk/src/main/java/com/splunk/TcpConnections.java
diff --git a/splunk/com/splunk/TcpInput.java b/splunk/src/main/java/com/splunk/TcpInput.java
similarity index 97%
rename from splunk/com/splunk/TcpInput.java
rename to splunk/src/main/java/com/splunk/TcpInput.java
index 57e434e4..29faa6b5 100644
--- a/splunk/com/splunk/TcpInput.java
+++ b/splunk/src/main/java/com/splunk/TcpInput.java
@@ -39,6 +39,8 @@ public class TcpInput extends PortInput {
/**
* Returns a socket attached to this raw TCP input.
+ * @return Socket instance
+ * @throws IOException The IOException instance
*/
public Socket attach() throws IOException {
return new Socket(this.service.getHost(), this.getPort());
@@ -54,7 +56,9 @@ public Socket attach() throws IOException {
* How to
* get data into Splunk on
* dev.splunk.com.
+ * target="_blank">dev.splunk.com.
+ * @param behavior The ReceiverBehavior instance
+ * @throws IOException The IOException instance
*/
public void attachWith(ReceiverBehavior behavior) throws IOException {
Socket socket = null;
@@ -249,6 +253,7 @@ public void setIndex(String index) {
* @see #attachWith
*
* @param eventBody A string that contains the event.
+ * @throws IOException The IOException instance
*/
public void submit(String eventBody) throws IOException {
Socket socket = null;
diff --git a/splunk/com/splunk/TcpSplunkInput.java b/splunk/src/main/java/com/splunk/TcpSplunkInput.java
similarity index 100%
rename from splunk/com/splunk/TcpSplunkInput.java
rename to splunk/src/main/java/com/splunk/TcpSplunkInput.java
diff --git a/splunk/com/splunk/TimestampBinning.java b/splunk/src/main/java/com/splunk/TimestampBinning.java
similarity index 100%
rename from splunk/com/splunk/TimestampBinning.java
rename to splunk/src/main/java/com/splunk/TimestampBinning.java
diff --git a/splunk/com/splunk/TimestampPivotColumnSplit.java b/splunk/src/main/java/com/splunk/TimestampPivotColumnSplit.java
similarity index 100%
rename from splunk/com/splunk/TimestampPivotColumnSplit.java
rename to splunk/src/main/java/com/splunk/TimestampPivotColumnSplit.java
diff --git a/splunk/com/splunk/TimestampPivotRowSplit.java b/splunk/src/main/java/com/splunk/TimestampPivotRowSplit.java
similarity index 100%
rename from splunk/com/splunk/TimestampPivotRowSplit.java
rename to splunk/src/main/java/com/splunk/TimestampPivotRowSplit.java
diff --git a/splunk/com/splunk/UdpConnections.java b/splunk/src/main/java/com/splunk/UdpConnections.java
similarity index 100%
rename from splunk/com/splunk/UdpConnections.java
rename to splunk/src/main/java/com/splunk/UdpConnections.java
diff --git a/splunk/com/splunk/UdpInput.java b/splunk/src/main/java/com/splunk/UdpInput.java
similarity index 99%
rename from splunk/com/splunk/UdpInput.java
rename to splunk/src/main/java/com/splunk/UdpInput.java
index a68bf5a8..baa6ff7d 100644
--- a/splunk/com/splunk/UdpInput.java
+++ b/splunk/src/main/java/com/splunk/UdpInput.java
@@ -257,6 +257,7 @@ public void setSourceType(String sourcetype) {
* Send a string to this UDP input.
*
* @param eventBody The text to send.
+ * @throws IOException The IOException instance
*/
public void submit(String eventBody) throws IOException {
DatagramSocket socket = new DatagramSocket();
diff --git a/splunk/com/splunk/Upload.java b/splunk/src/main/java/com/splunk/Upload.java
similarity index 100%
rename from splunk/com/splunk/Upload.java
rename to splunk/src/main/java/com/splunk/Upload.java
diff --git a/splunk/com/splunk/User.java b/splunk/src/main/java/com/splunk/User.java
similarity index 100%
rename from splunk/com/splunk/User.java
rename to splunk/src/main/java/com/splunk/User.java
diff --git a/splunk/com/splunk/UserCollection.java b/splunk/src/main/java/com/splunk/UserCollection.java
similarity index 100%
rename from splunk/com/splunk/UserCollection.java
rename to splunk/src/main/java/com/splunk/UserCollection.java
diff --git a/splunk/com/splunk/Util.java b/splunk/src/main/java/com/splunk/Util.java
similarity index 100%
rename from splunk/com/splunk/Util.java
rename to splunk/src/main/java/com/splunk/Util.java
diff --git a/splunk/com/splunk/Value.java b/splunk/src/main/java/com/splunk/Value.java
similarity index 100%
rename from splunk/com/splunk/Value.java
rename to splunk/src/main/java/com/splunk/Value.java
diff --git a/splunk/com/splunk/WindowsActiveDirectoryInput.java b/splunk/src/main/java/com/splunk/WindowsActiveDirectoryInput.java
similarity index 100%
rename from splunk/com/splunk/WindowsActiveDirectoryInput.java
rename to splunk/src/main/java/com/splunk/WindowsActiveDirectoryInput.java
diff --git a/splunk/com/splunk/WindowsEventLogInput.java b/splunk/src/main/java/com/splunk/WindowsEventLogInput.java
similarity index 100%
rename from splunk/com/splunk/WindowsEventLogInput.java
rename to splunk/src/main/java/com/splunk/WindowsEventLogInput.java
diff --git a/splunk/com/splunk/WindowsPerfmonInput.java b/splunk/src/main/java/com/splunk/WindowsPerfmonInput.java
similarity index 100%
rename from splunk/com/splunk/WindowsPerfmonInput.java
rename to splunk/src/main/java/com/splunk/WindowsPerfmonInput.java
diff --git a/splunk/com/splunk/WindowsRegistryInput.java b/splunk/src/main/java/com/splunk/WindowsRegistryInput.java
similarity index 100%
rename from splunk/com/splunk/WindowsRegistryInput.java
rename to splunk/src/main/java/com/splunk/WindowsRegistryInput.java
diff --git a/splunk/com/splunk/WindowsWmiInput.java b/splunk/src/main/java/com/splunk/WindowsWmiInput.java
similarity index 100%
rename from splunk/com/splunk/WindowsWmiInput.java
rename to splunk/src/main/java/com/splunk/WindowsWmiInput.java
diff --git a/splunk/com/splunk/Xml.java b/splunk/src/main/java/com/splunk/Xml.java
similarity index 87%
rename from splunk/com/splunk/Xml.java
rename to splunk/src/main/java/com/splunk/Xml.java
index 516e5f20..ef582f72 100644
--- a/splunk/com/splunk/Xml.java
+++ b/splunk/src/main/java/com/splunk/Xml.java
@@ -52,6 +52,10 @@ public static Document parse(InputStream input, boolean silent) {
try {
DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ factory.setExpandEntityReferences(false);
+ factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
factory.setNamespaceAware(false);
DocumentBuilder builder = factory.newDocumentBuilder();
if (silent)
diff --git a/splunk/com/splunk/modularinput/Argument.java b/splunk/src/main/java/com/splunk/modularinput/Argument.java
similarity index 100%
rename from splunk/com/splunk/modularinput/Argument.java
rename to splunk/src/main/java/com/splunk/modularinput/Argument.java
diff --git a/splunk/com/splunk/modularinput/Event.java b/splunk/src/main/java/com/splunk/modularinput/Event.java
similarity index 100%
rename from splunk/com/splunk/modularinput/Event.java
rename to splunk/src/main/java/com/splunk/modularinput/Event.java
diff --git a/splunk/com/splunk/modularinput/EventWriter.java b/splunk/src/main/java/com/splunk/modularinput/EventWriter.java
similarity index 96%
rename from splunk/com/splunk/modularinput/EventWriter.java
rename to splunk/src/main/java/com/splunk/modularinput/EventWriter.java
index 8bb6858c..c6ce3425 100755
--- a/splunk/com/splunk/modularinput/EventWriter.java
+++ b/splunk/src/main/java/com/splunk/modularinput/EventWriter.java
@@ -102,6 +102,7 @@ protected void setError() {
* {@code EventWriter} does not throw {@code IOException} errors, but does not ignore them entirely either. Instead it operates
* the same way as {@code PrintStream} in the standard library. You can always check if an {@code IOException} has been thrown
* by calling {@code checkError}.
+ * @return boolean value
*/
public boolean checkError() {
return hadIOException;
@@ -110,6 +111,8 @@ public boolean checkError() {
/**
* Thread safe version of {@code writeEvent}.
* @see #writeEvent
+ * @param event The Event instance
+ * @throws MalformedDataException The MalformedDataException instance
*/
public synchronized void synchronizedWriteEvent(Event event) throws MalformedDataException {
writeEvent(event);
@@ -123,7 +126,7 @@ public synchronized void synchronizedWriteEvent(Event event) throws MalformedDat
*
* @see #synchronizedWriteEvent
* @param event The {@code Event} object to write.
- * @throws MalformedDataException
+ * @throws MalformedDataException The MalformedDataException instance
*/
public void writeEvent(Event event) throws MalformedDataException {
try {
@@ -144,6 +147,8 @@ public void writeEvent(Event event) throws MalformedDataException {
/**
* Thread safe version of {@code log}.
* @see #log
+ * @param severity String value
+ * @param errorMessage String value
*/
public synchronized void synchronizedLog(String severity, String errorMessage) {
log(severity, errorMessage);
diff --git a/splunk/com/splunk/modularinput/InputDefinition.java b/splunk/src/main/java/com/splunk/modularinput/InputDefinition.java
similarity index 95%
rename from splunk/com/splunk/modularinput/InputDefinition.java
rename to splunk/src/main/java/com/splunk/modularinput/InputDefinition.java
index 36ad8d4c..f7431e78 100755
--- a/splunk/com/splunk/modularinput/InputDefinition.java
+++ b/splunk/src/main/java/com/splunk/modularinput/InputDefinition.java
@@ -68,6 +68,7 @@ public String getField(String fieldName) {
/**
* Sets the name of the server on which this modular input is being run.
+ * @param serverHost String value
*/
public void setServerHost(String serverHost) {
this.metadata.put(serverHostField, serverHost);
@@ -174,6 +175,10 @@ public static InputDefinition parseDefinition(InputStream stream) throws ParserC
IOException, SAXException, MalformedDataException {
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setIgnoringElementContentWhitespace(true);
+ documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ documentBuilderFactory.setExpandEntityReferences(false);
+ documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
Document doc = documentBuilder.parse(stream);
diff --git a/splunk/com/splunk/modularinput/MalformedDataException.java b/splunk/src/main/java/com/splunk/modularinput/MalformedDataException.java
similarity index 100%
rename from splunk/com/splunk/modularinput/MalformedDataException.java
rename to splunk/src/main/java/com/splunk/modularinput/MalformedDataException.java
diff --git a/splunk/com/splunk/modularinput/MultiValueParameter.java b/splunk/src/main/java/com/splunk/modularinput/MultiValueParameter.java
similarity index 100%
rename from splunk/com/splunk/modularinput/MultiValueParameter.java
rename to splunk/src/main/java/com/splunk/modularinput/MultiValueParameter.java
diff --git a/splunk/com/splunk/modularinput/NonblockingInputStream.java b/splunk/src/main/java/com/splunk/modularinput/NonblockingInputStream.java
similarity index 100%
rename from splunk/com/splunk/modularinput/NonblockingInputStream.java
rename to splunk/src/main/java/com/splunk/modularinput/NonblockingInputStream.java
diff --git a/splunk/com/splunk/modularinput/Parameter.java b/splunk/src/main/java/com/splunk/modularinput/Parameter.java
similarity index 100%
rename from splunk/com/splunk/modularinput/Parameter.java
rename to splunk/src/main/java/com/splunk/modularinput/Parameter.java
diff --git a/splunk/com/splunk/modularinput/Scheme.java b/splunk/src/main/java/com/splunk/modularinput/Scheme.java
similarity index 100%
rename from splunk/com/splunk/modularinput/Scheme.java
rename to splunk/src/main/java/com/splunk/modularinput/Scheme.java
diff --git a/splunk/com/splunk/modularinput/Script.java b/splunk/src/main/java/com/splunk/modularinput/Script.java
similarity index 95%
rename from splunk/com/splunk/modularinput/Script.java
rename to splunk/src/main/java/com/splunk/modularinput/Script.java
index 249b61ed..96447c73 100755
--- a/splunk/com/splunk/modularinput/Script.java
+++ b/splunk/src/main/java/com/splunk/modularinput/Script.java
@@ -149,6 +149,7 @@ protected String stackTraceToLogEntry(Exception e) {
* The default implementation always passes.
*
* @param definition The parameters for the proposed input passed by splunkd.
+ * @throws Exception The exception instance
*/
public void validateInput(ValidationDefinition definition) throws Exception {}
@@ -156,7 +157,11 @@ public void validateInput(ValidationDefinition definition) throws Exception {}
* Streams events into Splunk. It should do all of its output via
* {@code EventWriter} rather than assuming that there is a console attached.
*
+ * @param inputs InputDefinition instance
* @param ew An object with methods to write events and log messages to Splunk.
+ * @throws MalformedDataException The MalformedDataException instance
+ * @throws XMLStreamException The XMLStreamException instance
+ * @throws IOException The IOException instance
*/
public abstract void streamEvents(InputDefinition inputs, EventWriter ew)
throws MalformedDataException, XMLStreamException, IOException;
diff --git a/splunk/com/splunk/modularinput/SingleValueParameter.java b/splunk/src/main/java/com/splunk/modularinput/SingleValueParameter.java
similarity index 100%
rename from splunk/com/splunk/modularinput/SingleValueParameter.java
rename to splunk/src/main/java/com/splunk/modularinput/SingleValueParameter.java
diff --git a/splunk/com/splunk/modularinput/ValidationDefinition.java b/splunk/src/main/java/com/splunk/modularinput/ValidationDefinition.java
similarity index 95%
rename from splunk/com/splunk/modularinput/ValidationDefinition.java
rename to splunk/src/main/java/com/splunk/modularinput/ValidationDefinition.java
index e6899a05..3ce60106 100755
--- a/splunk/com/splunk/modularinput/ValidationDefinition.java
+++ b/splunk/src/main/java/com/splunk/modularinput/ValidationDefinition.java
@@ -194,6 +194,10 @@ public static ValidationDefinition parseDefinition(InputStream stream) throws Pa
IOException, SAXException, MalformedDataException {
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setIgnoringElementContentWhitespace(true);
+ documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ documentBuilderFactory.setExpandEntityReferences(false);
+ documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
Document doc = documentBuilder.parse(stream);
diff --git a/splunk/com/splunk/modularinput/XmlUtil.java b/splunk/src/main/java/com/splunk/modularinput/XmlUtil.java
similarity index 94%
rename from splunk/com/splunk/modularinput/XmlUtil.java
rename to splunk/src/main/java/com/splunk/modularinput/XmlUtil.java
index 0798d97a..3082aa47 100755
--- a/splunk/com/splunk/modularinput/XmlUtil.java
+++ b/splunk/src/main/java/com/splunk/modularinput/XmlUtil.java
@@ -35,10 +35,12 @@ class XmlUtil {
*/
static String textInNode(Node node, String errorMessage) throws MalformedDataException {
Node child = node.getFirstChild();
- if (child.getNodeType() != Node.TEXT_NODE) {
+ if (null == child) {
+ return "";
+ } else if (child.getNodeType() != Node.TEXT_NODE) {
throw new MalformedDataException(errorMessage);
} else {
- return ((Text)child).getData();
+ return ((Text) child).getData();
}
}
diff --git a/tests/com/splunk/ApplicationTest.java b/splunk/src/test/java/com/splunk/ApplicationTest.java
similarity index 96%
rename from tests/com/splunk/ApplicationTest.java
rename to splunk/src/test/java/com/splunk/ApplicationTest.java
index 356b5d5e..df8afe2a 100644
--- a/tests/com/splunk/ApplicationTest.java
+++ b/splunk/src/test/java/com/splunk/ApplicationTest.java
@@ -16,10 +16,7 @@
package com.splunk;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -88,18 +85,18 @@ public void testForSetupPresent() throws Exception {
installApplicationFromTestData("has_setup_xml");
Assert.assertTrue(service.getApplications().containsKey("has_setup_xml"));
Application applicationWithSetupXml = service.getApplications().get("has_setup_xml");
-
+
ApplicationSetup applicationSetup = applicationWithSetupXml.setup();
Assert.assertEquals("has_setup_xml", applicationSetup.getName());
Assert.assertFalse(applicationSetup.getRefresh());
-
+
String setupXml = applicationSetup.getSetupXml();
Document parsedSetupXml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(
new ByteArrayInputStream(setupXml.getBytes("UTF-8")));
parsedSetupXml.getDocumentElement().normalize();
-
+
Assert.assertEquals(parsedSetupXml.getDocumentElement().getNodeName(), "SetupInfo");
-
+
NodeList blocks = parsedSetupXml.getDocumentElement().getElementsByTagName("block");
Assert.assertEquals(1, blocks.getLength());
Node block = blocks.item(0);
diff --git a/tests/com/splunk/ArgsTest.java b/splunk/src/test/java/com/splunk/ArgsTest.java
similarity index 100%
rename from tests/com/splunk/ArgsTest.java
rename to splunk/src/test/java/com/splunk/ArgsTest.java
diff --git a/tests/com/splunk/AtomFeedTest.java b/splunk/src/test/java/com/splunk/AtomFeedTest.java
similarity index 96%
rename from tests/com/splunk/AtomFeedTest.java
rename to splunk/src/test/java/com/splunk/AtomFeedTest.java
index 2142d082..e534e21a 100644
--- a/tests/com/splunk/AtomFeedTest.java
+++ b/splunk/src/test/java/com/splunk/AtomFeedTest.java
@@ -38,7 +38,7 @@ public class AtomFeedTest {
private static Map expectedData = reader.fromJson(
SDKTestCase.streamToString(
SDKTestCase.openResource(
- "data/atom_test_data.json")),
+ "/data/atom_test_data.json")),
Map.class);
private Map expectedFeed;
@@ -48,7 +48,7 @@ public class AtomFeedTest {
public AtomFeedTest(String testName) {
this.testName = testName;
this.expectedFeed = (Map)expectedData.get(testName);
- this.xmlStream = SDKTestCase.openResource("data/atom/" + testName + ".xml");
+ this.xmlStream = SDKTestCase.openResource("/data/atom/" + testName + ".xml");
}
@Test
diff --git a/tests/com/splunk/ConfigurationTest.java b/splunk/src/test/java/com/splunk/ConfigurationTest.java
similarity index 100%
rename from tests/com/splunk/ConfigurationTest.java
rename to splunk/src/test/java/com/splunk/ConfigurationTest.java
diff --git a/tests/com/splunk/CookieTest.java b/splunk/src/test/java/com/splunk/CookieTest.java
similarity index 86%
rename from tests/com/splunk/CookieTest.java
rename to splunk/src/test/java/com/splunk/CookieTest.java
index f49b18d2..d11cda76 100644
--- a/tests/com/splunk/CookieTest.java
+++ b/splunk/src/test/java/com/splunk/CookieTest.java
@@ -16,13 +16,11 @@
package com.splunk;
+import java.net.HttpCookie;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
public class CookieTest extends SDKTestCase {
@@ -124,6 +122,32 @@ public void testLoginWithMultipleCookies() {
s.getSettings().refresh();
}
+ @Test
+ public void testLoginWithOtherCookies() {
+ String otherCookies = "load=balancer;";
+ service.logout();
+ service.cookieStore.removeAll();
+ service.cookieStore.add(otherCookies);
+ service.login();
+ service.getApplications();
+ service.cookieStore.removeAll();
+ }
+
+ @Test
+ public void testUsingAuthTokenAndOtherCookie(){
+ String validToken = service.getToken();
+ Assert.assertTrue(validToken.startsWith("Splunk "));
+ String otherCookies = "load=balancer;";
+ Map args = new HashMap<>();
+ args.put("cookie", otherCookies);
+ args.put("host",service.getHost());
+ args.put("port", service.getPort());
+ Service s = new Service(args);
+ s.setToken(validToken);
+ s.getApplications();
+ Assert.assertEquals(otherCookies.trim(),s.cookieStore.getCookies().trim());
+ }
+
@Test
public void testLoginWithMultipleInvalidCookies() {
String validCookie = service.stringifyCookies();
diff --git a/tests/com/splunk/DataModelTest.java b/splunk/src/test/java/com/splunk/DataModelTest.java
similarity index 92%
rename from tests/com/splunk/DataModelTest.java
rename to splunk/src/test/java/com/splunk/DataModelTest.java
index 5d1a8bc6..2a8585e8 100644
--- a/tests/com/splunk/DataModelTest.java
+++ b/splunk/src/test/java/com/splunk/DataModelTest.java
@@ -39,7 +39,7 @@ public void testDataModelCollectionCreateAndDelete() {
EntityCollection dataModels = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/empty_data_model.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/empty_data_model.json")));
int initialN = dataModels.size();
@@ -65,7 +65,7 @@ public void testDataModelWithZeroObjects() {
EntityCollection dataModels = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/empty_data_model.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/empty_data_model.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
Assert.assertEquals(0, model.getObjects().size());
@@ -80,7 +80,7 @@ public void testDataModelWithOneObject() {
EntityCollection dataModels = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/object_with_one_search.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/object_with_one_search.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
Assert.assertEquals(1, model.getObjects().size());
@@ -95,7 +95,7 @@ public void testDataModelWithTwoObjects() {
EntityCollection dataModels = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/object_with_two_searches.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/object_with_two_searches.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
Assert.assertEquals(2, model.getObjects().size());
@@ -110,7 +110,7 @@ public void testGetAndContainsObjectWork() {
EntityCollection dataModels = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/object_with_two_searches.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/object_with_two_searches.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
Assert.assertTrue(model.containsObject("search1"));
@@ -132,7 +132,7 @@ public void testDataModelWithUnicodeAttributes() {
String modelName = createTemporaryName();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/model_with_unicode_headers.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/model_with_unicode_headers.json")));
DataModel model = dataModels.create(modelName, args);
Assert.assertEquals(modelName, model.getName());
@@ -147,7 +147,7 @@ public void testDataModelWithEmptyAttributes() {
String modelName = createTemporaryName();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/model_with_empty_headers.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/model_with_empty_headers.json")));
DataModel model = dataModels.create(modelName, args);
Assert.assertEquals(modelName, model.getName());
@@ -170,17 +170,20 @@ public void testAccelerationSettings() {
EntityCollection dataModels = nonprivateService.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/data_model_with_test_objects.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/data_model_with_test_objects.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
+ final String crontabA = "*/5 * * * *";
+ final String crontabB = "* * * * *";
+
model.setAcceleration(true);
model.setEarliestAcceleratedTime("-2mon");
- model.setAccelerationCronSchedule("5/* * * * *");
+ model.setAccelerationCronSchedule(crontabA);
model.update();
Assert.assertTrue(model.isAccelerated());
Assert.assertEquals("-2mon", model.getEarliestAcceleratedTime());
- Assert.assertEquals("5/* * * * *", model.getAccelerationCronSchedule());
+ Assert.assertEquals(crontabA, model.getAccelerationCronSchedule());
Assert.assertFalse(model.isManualRebuilds());
model.update(); // An empty update should also work
@@ -188,25 +191,27 @@ public void testAccelerationSettings() {
Assert.assertTrue(model.isAccelerated());
Assert.assertEquals("-2mon", model.getEarliestAcceleratedTime());
- Assert.assertEquals("5/* * * * *", model.getAccelerationCronSchedule());
+ Assert.assertEquals(crontabA, model.getAccelerationCronSchedule());
Assert.assertFalse(model.isManualRebuilds());
model.setAcceleration(false);
model.setEarliestAcceleratedTime("-1mon");
- model.setAccelerationCronSchedule("* * * * *");
+ model.setAccelerationCronSchedule(crontabB);
model.update();
Assert.assertFalse(model.isAccelerated());
Assert.assertEquals("-1mon", model.getEarliestAcceleratedTime());
- Assert.assertEquals("* * * * *", model.getAccelerationCronSchedule());
+ Assert.assertEquals(crontabB, model.getAccelerationCronSchedule());
Assert.assertFalse(model.isManualRebuilds());
model.setManualRebuilds(true);
+ // Acceleration must be set, or splunkd will crash
+ model.setAcceleration(false);
model.update();
Assert.assertFalse(model.isAccelerated());
Assert.assertEquals("-1mon", model.getEarliestAcceleratedTime());
- Assert.assertEquals("* * * * *", model.getAccelerationCronSchedule());
+ Assert.assertEquals(crontabB, model.getAccelerationCronSchedule());
Assert.assertTrue(model.isManualRebuilds());
}
@@ -215,7 +220,7 @@ public void testObjectMetadata() {
DataModelCollection models = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/data_model_with_test_objects.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/data_model_with_test_objects.json")));
DataModel model = models.create(createTemporaryName(), args);
DataModelObject object = model.getObject("event1");
@@ -231,7 +236,7 @@ public void testParentOnChild() {
DataModelCollection models = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/data_model_with_test_objects.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/data_model_with_test_objects.json")));
DataModel model = models.create(createTemporaryName(), args);
DataModelObject object = model.getObject("event1");
@@ -245,7 +250,7 @@ public void testLineage() {
DataModelCollection models = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/inheritance_test_data.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/inheritance_test_data.json")));
DataModel model = models.create(createTemporaryName(), args);
Collection children;
@@ -271,7 +276,7 @@ public void testObjectFields() {
DataModelCollection models = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/inheritance_test_data.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/inheritance_test_data.json")));
DataModel model = models.create(createTemporaryName(), args);
DataModelObject object = model.getObject("level_2");
@@ -308,7 +313,7 @@ public void testOutputObjectFields() {
DataModelCollection models = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/data_model_for_pivot.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/data_model_for_pivot.json")));
DataModel model = models.create(createTemporaryName(), args);
DataModelObject object = model.getObject("test_data");
@@ -325,7 +330,7 @@ public void testCreateLocalAccelerationJob() {
String dataModelName = createTemporaryName();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/inheritance_test_data.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/inheritance_test_data.json")));
DataModel model = models.create(dataModelName, args);
DataModelObject object = model.getObject("level_2");
@@ -356,7 +361,7 @@ public void testCreateLocalAccelerationJobWithEarliestTime() {
String dataModelName = createTemporaryName();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/inheritance_test_data.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/inheritance_test_data.json")));
DataModel model = models.create(dataModelName, args);
DataModelObject object = model.getObject("level_2");
@@ -387,7 +392,7 @@ public void testConstraints() {
EntityCollection dataModels = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/data_model_with_test_objects.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/data_model_with_test_objects.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
DataModelObject object = model.getObject("event1");
@@ -409,7 +414,7 @@ public void testCalculations() {
EntityCollection dataModels = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/data_model_with_test_objects.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/data_model_with_test_objects.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
DataModelObject object = model.getObject("event1");
@@ -505,7 +510,7 @@ public void testBaseSearchProperlyParsed() {
EntityCollection dataModels = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/model_with_multiple_types.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/model_with_multiple_types.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
DataModelObject object = model.getObject("search1");
@@ -522,7 +527,7 @@ public void testBaseTransactionProperlyParsed() {
EntityCollection dataModels = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/model_with_multiple_types.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/model_with_multiple_types.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
DataModelObject object = model.getObject("transaction1");
diff --git a/tests/com/splunk/DeploymentClientTest.java b/splunk/src/test/java/com/splunk/DeploymentClientTest.java
similarity index 100%
rename from tests/com/splunk/DeploymentClientTest.java
rename to splunk/src/test/java/com/splunk/DeploymentClientTest.java
diff --git a/tests/com/splunk/DeploymentServerClassTest.java b/splunk/src/test/java/com/splunk/DeploymentServerClassTest.java
similarity index 99%
rename from tests/com/splunk/DeploymentServerClassTest.java
rename to splunk/src/test/java/com/splunk/DeploymentServerClassTest.java
index 13c5532f..94dc00e8 100644
--- a/tests/com/splunk/DeploymentServerClassTest.java
+++ b/splunk/src/test/java/com/splunk/DeploymentServerClassTest.java
@@ -17,7 +17,6 @@
package com.splunk;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/com/splunk/DeploymentServerTest.java b/splunk/src/test/java/com/splunk/DeploymentServerTest.java
similarity index 98%
rename from tests/com/splunk/DeploymentServerTest.java
rename to splunk/src/test/java/com/splunk/DeploymentServerTest.java
index 15c5f51b..ba75489f 100644
--- a/tests/com/splunk/DeploymentServerTest.java
+++ b/splunk/src/test/java/com/splunk/DeploymentServerTest.java
@@ -17,7 +17,6 @@
package com.splunk;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
public class DeploymentServerTest extends SDKTestCase {
diff --git a/tests/com/splunk/DeploymentTenantTest.java b/splunk/src/test/java/com/splunk/DeploymentTenantTest.java
similarity index 98%
rename from tests/com/splunk/DeploymentTenantTest.java
rename to splunk/src/test/java/com/splunk/DeploymentTenantTest.java
index 95129079..153b1064 100644
--- a/tests/com/splunk/DeploymentTenantTest.java
+++ b/splunk/src/test/java/com/splunk/DeploymentTenantTest.java
@@ -17,7 +17,6 @@
package com.splunk;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
public class DeploymentTenantTest extends SDKTestCase {
diff --git a/tests/com/splunk/DistributedConfTest.java b/splunk/src/test/java/com/splunk/DistributedConfTest.java
similarity index 100%
rename from tests/com/splunk/DistributedConfTest.java
rename to splunk/src/test/java/com/splunk/DistributedConfTest.java
diff --git a/tests/com/splunk/DistributedPeerTest.java b/splunk/src/test/java/com/splunk/DistributedPeerTest.java
similarity index 100%
rename from tests/com/splunk/DistributedPeerTest.java
rename to splunk/src/test/java/com/splunk/DistributedPeerTest.java
diff --git a/tests/com/splunk/EntityTest.java b/splunk/src/test/java/com/splunk/EntityTest.java
similarity index 100%
rename from tests/com/splunk/EntityTest.java
rename to splunk/src/test/java/com/splunk/EntityTest.java
diff --git a/tests/com/splunk/EventTypesTest.java b/splunk/src/test/java/com/splunk/EventTypesTest.java
similarity index 100%
rename from tests/com/splunk/EventTypesTest.java
rename to splunk/src/test/java/com/splunk/EventTypesTest.java
diff --git a/tests/com/splunk/ExportResultsReaderTest.java b/splunk/src/test/java/com/splunk/ExportResultsReaderTest.java
similarity index 93%
rename from tests/com/splunk/ExportResultsReaderTest.java
rename to splunk/src/test/java/com/splunk/ExportResultsReaderTest.java
index a6128b4d..0c460372 100644
--- a/tests/com/splunk/ExportResultsReaderTest.java
+++ b/splunk/src/test/java/com/splunk/ExportResultsReaderTest.java
@@ -40,7 +40,7 @@ public class ExportResultsReaderTest {
private static Map expectedData = reader.fromJson(
SDKTestCase.streamToString(
SDKTestCase.openResource(
- "data/export_test_data.json")),
+ "/data/export_test_data.json")),
Map.class
);
@@ -70,7 +70,7 @@ public void testExportWithoutPreview() throws IOException, XMLStreamException {
InputStream xmlStream = new ExportResultsStream(
SDKTestCase.openResource(
- "data/export/" + this.version + "/export_results.xml"));
+ "/data/export/" + this.version + "/export_results.xml"));
ResultsReaderXml resultsReader = new ResultsReaderXml(xmlStream);
ResultsReaderTestFromExpectedFile.verifyResultsReader(resultsReader, expectedEvents);
@@ -85,7 +85,7 @@ public void testExportWithPreview() throws IOException {
List> expectedResultsSets = (List>)thisVersion.get("with_preview");
InputStream xmlStream = SDKTestCase.openResource(
- "data/export/" + this.version + "/export_results.xml");
+ "/data/export/" + this.version + "/export_results.xml");
// Some kind of results reader here...
for (Map expectedResultsSet : expectedResultsSets) {
@@ -105,7 +105,7 @@ public void testExportNonreporting() throws IOException, XMLStreamException {
List> expectedEvents = (List>)expectedResultsSet.get("results");
InputStream xmlStream = SDKTestCase.openResource(
- "data/export/" + this.version + "/nonreporting.xml");
+ "/data/export/" + this.version + "/nonreporting.xml");
ResultsReaderXml resultsReader = new ResultsReaderXml(xmlStream);
ResultsReaderTestFromExpectedFile.verifyResultsReader(resultsReader, expectedEvents);
diff --git a/tests/com/splunk/FiredAlertsTest.java b/splunk/src/test/java/com/splunk/FiredAlertsTest.java
similarity index 100%
rename from tests/com/splunk/FiredAlertsTest.java
rename to splunk/src/test/java/com/splunk/FiredAlertsTest.java
diff --git a/tests/com/splunk/HttpExceptionTest.java b/splunk/src/test/java/com/splunk/HttpExceptionTest.java
similarity index 100%
rename from tests/com/splunk/HttpExceptionTest.java
rename to splunk/src/test/java/com/splunk/HttpExceptionTest.java
diff --git a/tests/com/splunk/HttpServiceTest.java b/splunk/src/test/java/com/splunk/HttpServiceTest.java
similarity index 89%
rename from tests/com/splunk/HttpServiceTest.java
rename to splunk/src/test/java/com/splunk/HttpServiceTest.java
index 1ca2b9d2..283f1b99 100644
--- a/tests/com/splunk/HttpServiceTest.java
+++ b/splunk/src/test/java/com/splunk/HttpServiceTest.java
@@ -41,6 +41,29 @@ public void setUp() throws Exception {
);
}
+ @Test
+ public void testHttpServiceWithHostIP(){
+ HttpService service = new HttpService("127.0.0.1");
+ ResponseMessage response = service.get("/");
+ Assert.assertEquals(200, response.getStatus());
+ Assert.assertTrue(firstLineIsXmlDtd(response.getContent()));
+ }
+
+ @Test
+ public void testHttpServiceWithHostIPv6(){
+ // IPv6 Host without the [] brackets
+ HttpService service = new HttpService("::1");
+ ResponseMessage response = service.get("/");
+ Assert.assertEquals(200, response.getStatus());
+ Assert.assertTrue(firstLineIsXmlDtd(response.getContent()));
+
+ // IPv6 Host with the [] brackets
+ HttpService newService = new HttpService("[::1]");
+ ResponseMessage resp = newService.get("/");
+ Assert.assertEquals(200, resp.getStatus());
+ Assert.assertTrue(firstLineIsXmlDtd(resp.getContent()));
+ }
+
@Test
public void testGet() {
ResponseMessage response = httpService.get("/");
diff --git a/tests/com/splunk/IndexTest.java b/splunk/src/test/java/com/splunk/IndexTest.java
similarity index 95%
rename from tests/com/splunk/IndexTest.java
rename to splunk/src/test/java/com/splunk/IndexTest.java
index 5655a44b..56d6670a 100644
--- a/tests/com/splunk/IndexTest.java
+++ b/splunk/src/test/java/com/splunk/IndexTest.java
@@ -18,11 +18,7 @@
import junit.framework.AssertionFailedError;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Assume;
+import org.junit.*;
import java.io.*;
import java.net.Socket;
@@ -53,12 +49,24 @@ public boolean predicate() {
public void tearDown() throws Exception {
if (service.versionIsAtLeast("5.0.0")) {
if (service.getIndexes().containsKey(indexName) && System.getenv("TRAVIS") == null) {
- index.remove();
+ try {
+ index.remove();
+ } catch(HttpException he) {
+ if (he.getStatus() == 400) {
+ uncheckedSplunkRestart();
+ index.remove();
+ } else {
+ throw he;
+ }
+ }
}
} else {
// Can't delete indexes via the REST API. Just let them build up.
}
+ // At least in CI the test exists with a required restart
+ uncheckedSplunkRestart();
+
super.tearDown();
}
@@ -69,8 +77,8 @@ public void testAttachWithCookieHeader() throws IOException {
// Cookies not implemented before version 6.2
return;
}
- // Check that their are cookies at all
- Assert.assertTrue(service.hasCookies());
+ // Check that their are Splunk Auth cookies at all
+ Assert.assertTrue(service.hasSplunkAuthCookies());
// Make a service that only has that cookie
String validCookie = service.stringifyCookies();
@@ -132,7 +140,16 @@ public void testDeletion() {
Assert.assertTrue(service.getIndexes().containsKey(indexName));
- index.remove();
+ try {
+ index.remove();
+ } catch(HttpException he) {
+ if (he.getStatus() == 400) {
+ uncheckedSplunkRestart();
+ index.remove();
+ } else {
+ throw he;
+ }
+ }
assertEventuallyTrue(new EventuallyTrueBehavior() {
@Override
public boolean predicate() {
@@ -149,7 +166,17 @@ public void testDeletionFromCollection() {
}
Assert.assertTrue(service.getIndexes().containsKey(indexName));
- service.getIndexes().remove(indexName);
+
+ try {
+ service.getIndexes().remove(indexName);
+ } catch(HttpException he) {
+ if (he.getStatus() == 400) {
+ uncheckedSplunkRestart();
+ service.getIndexes().remove(indexName);
+ } else {
+ throw he;
+ }
+ }
assertEventuallyTrue(new EventuallyTrueBehavior() {
@Override
@@ -249,7 +276,13 @@ public void testSetters() {
index.setMaxConcurrentOptimizes(newMaxConcurrentOptimizes);
String newMaxDataSize = "auto";
index.setMaxDataSize(newMaxDataSize);
- int newMaxHotBuckets = index.getMaxHotBuckets()+1;
+ String newMaxHotBuckets = null;
+ if (service.versionIsEarlierThan("8.1.0")) {
+ int newMaxHotBucketsInt = Integer.parseInt(index.getMaxHotBuckets())+1;
+ newMaxHotBuckets = String.valueOf(newMaxHotBucketsInt);
+ } else {
+ newMaxHotBuckets = "auto";
+ }
index.setMaxHotBuckets(newMaxHotBuckets);
int newMaxHotIdleSecs = index.getMaxHotIdleSecs()+1;
index.setMaxHotIdleSecs(newMaxHotIdleSecs);
@@ -729,7 +762,6 @@ public void testUploadArgsFailure() throws Exception{
}
-
@Test
public void testUpload() throws Exception {
if (!hasTestData()) {
diff --git a/tests/com/splunk/InputCrudTest.java b/splunk/src/test/java/com/splunk/InputCrudTest.java
similarity index 98%
rename from tests/com/splunk/InputCrudTest.java
rename to splunk/src/test/java/com/splunk/InputCrudTest.java
index 985d04c1..d0d3a1f7 100644
--- a/tests/com/splunk/InputCrudTest.java
+++ b/splunk/src/test/java/com/splunk/InputCrudTest.java
@@ -18,6 +18,7 @@
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import java.util.HashMap;
@@ -165,8 +166,13 @@ private void testSpecializedGetters(Input input) {
@Test
public void testMonitorInputCrud() {
- final String filename = locateSystemLog();
-
+ final String filename;
+ if (System.getenv("SPLUNK_HOME") != null) {
+ filename = System.getenv("SPLUNK_HOME") + "/copyright.txt";
+ } else {
+ filename = locateSystemLog();
+ }
+
// Create variants
try {
inputs.create(filename);
@@ -241,7 +247,7 @@ public boolean predicate() {
}
});
}
-
+
@Test
public void testScriptInputCrud() {
if (!hasTestData()) {
@@ -249,16 +255,16 @@ public void testScriptInputCrud() {
return;
}
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
// Determine what script to use for the input
String filename;
if (service.getInfo().getOsName().equals("Windows")) {
// Windows
- filename = "etc\\apps\\modular-inputs\\bin\\echo.bat";
+ filename = "etc\\apps\\modular_inputs\\bin\\echo.bat";
} else {
// Linux or Mac OS X
- filename = "etc/apps/modular-inputs/bin/echo.sh";
+ filename = "etc/apps/modular_inputs/bin/echo.sh";
}
// Create
diff --git a/tests/com/splunk/InputTest.java b/splunk/src/test/java/com/splunk/InputTest.java
similarity index 100%
rename from tests/com/splunk/InputTest.java
rename to splunk/src/test/java/com/splunk/InputTest.java
diff --git a/tests/com/splunk/InsertRootElementFilterInputStreamTest.java b/splunk/src/test/java/com/splunk/InsertRootElementFilterInputStreamTest.java
similarity index 99%
rename from tests/com/splunk/InsertRootElementFilterInputStreamTest.java
rename to splunk/src/test/java/com/splunk/InsertRootElementFilterInputStreamTest.java
index b6bc37ab..3ad608d9 100644
--- a/tests/com/splunk/InsertRootElementFilterInputStreamTest.java
+++ b/splunk/src/test/java/com/splunk/InsertRootElementFilterInputStreamTest.java
@@ -21,8 +21,6 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.StringReader;
-import java.nio.CharBuffer;
public class InsertRootElementFilterInputStreamTest {
@Test
diff --git a/tests/com/splunk/LicenseGroupTest.java b/splunk/src/test/java/com/splunk/LicenseGroupTest.java
similarity index 100%
rename from tests/com/splunk/LicenseGroupTest.java
rename to splunk/src/test/java/com/splunk/LicenseGroupTest.java
diff --git a/tests/com/splunk/LicenseMessageTest.java b/splunk/src/test/java/com/splunk/LicenseMessageTest.java
similarity index 100%
rename from tests/com/splunk/LicenseMessageTest.java
rename to splunk/src/test/java/com/splunk/LicenseMessageTest.java
diff --git a/tests/com/splunk/LicensePoolTest.java b/splunk/src/test/java/com/splunk/LicensePoolTest.java
similarity index 99%
rename from tests/com/splunk/LicensePoolTest.java
rename to splunk/src/test/java/com/splunk/LicensePoolTest.java
index a4af1d6c..e5625d5f 100644
--- a/tests/com/splunk/LicensePoolTest.java
+++ b/splunk/src/test/java/com/splunk/LicensePoolTest.java
@@ -16,8 +16,6 @@
package com.splunk;
-import java.util.Arrays;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/tests/com/splunk/LicenseSlaveTest.java b/splunk/src/test/java/com/splunk/LicenseSlaveTest.java
similarity index 100%
rename from tests/com/splunk/LicenseSlaveTest.java
rename to splunk/src/test/java/com/splunk/LicenseSlaveTest.java
diff --git a/tests/com/splunk/LicenseTest.java b/splunk/src/test/java/com/splunk/LicenseTest.java
similarity index 99%
rename from tests/com/splunk/LicenseTest.java
rename to splunk/src/test/java/com/splunk/LicenseTest.java
index b0eaff0a..7c7334ca 100644
--- a/tests/com/splunk/LicenseTest.java
+++ b/splunk/src/test/java/com/splunk/LicenseTest.java
@@ -16,7 +16,6 @@
package com.splunk;
-import java.io.InputStream;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
diff --git a/tests/com/splunk/LoggerTest.java b/splunk/src/test/java/com/splunk/LoggerTest.java
similarity index 100%
rename from tests/com/splunk/LoggerTest.java
rename to splunk/src/test/java/com/splunk/LoggerTest.java
diff --git a/tests/com/splunk/MessageTest.java b/splunk/src/test/java/com/splunk/MessageTest.java
similarity index 100%
rename from tests/com/splunk/MessageTest.java
rename to splunk/src/test/java/com/splunk/MessageTest.java
diff --git a/tests/com/splunk/MetadataTest.java b/splunk/src/test/java/com/splunk/MetadataTest.java
similarity index 100%
rename from tests/com/splunk/MetadataTest.java
rename to splunk/src/test/java/com/splunk/MetadataTest.java
diff --git a/tests/com/splunk/ModularInputKindsTest.java b/splunk/src/test/java/com/splunk/ModularInputKindsTest.java
similarity index 92%
rename from tests/com/splunk/ModularInputKindsTest.java
rename to splunk/src/test/java/com/splunk/ModularInputKindsTest.java
index 05b23ecd..8c7d7fff 100644
--- a/tests/com/splunk/ModularInputKindsTest.java
+++ b/splunk/src/test/java/com/splunk/ModularInputKindsTest.java
@@ -17,7 +17,6 @@
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -30,7 +29,7 @@ public void checkModularInputKind(ModularInputKind m) {
if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
inputKinds = service.getModularInputKinds();
}
@@ -49,10 +48,9 @@ public void testListInputKinds() {
if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
inputKinds = service.getModularInputKinds();
}
-
for (ModularInputKind kind : inputKinds.values()) {
checkModularInputKind(kind);
}
@@ -63,7 +61,7 @@ public void testInputByName() {
if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
inputKinds = service.getModularInputKinds();
}
ModularInputKind m;
@@ -78,7 +76,7 @@ public void testNonexistantArg() {
if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
inputKinds = service.getModularInputKinds();
}
ModularInputKind test1 = inputKinds.get("test1");
@@ -91,7 +89,7 @@ public void testInputKindDescriptionAndTitle() {
if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
inputKinds = service.getModularInputKinds();
}
ModularInputKind test1 = inputKinds.get("test1");
@@ -109,7 +107,7 @@ public void testArgDescription() {
if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
inputKinds = service.getModularInputKinds();
}
@@ -136,7 +134,7 @@ public void testArgDataType() {
if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
inputKinds = service.getModularInputKinds();
}
@@ -162,7 +160,7 @@ public void testRequiredOnCreate() {
if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
inputKinds = service.getModularInputKinds();
}
@@ -186,7 +184,7 @@ public void testRequiredOnEdit() {
if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
inputKinds = service.getModularInputKinds();
}
@@ -210,7 +208,7 @@ public void testGetArguments() {
if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
inputKinds = service.getModularInputKinds();
}
diff --git a/tests/com/splunk/ModularInputTest.java b/splunk/src/test/java/com/splunk/ModularInputTest.java
similarity index 94%
rename from tests/com/splunk/ModularInputTest.java
rename to splunk/src/test/java/com/splunk/ModularInputTest.java
index d0e98a33..7e3ca981 100644
--- a/tests/com/splunk/ModularInputTest.java
+++ b/splunk/src/test/java/com/splunk/ModularInputTest.java
@@ -17,6 +17,7 @@
package com.splunk;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
public class ModularInputTest extends InputTest {
@@ -25,7 +26,7 @@ public void testModularInputKinds() {
if (service.versionCompare("5.0") < 0 || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
// Will not pick up the new inputs unless a restart is done.
// Nevertheless Splunk does not request a restart after app installation.
uncheckedSplunkRestart();
@@ -40,13 +41,13 @@ public void testModularInputKinds() {
}
Assert.assertTrue(hasTest2);
}
-
+
@Test
public void testListModularInputs() {
if (service.versionCompare("5.0") < 0 || !hasTestData()) {
return;
} else {
- installApplicationFromTestData("modular-inputs");
+ installApplicationFromTestData("modular_inputs");
// Will not pick up the new inputs unless a restart is done.
// Nevertheless Splunk does not request a restart after app installation.
uncheckedSplunkRestart();
diff --git a/tests/com/splunk/NamespaceTest.java b/splunk/src/test/java/com/splunk/NamespaceTest.java
similarity index 99%
rename from tests/com/splunk/NamespaceTest.java
rename to splunk/src/test/java/com/splunk/NamespaceTest.java
index a00e188e..16a332ad 100644
--- a/tests/com/splunk/NamespaceTest.java
+++ b/splunk/src/test/java/com/splunk/NamespaceTest.java
@@ -19,8 +19,6 @@
import org.junit.Assert;
import org.junit.Test;
-import java.net.URLEncoder;
-
public class NamespaceTest extends SDKTestCase {
@Test
public void testStaticNamespace() {
diff --git a/tests/com/splunk/OutputDefaultTest.java b/splunk/src/test/java/com/splunk/OutputDefaultTest.java
similarity index 100%
rename from tests/com/splunk/OutputDefaultTest.java
rename to splunk/src/test/java/com/splunk/OutputDefaultTest.java
diff --git a/tests/com/splunk/OutputGroupTest.java b/splunk/src/test/java/com/splunk/OutputGroupTest.java
similarity index 100%
rename from tests/com/splunk/OutputGroupTest.java
rename to splunk/src/test/java/com/splunk/OutputGroupTest.java
diff --git a/tests/com/splunk/OutputServerTest.java b/splunk/src/test/java/com/splunk/OutputServerTest.java
similarity index 100%
rename from tests/com/splunk/OutputServerTest.java
rename to splunk/src/test/java/com/splunk/OutputServerTest.java
diff --git a/tests/com/splunk/OutputSyslogTest.java b/splunk/src/test/java/com/splunk/OutputSyslogTest.java
similarity index 100%
rename from tests/com/splunk/OutputSyslogTest.java
rename to splunk/src/test/java/com/splunk/OutputSyslogTest.java
diff --git a/tests/com/splunk/PasswordTest.java b/splunk/src/test/java/com/splunk/PasswordTest.java
similarity index 73%
rename from tests/com/splunk/PasswordTest.java
rename to splunk/src/test/java/com/splunk/PasswordTest.java
index 175c8c4c..3d32d393 100644
--- a/tests/com/splunk/PasswordTest.java
+++ b/splunk/src/test/java/com/splunk/PasswordTest.java
@@ -19,6 +19,8 @@
import org.junit.Assert;
import org.junit.Test;
+import java.util.HashMap;
+
public class PasswordTest extends SDKTestCase {
@Test
public void testGettersOfDefaultPasswords() {
@@ -129,4 +131,46 @@ public void testPasswordsCompatibleGetByName() {
passwords.remove(username);
Assert.assertNull(passwords.get(username));
}
+ @Test
+ public void testPasswordsWithWildCards(){
+ HashMap args = new HashMap();
+ args = Command.defaultValues;
+ args.put("owner", "-");
+ args.put("app", "-");
+ args.put("username", "admin");
+ args.put("password", "changed!");
+ Service service = Service.connect(args);
+ PasswordCollection passwords = service.getPasswords();
+ Assert.assertEquals(passwords.size(),0);
+
+ String name = "no-owner";
+ String value = "sdk-test-password";
+ String realm = "sdk-test-realm";
+
+ Password password;
+ // Create a password
+ try{
+ password = passwords.create(name, value);
+ }catch(IllegalArgumentException e){
+ Assert.assertEquals("While creating StoragePasswords, namespace cannot have wildcards.", e.getMessage());
+ }
+ try{
+ password = passwords.create(name, value, realm);
+ }catch(IllegalArgumentException e){
+ Assert.assertEquals("While creating StoragePasswords, namespace cannot have wildcards.", e.getMessage());
+ }
+ // Remove a password
+ try{
+ password = passwords.remove(name);
+ }catch(IllegalArgumentException e){
+ Assert.assertEquals("app context must be specified when removing a password.", e.getMessage());
+ }
+ try{
+ password = passwords.remove(realm, name);
+ }catch(IllegalArgumentException e){
+ Assert.assertEquals("app context must be specified when removing a password.", e.getMessage());
+ }
+ passwords = service.getPasswords();
+ Assert.assertEquals(passwords.size(),0);
+ }
}
diff --git a/tests/com/splunk/PivotTest.java b/splunk/src/test/java/com/splunk/PivotTest.java
similarity index 99%
rename from tests/com/splunk/PivotTest.java
rename to splunk/src/test/java/com/splunk/PivotTest.java
index 54056581..6961a8a3 100644
--- a/tests/com/splunk/PivotTest.java
+++ b/splunk/src/test/java/com/splunk/PivotTest.java
@@ -23,13 +23,6 @@
import org.junit.Before;
import org.junit.Test;
-import java.io.*;
-import java.net.Socket;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collection;
-import java.util.Date;
-
public class PivotTest extends SDKTestCase {
DataModelObject dataModelObject;
@@ -41,7 +34,7 @@ public void setUp() throws Exception {
EntityCollection dataModels = service.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/data_model_for_pivot.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/data_model_for_pivot.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
this.dataModelObject = model.getObject("test_data");
@@ -88,7 +81,7 @@ public void testAccelerationWorks() {
EntityCollection dataModels = nonprivateService.getDataModels();
DataModelArgs args = new DataModelArgs();
- args.setRawJsonDescription(streamToString(openResource("data/datamodels/data_model_for_pivot.json")));
+ args.setRawJsonDescription(streamToString(openResource("/data/datamodels/data_model_for_pivot.json")));
DataModel model = dataModels.create(createTemporaryName(), args);
dataModelObject = model.getObject("test_data");
diff --git a/tests/com/splunk/PortInputTest.java b/splunk/src/test/java/com/splunk/PortInputTest.java
similarity index 98%
rename from tests/com/splunk/PortInputTest.java
rename to splunk/src/test/java/com/splunk/PortInputTest.java
index 195f0dfa..1db21e68 100644
--- a/tests/com/splunk/PortInputTest.java
+++ b/splunk/src/test/java/com/splunk/PortInputTest.java
@@ -16,8 +16,6 @@
package com.splunk;
-import java.lang.reflect.Method;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/tests/com/splunk/ReceiverTest.java b/splunk/src/test/java/com/splunk/ReceiverTest.java
similarity index 83%
rename from tests/com/splunk/ReceiverTest.java
rename to splunk/src/test/java/com/splunk/ReceiverTest.java
index 99e4b0e4..e171b9d1 100644
--- a/tests/com/splunk/ReceiverTest.java
+++ b/splunk/src/test/java/com/splunk/ReceiverTest.java
@@ -24,6 +24,8 @@
import java.io.IOException;
import java.io.OutputStream;
import java.net.Socket;
+import java.util.HashMap;
+import java.util.Map;
public class ReceiverTest extends SDKTestCase {
@@ -36,9 +38,28 @@ public void testReceiverWithoutCookie() {
@Test
public void testReceiverWithCookie() {
Assume.assumeTrue(service.versionIsAtLeast("6.2"));
- Assert.assertTrue(service.hasCookies());
+ Assert.assertTrue(service.hasSplunkAuthCookies());
testReceiver(service);
}
+
+ @Test
+ public void testReceiverWithoutSplunkCookie() {
+ String validToken = service.getToken();
+ Assert.assertTrue(validToken.startsWith("Splunk "));
+ String otherCookies = "load=balancer;";
+ Map args = new HashMap<>();
+ args.put("cookie", otherCookies);
+ args.put("host",service.getHost());
+ args.put("port", service.getPort());
+ Service s = new Service(args);
+ s.setToken(validToken);
+ s.version = s.getInfo().getVersion();
+ System.out.println(s.version);
+ Assume.assumeTrue(s.versionIsAtLeast("6.2"));
+ Assert.assertTrue(!s.cookieStore.isEmpty());
+ testReceiver(s);
+ }
+
// Make a few simple requests and make sure the results look ok.
public void testReceiver(Service passedService) {
Receiver receiver = passedService.getReceiver();
diff --git a/tests/com/splunk/ResourceRoot.java b/splunk/src/test/java/com/splunk/ResourceRoot.java
similarity index 100%
rename from tests/com/splunk/ResourceRoot.java
rename to splunk/src/test/java/com/splunk/ResourceRoot.java
diff --git a/tests/com/splunk/ResultsReaderTest.java b/splunk/src/test/java/com/splunk/ResultsReaderTest.java
similarity index 93%
rename from tests/com/splunk/ResultsReaderTest.java
rename to splunk/src/test/java/com/splunk/ResultsReaderTest.java
index 0e2aaf38..71ebe42d 100644
--- a/tests/com/splunk/ResultsReaderTest.java
+++ b/splunk/src/test/java/com/splunk/ResultsReaderTest.java
@@ -22,8 +22,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
-import java.util.Collection;
-import java.util.regex.Pattern;
/**
* Test aspects of results readers not covered by the atom, results, and export test data.
@@ -34,7 +32,7 @@
public class ResultsReaderTest extends SDKTestCase {
@Test
public void testReadCsv() throws Exception {
- InputStream input = openResource("results.csv");
+ InputStream input = openResource("/results.csv");
ResultsReaderCsv reader = new ResultsReaderCsv(input);
String[] fields = new String[0];
@@ -124,7 +122,7 @@ private MultiResultsReader getExportStreamXml() throws IOException {
@Test
public void testReadJsonOnSplunk4() throws Exception {
- InputStream input = openResource("results4.json");
+ InputStream input = openResource("/results4.json");
ResultsReaderJson reader = new ResultsReaderJson(input);
Map expected = new HashMap();
@@ -148,7 +146,7 @@ public void testReadJsonOnSplunk4() throws Exception {
public void testReadJsonOnSplunk5() throws Exception {
// Splunk 5.0 uses a different format for JSON results
// from Splunk 4.3.
- InputStream input = openResource("results5.json");
+ InputStream input = openResource("/results5.json");
ResultsReaderJson reader = new ResultsReaderJson(input);
Map expected = new HashMap();
@@ -174,26 +172,26 @@ public void testReadMultivalueCsvJson() throws IOException {
String search = "search index=_internal | head 1";
testReadMultivalue(
- ResultsReaderXml.class, "resultsMV.xml");
+ ResultsReaderXml.class, "/resultsMV.xml");
testReadMultivalue(
- ResultsReaderCsv.class, "resultsMV.csv");
+ ResultsReaderCsv.class, "/resultsMV.csv");
testReadMultivalue(
- ResultsReaderJson.class, "resultsMV4.json");
+ ResultsReaderJson.class, "/resultsMV4.json");
testReadMultivalue(
- ResultsReaderJson.class, "resultsMV5.json");
+ ResultsReaderJson.class, "/resultsMV5.json");
testReadMultivalue(
- ResultsReaderJson.class, "resultsMVFuture.json", ",");
+ ResultsReaderJson.class, "/resultsMVFuture.json", ",");
testReadMultivalue(
- ResultsReaderXml.class, "resultsMVOneshot.xml");
+ ResultsReaderXml.class, "/resultsMVOneshot.xml");
testReadMultivalue(
- ResultsReaderCsv.class, "resultsMVOneshot.csv");
+ ResultsReaderCsv.class, "/resultsMVOneshot.csv");
testReadMultivalue(
- ResultsReaderJson.class, "resultsMVOneshot4.json");
+ ResultsReaderJson.class, "/resultsMVOneshot4.json");
testReadMultivalue(
- ResultsReaderJson.class, "resultsMVOneshot5.json");
+ ResultsReaderJson.class, "/resultsMVOneshot5.json");
testReadMultivalue(
- ResultsReaderJson.class, "resultsMVOneshotFuture.json", ",");
+ ResultsReaderJson.class, "/resultsMVOneshotFuture.json", ",");
testReadMultivalue(
ResultsReaderXml.class, "splunk_search:blocking/xml/" + search);
@@ -336,7 +334,7 @@ public void testPreviewSingleReaderXmlGetNext() throws Exception {
private void testPreviewSingleReaderXml(boolean useIter) throws Exception {
ResultsReaderXml reader = new ResultsReaderXml(
- openResource("resultsPreview.xml"));
+ openResource("/resultsPreview.xml"));
Assert.assertTrue(reader.isPreview());
@@ -365,7 +363,7 @@ private void testPreviewSingleReaderXml(boolean useIter) throws Exception {
reader.close();
}
- final String resultsExportXml = "resultsExport.xml";
+ final String resultsExportXml = "/resultsExport.xml";
@Test
public void testExportSingleReaderXml() throws Exception {
@@ -382,7 +380,7 @@ public void testExportMultiReaderXml() throws Exception {
18);
}
- final String resultsExportJson = "resultsExport.json";
+ final String resultsExportJson = "/resultsExport.json";
@Test
public void testExportSingleReaderJson() throws Exception {
diff --git a/tests/com/splunk/ResultsReaderTestFromExpectedFile.java b/splunk/src/test/java/com/splunk/ResultsReaderTestFromExpectedFile.java
similarity index 98%
rename from tests/com/splunk/ResultsReaderTestFromExpectedFile.java
rename to splunk/src/test/java/com/splunk/ResultsReaderTestFromExpectedFile.java
index 4de8bbf0..ecfa0d14 100644
--- a/tests/com/splunk/ResultsReaderTestFromExpectedFile.java
+++ b/splunk/src/test/java/com/splunk/ResultsReaderTestFromExpectedFile.java
@@ -54,7 +54,7 @@ public class ResultsReaderTestFromExpectedFile {
reader.fromJson(
SDKTestCase.streamToString(
SDKTestCase.openResource(
- "data/resultsreader_test_data.json")),
+ "/data/resultsreader_test_data.json")),
Map.class);
private Map expectedResultsSet;
@@ -66,7 +66,7 @@ public ResultsReaderTestFromExpectedFile(String version, String testName) {
this.version = version;
this.testName = testName;
this.xmlStream = SDKTestCase.openResource(
- "data/results/" + version + "/" + testName + ".xml");
+ "/data/results/" + version + "/" + testName + ".xml");
Map versionData =
(Map)expectedData.get(version);
this.expectedResultsSet =
diff --git a/tests/com/splunk/RoleTest.java b/splunk/src/test/java/com/splunk/RoleTest.java
similarity index 100%
rename from tests/com/splunk/RoleTest.java
rename to splunk/src/test/java/com/splunk/RoleTest.java
diff --git a/tests/com/splunk/SDKTestCase.java b/splunk/src/test/java/com/splunk/SDKTestCase.java
similarity index 93%
rename from tests/com/splunk/SDKTestCase.java
rename to splunk/src/test/java/com/splunk/SDKTestCase.java
index ccf2b9d8..c2c623fa 100644
--- a/tests/com/splunk/SDKTestCase.java
+++ b/splunk/src/test/java/com/splunk/SDKTestCase.java
@@ -16,10 +16,10 @@
package com.splunk;
-import junit.framework.TestCase;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.BeforeClass;
import java.io.*;
import java.net.InetSocketAddress;
@@ -79,8 +79,22 @@ public void connect() {
}
public static Integer getJavaVersion() {
- String ver = System.getProperty("java.version");
- return Integer.parseInt(ver.substring(2, 3));
+ String version = System.getProperty("java.version");
+ if (version.startsWith("1.")) {
+ version = version.substring(2, 3);
+ } else {
+ int dot = version.indexOf(".");
+ if (dot != -1) {
+ version = version.substring(0, dot);
+ }
+ }
+ return Integer.parseInt(version);
+ }
+
+ @BeforeClass
+ public static void preClassLoadActions() {
+ // Bypass the certification validation here.
+ HttpService.setValidateCertificates(false);
}
@Before
@@ -206,13 +220,13 @@ public static boolean assertEventuallyTrue(EventuallyTrueBehavior behavior) {
// === Test Data Installation ===
public boolean hasTestData() {
- String collectionName = "sdk-app-collection";
- return service.getApplications().containsKey("sdk-app-collection");
+ String collectionName = "sdkappcollection";
+ return service.getApplications().containsKey("sdkappcollection");
}
public void installApplicationFromTestData(String applicationName) {
- String collectionName = "sdk-app-collection";
- if (!service.getApplications().containsKey("sdk-app-collection")) {
+ String collectionName = "sdkappcollection";
+ if (!service.getApplications().containsKey("sdkappcollection")) {
throw new TestDataNotInstalledException();
}
@@ -241,10 +255,13 @@ public void installApplicationFromTestData(String applicationName) {
String appPath = Util.join(separator, pathComponents);
Args args = new Args();
+
args.put("name", appPath);
- args.put("update", "1");
- service.post("apps/appinstall", args);
-
+ args.put("filename", true);
+ args.put("update", true);
+
+ service.post("apps/local", args);
+
installedApps.add(applicationName);
}
@@ -368,7 +385,7 @@ protected static String locateSystemLog() {
if (osName.equals("Windows"))
filename = "C:\\Windows\\WindowsUpdate.log";
else if (osName.equals("Linux")) {
- filename = "/etc/fstab";
+ filename = "/etc/hosts";
}
else if (osName.equals("Darwin")) {
filename = "/var/log/system.log";
diff --git a/tests/com/splunk/SavedSearchTest.java b/splunk/src/test/java/com/splunk/SavedSearchTest.java
similarity index 87%
rename from tests/com/splunk/SavedSearchTest.java
rename to splunk/src/test/java/com/splunk/SavedSearchTest.java
index 2ccc93ad..e62a6294 100644
--- a/tests/com/splunk/SavedSearchTest.java
+++ b/splunk/src/test/java/com/splunk/SavedSearchTest.java
@@ -21,6 +21,8 @@
import org.junit.Before;
import org.junit.Test;
+import java.util.HashMap;
+
public class SavedSearchTest extends SDKTestCase {
SavedSearchCollection savedSearches;
String savedSearchName;
@@ -314,7 +316,15 @@ public void testScheduled() {
savedSearch.remove();
}
-
+
+ @Test
+ public void testGetSavedSearchByTitle(){
+ try{
+ SavedSearch fetchedSavedSearch = this.savedSearches.getService().getSavedSearch(savedSearchName);
+ Assert.assertEquals(fetchedSavedSearch.getName(),savedSearch.getName());
+ }catch (Exception e) { }
+ }
+
@Test
public void testCreateWithNoSearch() {
try {
@@ -350,6 +360,38 @@ public void testCannotUpdateName() {
} catch (Exception e) {}
}
+ @Test
+ public void testACLUpdates(){
+ Record aclInfo = savedSearch.getMetadata().getEaiAcl();
+ Assert.assertNotEquals(aclInfo.getString("sharing"), "app");
+ Assert.assertNotEquals(aclInfo.getString("owner"), "nobody");
+ Assert.assertNull(aclInfo.get("perms"));
+ Args args = new Args();
+ args.add("sharing","app");
+ args.add("owner","nobody");
+ args.add("app","search");
+ args.add("perms.read","admin, nobody");
+ savedSearch.aclUpdate(args);
+ aclInfo = savedSearch.getMetadata().getEaiAcl();
+ Assert.assertEquals(aclInfo.getString("sharing"), "app");
+ Assert.assertEquals(aclInfo.getString("owner"), "nobody");
+ Assert.assertNotNull(aclInfo.get("perms"));
+ }
+
+ @Test
+ public void testACLUpdateWithoutSharing(){
+ Args args = new Args();
+ args.add("owner","nobody");
+ args.add("app","search");
+ Assert.assertThrows("Required argument 'sharing' is missing.", IllegalArgumentException.class, () -> {savedSearch.aclUpdate(args);});
+ }
+
+ @Test
+ public void testACLUpdateWithoutOwner(){
+ Args args = new Args();
+ Assert.assertThrows("Required argument 'owner' is missing.", IllegalArgumentException.class, () -> {savedSearch.aclUpdate(args);});
+ }
+
@Test
public void testDispatch() {
final JobCollection jobs = service.getJobs();
@@ -421,4 +463,34 @@ public boolean predicate() {
Assert.fail(e.toString());
}
}
+
+ @Test
+ public void testHistoryWithArgs(){
+ savedSearch.refresh();
+ Assert.assertEquals(0, savedSearch.history().length);
+ try {
+ Job job;
+ for(int i = 0 ; i < 31 ; i++){
+ job = savedSearch.dispatch();
+ while(!job.isReady()){
+ sleep(2);
+ }
+ }
+ //history without any argument, it will return max 30 jobs only.
+ Assert.assertEquals(30, savedSearch.history().length);
+
+ //history with argument 'count' set to '0' i.e it returns the whole history
+ HashMap args = new HashMap();
+ args.put("count", 0);
+ Assert.assertEquals(31, savedSearch.history(args).length);
+
+ //history with argument 'count' set to '10' i.e. it will return only 10 jobs from history
+ args.put("count", 10);
+ args.put("sort_dir", "desc");
+ Assert.assertEquals(10, savedSearch.history(args).length);
+
+ } catch (InterruptedException e) {
+ Assert.fail(e.toString());
+ }
+ }
}
diff --git a/tests/com/splunk/ScriptedInputTest.java b/splunk/src/test/java/com/splunk/ScriptedInputTest.java
similarity index 100%
rename from tests/com/splunk/ScriptedInputTest.java
rename to splunk/src/test/java/com/splunk/ScriptedInputTest.java
diff --git a/tests/com/splunk/SearchJobTest.java b/splunk/src/test/java/com/splunk/SearchJobTest.java
similarity index 96%
rename from tests/com/splunk/SearchJobTest.java
rename to splunk/src/test/java/com/splunk/SearchJobTest.java
index eacbdd10..fbb7cbce 100644
--- a/tests/com/splunk/SearchJobTest.java
+++ b/splunk/src/test/java/com/splunk/SearchJobTest.java
@@ -18,13 +18,13 @@
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -62,6 +62,18 @@ public void testEventsFromJob() {
job.cancel();
}
+ @Test
+ public void testEventsWithSearchParams() {
+ Job job = jobs.create(QUERY);
+ waitUntilDone(job);
+
+ Map args = new HashMap();
+ args.put("search","| head 1");
+ Assert.assertEquals(1, countEvents(job.getEvents(args)));
+
+ job.cancel();
+ }
+
@Test
public void testResultsFromJob() {
Job job = jobs.create(QUERY);
@@ -71,6 +83,18 @@ public void testResultsFromJob() {
job.cancel();
}
+
+ @Test
+ public void testResultsWithSearchParams() {
+ Job job = jobs.create(QUERY);
+ waitUntilDone(job);
+
+ Map args = new HashMap();
+ args.put("search","| head 1");
+ Assert.assertEquals(1, countEvents(job.getResults(args)));
+
+ job.cancel();
+ }
@Test
public void testGetJobBySid() {
@@ -584,6 +608,26 @@ public void testPreview() throws InterruptedException {
job.cancel();
}
+ @Test
+ public void testPreviewWithSearchParams() throws InterruptedException {
+ JobArgs args = new JobArgs();
+ args.put("field_list", "source,host,sourcetype");
+ args.setStatusBuckets(100);
+
+ Job job = jobs.create(QUERY, args);
+
+ while (!job.isReady()) {
+ Thread.sleep(100);
+ }
+
+ Map argsSearchQuery = new HashMap();
+ argsSearchQuery.put("search","| head 1");
+ // Assert.assertTrue(1 >= countEvents(job.getResultsPreview(args)));
+ Assert.assertEquals(1, countEvents(job.getResultsPreview(argsSearchQuery)));
+
+ job.cancel();
+ }
+
@Test
public void testSearchLog() {
Job job = jobs.create(QUERY);
@@ -779,7 +823,7 @@ public boolean predicate() {
Thread.sleep(500);
} catch (InterruptedException e) {}
}
-
+
@Test
public void testSetPriority() throws InterruptedException {
if (!hasTestData()) {
diff --git a/tests/com/splunk/ServiceTest.java b/splunk/src/test/java/com/splunk/ServiceTest.java
similarity index 89%
rename from tests/com/splunk/ServiceTest.java
rename to splunk/src/test/java/com/splunk/ServiceTest.java
index 6726617d..a8960842 100644
--- a/tests/com/splunk/ServiceTest.java
+++ b/splunk/src/test/java/com/splunk/ServiceTest.java
@@ -21,8 +21,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -148,7 +146,23 @@ public void testLogin() {
service.logout();
checkNotLoggedIn(service);
}
-
+
+ @Test
+ public void testServiceWithCustomHeaders() {
+ ServiceArgs args = new ServiceArgs();
+ args.setHost((String) command.opts.get("host"));
+ args.setPort((Integer) command.opts.get("port"));
+ args.setScheme((String) command.opts.get("scheme"));
+ args.setUsername((String) command.opts.get("username"));
+ args.setPassword((String) command.opts.get("password"));
+ args.setHttpHeaders(new HashMap() {{
+ put("some header key", "some value");
+ }});
+ Service service = new Service(args);
+ Map customHeaders = service.getCustomHeaders();
+ Assert.assertEquals(customHeaders.get("some header key"), "some value");
+ }
+
@Test
public void testLoginWithoutArguments() {
ServiceArgs args = new ServiceArgs();
@@ -220,6 +234,29 @@ public void testLoginWithToken() {
Assert.assertEquals(s.getToken(), validToken);
}
+ @Test
+ public void testLoginWithOnlyTokenValue() {
+ String validToken = service.getToken();
+
+ ServiceArgs args = new ServiceArgs();
+ args.setHost((String) command.opts.get("host"));
+ args.setUsername((String) command.opts.get("username"));
+ args.setPassword((String) command.opts.get("password"));
+ args.setPort((Integer) command.opts.get("port"));
+ args.setScheme((String) command.opts.get("scheme"));
+
+ Service service2 = new Service(args);
+ service2.login();
+
+ // Manually removing Splunk keyword from preset token.
+ String modifiedToken = (service2.getToken().replace("Splunk", "")).trim();
+ service2.setSplunkToken(modifiedToken);
+
+ service2.getSettings().refresh();
+
+ Assert.assertEquals(service2.getToken(), validToken);
+ }
+
@Test
public void testLoginGetters() {
Service s = new Service("theHost");
@@ -678,4 +715,39 @@ public void testPost() {
Assert.assertTrue(firstLineIsXmlDtd(response.getContent()));
}
+ /*
+ Test whether the V2 and V1 Search APIs are switched properly based on the Type of Splunk Instance and Version.
+ */
+ @Test
+ public void testEnableV2Api(){
+ if(service.instanceType.equalsIgnoreCase("cloud")) {
+ if(service.versionIsEarlierThan("9.0.2209")){
+ Assert.assertFalse(service.enableV2SearchApi());
+ }else{
+ Assert.assertTrue(service.enableV2SearchApi());
+ }
+ }else{
+ if(service.versionIsEarlierThan("9.0.2")){
+ Assert.assertFalse(service.enableV2SearchApi());
+ }else{
+ Assert.assertTrue(service.enableV2SearchApi());
+ }
+ }
+ }
+
+ /*
+ Test when Service instance is created using token, it doesn't result in Null Pointer while accessing instanceType and version
+ */
+ @Test
+ public void testServiceWithTokenAuth(){
+ Service newService = new Service(service.getHost());
+ newService.setToken(service.getToken());
+ try{
+ newService.enableV2SearchApi();
+ newService.versionCompare("9.0.2");
+ }catch (Exception ex){
+ Assert.assertNull(ex);
+ }
+ }
+
}
diff --git a/tests/com/splunk/SettingsTest.java b/splunk/src/test/java/com/splunk/SettingsTest.java
similarity index 100%
rename from tests/com/splunk/SettingsTest.java
rename to splunk/src/test/java/com/splunk/SettingsTest.java
diff --git a/tests/com/splunk/TcpInputTest.java b/splunk/src/test/java/com/splunk/TcpInputTest.java
similarity index 91%
rename from tests/com/splunk/TcpInputTest.java
rename to splunk/src/test/java/com/splunk/TcpInputTest.java
index 713b76d5..543501e6 100644
--- a/tests/com/splunk/TcpInputTest.java
+++ b/splunk/src/test/java/com/splunk/TcpInputTest.java
@@ -181,22 +181,22 @@ public boolean predicate() {
// TODO: Move to InputTest once it has been ported over to the new suite.
@Test
public void testGetInputKindOfScript() {
- Input scriptInput = new Input(service, "data/inputs/script/$SPLUNK_HOME/etc/apps/myapp/bin/myscript.py");
+ Input scriptInput = new Input(service, "/data/inputs/script/$SPLUNK_HOME/etc/apps/myapp/bin/myscript.py");
Assert.assertEquals(InputKind.Script, scriptInput.getKind());
- Input scriptInputWin = new Input(service, "data/inputs/script/$SPLUNK_HOME\\etc\\apps\\myapp\\bin\\myscript.py");
+ Input scriptInputWin = new Input(service, "/data/inputs/script/$SPLUNK_HOME\\etc\\apps\\myapp\\bin\\myscript.py");
Assert.assertEquals(InputKind.Script, scriptInputWin.getKind());
- Input tcpRawInput = new Input(service, "data/inputs/tcp/raw/6666");
+ Input tcpRawInput = new Input(service, "/data/inputs/tcp/raw/6666");
Assert.assertEquals(InputKind.Tcp, tcpRawInput.getKind());
- Input tcpCookedInput = new Input(service, "data/inputs/tcp/cooked/6666");
+ Input tcpCookedInput = new Input(service, "/data/inputs/tcp/cooked/6666");
Assert.assertEquals(InputKind.TcpSplunk, tcpCookedInput.getKind());
- Input udpInput = new Input(service, "data/inputs/udp/6666");
+ Input udpInput = new Input(service, "/data/inputs/udp/6666");
Assert.assertEquals(InputKind.Udp, udpInput.getKind());
- Input modularInput = new Input(service, "data/inputs/my_modular_input/input_name");
+ Input modularInput = new Input(service, "/data/inputs/my_modular_input/input_name");
Assert.assertEquals(InputKind.create("my_modular_input"), modularInput.getKind());
}
}
diff --git a/tests/com/splunk/TestDataNotInstalledException.java b/splunk/src/test/java/com/splunk/TestDataNotInstalledException.java
similarity index 100%
rename from tests/com/splunk/TestDataNotInstalledException.java
rename to splunk/src/test/java/com/splunk/TestDataNotInstalledException.java
diff --git a/tests/com/splunk/UdpInputTest.java b/splunk/src/test/java/com/splunk/UdpInputTest.java
similarity index 100%
rename from tests/com/splunk/UdpInputTest.java
rename to splunk/src/test/java/com/splunk/UdpInputTest.java
diff --git a/tests/com/splunk/UploadTest.java b/splunk/src/test/java/com/splunk/UploadTest.java
similarity index 87%
rename from tests/com/splunk/UploadTest.java
rename to splunk/src/test/java/com/splunk/UploadTest.java
index 2f728722..f1549bcd 100644
--- a/tests/com/splunk/UploadTest.java
+++ b/splunk/src/test/java/com/splunk/UploadTest.java
@@ -18,12 +18,17 @@
import org.junit.Test;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Date;
+
public class UploadTest extends SDKTestCase {
@Test
public void testOneshot() {
String filename = locateSystemLog();
if (System.getenv("SPLUNK_HOME") != null) {
- filename = System.getenv("SPLUNK_HOME") + "/var/log/splunk/splunkd.log";
+ filename = System.getenv("SPLUNK_HOME") + "/copyright.txt";
}
service.getUploads().create(filename);
diff --git a/tests/com/splunk/UtilTest.java b/splunk/src/test/java/com/splunk/UtilTest.java
similarity index 99%
rename from tests/com/splunk/UtilTest.java
rename to splunk/src/test/java/com/splunk/UtilTest.java
index baa62a92..a4a582e4 100644
--- a/tests/com/splunk/UtilTest.java
+++ b/splunk/src/test/java/com/splunk/UtilTest.java
@@ -19,7 +19,6 @@
import org.junit.Assert;
import org.junit.Test;
-import java.io.File;
import java.util.ArrayList;
import java.util.List;
diff --git a/tests/com/splunk/modularinput/EventTest.java b/splunk/src/test/java/com/splunk/modularinput/EventTest.java
similarity index 92%
rename from tests/com/splunk/modularinput/EventTest.java
rename to splunk/src/test/java/com/splunk/modularinput/EventTest.java
index 651f7d52..5d95cb86 100644
--- a/tests/com/splunk/modularinput/EventTest.java
+++ b/splunk/src/test/java/com/splunk/modularinput/EventTest.java
@@ -54,7 +54,7 @@ public void testXmlOfEventWithMinimalConfiguration() throws XMLStreamException,
event.writeTo(writer);
Document found = stringToXmlDocument(sb.toString());
- Document expected = resourceToXmlDocument("modularinput/data/event_minimal.xml");
+ Document expected = resourceToXmlDocument("/modularinput/data/event_minimal.xml");
assertXmlEqual(expected, found);
}
@@ -81,7 +81,7 @@ public void testXmlOfEventWithMoreConfiguration() throws MalformedDataException,
event.writeTo(writer);
Document found = stringToXmlDocument(sb.toString());
- Document expected = resourceToXmlDocument("modularinput/data/event_maximal.xml");
+ Document expected = resourceToXmlDocument("/modularinput/data/event_maximal.xml");
assertXmlEqual(expected, found);
}
@@ -111,7 +111,7 @@ public void testWritingEventsOnEventWriter() throws XMLStreamException, Transfor
ew.writeEvent(event);
Document found = stringToXmlDocument(out.toString() + "");
- Document expected = resourceToXmlDocument("modularinput/data/stream_with_one_event.xml");
+ Document expected = resourceToXmlDocument("/modularinput/data/stream_with_one_event.xml");
assertXmlEqual(expected, found);
Assert.assertEquals("", err.toString());
@@ -122,7 +122,7 @@ public void testWritingEventsOnEventWriter() throws XMLStreamException, Transfor
ew.close();
found = stringToXmlDocument(out.toString());
- expected = resourceToXmlDocument("modularinput/data/stream_with_two_events.xml");
+ expected = resourceToXmlDocument("/modularinput/data/stream_with_two_events.xml");
assertXmlEqual(expected, found);
}
@@ -172,7 +172,7 @@ public void testWriteXmlDocumentIsSane() throws XMLStreamException, IOException,
EventWriter ew = new EventWriter(out, err);
- Document expectedXml = resourceToXmlDocument("modularinput/data/event_maximal.xml");
+ Document expectedXml = resourceToXmlDocument("/modularinput/data/event_maximal.xml");
ew.writeXmlDocument(expectedXml);
Document foundXml = stringToXmlDocument(out.toString());
diff --git a/tests/com/splunk/modularinput/InputDefinitionTest.java b/splunk/src/test/java/com/splunk/modularinput/InputDefinitionTest.java
similarity index 91%
rename from tests/com/splunk/modularinput/InputDefinitionTest.java
rename to splunk/src/test/java/com/splunk/modularinput/InputDefinitionTest.java
index bd029b5a..aa9fe324 100644
--- a/tests/com/splunk/modularinput/InputDefinitionTest.java
+++ b/splunk/src/test/java/com/splunk/modularinput/InputDefinitionTest.java
@@ -27,7 +27,7 @@ public void testParseStreamWithZeroInputs() throws IOException, SAXException, Pa
expectedDefinition.setCheckpointDir("/some/dir");
expectedDefinition.setSessionKey("123102983109283019283");
- InputStream stream = SDKTestCase.openResource("modularinput/data/conf_with_0_inputs.xml");
+ InputStream stream = SDKTestCase.openResource("/modularinput/data/conf_with_0_inputs.xml");
InputDefinition foundDefinition = InputDefinition.parseDefinition(stream);
Assert.assertTrue(expectedDefinition.equals(foundDefinition));
@@ -67,7 +67,7 @@ public void testParseStreamWithThreeInputs() throws ParserConfigurationException
}});
expectedDefinition.addInput("foobar://bbb", parameters);
- InputStream stream = SDKTestCase.openResource("modularinput/data/conf_with_2_inputs.xml");
+ InputStream stream = SDKTestCase.openResource("/modularinput/data/conf_with_2_inputs.xml");
InputDefinition foundDefinition = InputDefinition.parseDefinition(stream);
Assert.assertTrue(expectedDefinition.equals(foundDefinition));
@@ -79,7 +79,7 @@ public void testParseStreamWithThreeInputs() throws ParserConfigurationException
@Test
public void testParseMalformedInputDefinition() throws ParserConfigurationException, SAXException, IOException {
try {
- InputStream stream = SDKTestCase.openResource("modularinput/data/conf_with_invalid_inputs.xml");
+ InputStream stream = SDKTestCase.openResource("/modularinput/data/conf_with_invalid_inputs.xml");
InputDefinition foundDefinition = InputDefinition.parseDefinition(stream);
} catch (MalformedDataException e) {
Assert.assertTrue(true);
diff --git a/tests/com/splunk/modularinput/ModularInputTestCase.java b/splunk/src/test/java/com/splunk/modularinput/ModularInputTestCase.java
similarity index 97%
rename from tests/com/splunk/modularinput/ModularInputTestCase.java
rename to splunk/src/test/java/com/splunk/modularinput/ModularInputTestCase.java
index ddedf54d..ef0a7c92 100644
--- a/tests/com/splunk/modularinput/ModularInputTestCase.java
+++ b/splunk/src/test/java/com/splunk/modularinput/ModularInputTestCase.java
@@ -9,9 +9,6 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
@@ -22,10 +19,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.logging.Level;
public class ModularInputTestCase {
/**
diff --git a/tests/com/splunk/modularinput/SchemeTest.java b/splunk/src/test/java/com/splunk/modularinput/SchemeTest.java
similarity index 89%
rename from tests/com/splunk/modularinput/SchemeTest.java
rename to splunk/src/test/java/com/splunk/modularinput/SchemeTest.java
index e5db1c40..b01ced04 100644
--- a/tests/com/splunk/modularinput/SchemeTest.java
+++ b/splunk/src/test/java/com/splunk/modularinput/SchemeTest.java
@@ -22,7 +22,7 @@ public void testGenerateXmlFromSchemeWithDefaultValues() throws TransformerExcep
Scheme scheme = new Scheme("abcd");
Document generatedDocument = scheme.toXml();
- Document expectedDocument = resourceToXmlDocument("modularinput/data/scheme_with_defaults.xml");
+ Document expectedDocument = resourceToXmlDocument("/modularinput/data/scheme_with_defaults.xml");
assertXmlEqual(expectedDocument, generatedDocument);
}
@@ -51,7 +51,7 @@ public void testGenerateXmlFromScheme() throws TransformerException, ParserConfi
scheme.addArgument(arg2);
Document generatedDocument = scheme.toXml();
- Document expectedDocument = resourceToXmlDocument("modularinput/data/scheme_without_defaults.xml");
+ Document expectedDocument = resourceToXmlDocument("/modularinput/data/scheme_without_defaults.xml");
assertXmlEqual(expectedDocument, generatedDocument);
}
@@ -67,7 +67,7 @@ public void testGenerateXmlFromArgumentWithDefaultValues() throws ParserConfigur
Document generatedDoc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
argument.addToDocument(generatedDoc, generatedDoc);
- Document expectedDoc = resourceToXmlDocument("modularinput/data/argument_with_defaults.xml");
+ Document expectedDoc = resourceToXmlDocument("/modularinput/data/argument_with_defaults.xml");
assertXmlEqual(expectedDoc, generatedDoc);
}
@@ -87,7 +87,7 @@ public void testGenerateXmlFromArgument() throws ParserConfigurationException, T
Document generatedDoc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
argument.addToDocument(generatedDoc, generatedDoc);
- Document expectedDoc = resourceToXmlDocument("modularinput/data/argument_without_defaults.xml");
+ Document expectedDoc = resourceToXmlDocument("/modularinput/data/argument_without_defaults.xml");
assertXmlEqual(expectedDoc, generatedDoc);
}
diff --git a/tests/com/splunk/modularinput/ScriptTest.java b/splunk/src/test/java/com/splunk/modularinput/ScriptTest.java
similarity index 92%
rename from tests/com/splunk/modularinput/ScriptTest.java
rename to splunk/src/test/java/com/splunk/modularinput/ScriptTest.java
index f1c04201..2e4acb0b 100644
--- a/tests/com/splunk/modularinput/ScriptTest.java
+++ b/splunk/src/test/java/com/splunk/modularinput/ScriptTest.java
@@ -100,7 +100,7 @@ public void streamEvents(InputDefinition inputs, EventWriter ew) throws Malforme
Assert.assertEquals(0, returnValue);
Document found = stringToXmlDocument(out.toString());
- Document expected = resourceToXmlDocument("modularinput/data/scheme_without_defaults.xml");
+ Document expected = resourceToXmlDocument("/modularinput/data/scheme_without_defaults.xml");
assertXmlEqual(expected, found);
}
@@ -131,7 +131,7 @@ public void streamEvents(InputDefinition inputs, EventWriter ew) throws Malforme
int returnValue = script.run(
args,
eventWriter,
- SDKTestCase.openResource("modularinput/data/validation.xml")
+ SDKTestCase.openResource("/modularinput/data/validation.xml")
);
Assert.assertEquals("", err.toString());
@@ -165,10 +165,10 @@ public void streamEvents(InputDefinition inputs, EventWriter ew) throws Malforme
int returnValue = script.run(
args,
eventWriter,
- SDKTestCase.openResource("modularinput/data/validation.xml")
+ SDKTestCase.openResource("/modularinput/data/validation.xml")
);
- Document expectedXml = resourceToXmlDocument("modularinput/data/validation_error.xml");
+ Document expectedXml = resourceToXmlDocument("/modularinput/data/validation_error.xml");
Document foundXml = stringToXmlDocument(out.toString());
Assert.assertEquals("", err.toString());
@@ -208,14 +208,14 @@ public void streamEvents(InputDefinition inputs, EventWriter ew) throws Malforme
};
String[] args = new String[] {};
- InputStream input = SDKTestCase.openResource("modularinput/data/conf_with_2_inputs.xml");
+ InputStream input = SDKTestCase.openResource("/modularinput/data/conf_with_2_inputs.xml");
int returnValue = script.run(args, eventWriter, input);
Assert.assertEquals(0, returnValue);
Assert.assertEquals("", err.toString());
- Document expectedXml = resourceToXmlDocument("modularinput/data/stream_with_two_events.xml");
+ Document expectedXml = resourceToXmlDocument("/modularinput/data/stream_with_two_events.xml");
Document foundXml = stringToXmlDocument(out.toString());
assertXmlEqual(expectedXml, foundXml);
diff --git a/tests/com/splunk/modularinput/ValidationDefinitionTest.java b/splunk/src/test/java/com/splunk/modularinput/ValidationDefinitionTest.java
similarity index 95%
rename from tests/com/splunk/modularinput/ValidationDefinitionTest.java
rename to splunk/src/test/java/com/splunk/modularinput/ValidationDefinitionTest.java
index 43eeb14f..6110c04e 100644
--- a/tests/com/splunk/modularinput/ValidationDefinitionTest.java
+++ b/splunk/src/test/java/com/splunk/modularinput/ValidationDefinitionTest.java
@@ -21,7 +21,7 @@ public class ValidationDefinitionTest extends ModularInputTestCase {
@Test
public void testParseValidationDefinition() throws ParserConfigurationException, SAXException, MalformedDataException,
IOException {
- InputStream stream = SDKTestCase.openResource("modularinput/data/validation.xml");
+ InputStream stream = SDKTestCase.openResource("/modularinput/data/validation.xml");
ValidationDefinition found = ValidationDefinition.parseDefinition(stream);
ValidationDefinition expected = new ValidationDefinition();
diff --git a/tests/com/splunk/raw_field.xml b/splunk/src/test/java/com/splunk/raw_field.xml
similarity index 100%
rename from tests/com/splunk/raw_field.xml
rename to splunk/src/test/java/com/splunk/raw_field.xml
diff --git a/tests/com/splunk/splunk.license b/splunk/src/test/java/com/splunk/splunk.license
similarity index 100%
rename from tests/com/splunk/splunk.license
rename to splunk/src/test/java/com/splunk/splunk.license
diff --git a/tests/com/splunk/splunk_at_least_cupcake.license b/splunk/src/test/java/com/splunk/splunk_at_least_cupcake.license
similarity index 100%
rename from tests/com/splunk/splunk_at_least_cupcake.license
rename to splunk/src/test/java/com/splunk/splunk_at_least_cupcake.license
diff --git a/tests/com/splunk/data/atom/atom_feed_with_message.xml b/splunk/src/test/resources/data/atom/atom_feed_with_message.xml
similarity index 100%
rename from tests/com/splunk/data/atom/atom_feed_with_message.xml
rename to splunk/src/test/resources/data/atom/atom_feed_with_message.xml
diff --git a/tests/com/splunk/data/atom/atom_with_feed.xml b/splunk/src/test/resources/data/atom/atom_with_feed.xml
similarity index 100%
rename from tests/com/splunk/data/atom/atom_with_feed.xml
rename to splunk/src/test/resources/data/atom/atom_with_feed.xml
diff --git a/tests/com/splunk/data/atom/atom_with_several_entries.xml b/splunk/src/test/resources/data/atom/atom_with_several_entries.xml
similarity index 100%
rename from tests/com/splunk/data/atom/atom_with_several_entries.xml
rename to splunk/src/test/resources/data/atom/atom_with_several_entries.xml
diff --git a/tests/com/splunk/data/atom/atom_with_simple_entries.xml b/splunk/src/test/resources/data/atom/atom_with_simple_entries.xml
similarity index 100%
rename from tests/com/splunk/data/atom/atom_with_simple_entries.xml
rename to splunk/src/test/resources/data/atom/atom_with_simple_entries.xml
diff --git a/tests/com/splunk/data/atom_test_data.json b/splunk/src/test/resources/data/atom_test_data.json
similarity index 100%
rename from tests/com/splunk/data/atom_test_data.json
rename to splunk/src/test/resources/data/atom_test_data.json
diff --git a/tests/com/splunk/data/datamodels/data_model_for_pivot.json b/splunk/src/test/resources/data/datamodels/data_model_for_pivot.json
similarity index 100%
rename from tests/com/splunk/data/datamodels/data_model_for_pivot.json
rename to splunk/src/test/resources/data/datamodels/data_model_for_pivot.json
diff --git a/tests/com/splunk/data/datamodels/data_model_with_test_objects.json b/splunk/src/test/resources/data/datamodels/data_model_with_test_objects.json
similarity index 100%
rename from tests/com/splunk/data/datamodels/data_model_with_test_objects.json
rename to splunk/src/test/resources/data/datamodels/data_model_with_test_objects.json
diff --git a/tests/com/splunk/data/datamodels/empty_data_model.json b/splunk/src/test/resources/data/datamodels/empty_data_model.json
similarity index 100%
rename from tests/com/splunk/data/datamodels/empty_data_model.json
rename to splunk/src/test/resources/data/datamodels/empty_data_model.json
diff --git a/tests/com/splunk/data/datamodels/inheritance_test_data.json b/splunk/src/test/resources/data/datamodels/inheritance_test_data.json
similarity index 100%
rename from tests/com/splunk/data/datamodels/inheritance_test_data.json
rename to splunk/src/test/resources/data/datamodels/inheritance_test_data.json
diff --git a/tests/com/splunk/data/datamodels/model_with_empty_headers.json b/splunk/src/test/resources/data/datamodels/model_with_empty_headers.json
similarity index 100%
rename from tests/com/splunk/data/datamodels/model_with_empty_headers.json
rename to splunk/src/test/resources/data/datamodels/model_with_empty_headers.json
diff --git a/tests/com/splunk/data/datamodels/model_with_multiple_types.json b/splunk/src/test/resources/data/datamodels/model_with_multiple_types.json
similarity index 100%
rename from tests/com/splunk/data/datamodels/model_with_multiple_types.json
rename to splunk/src/test/resources/data/datamodels/model_with_multiple_types.json
diff --git a/tests/com/splunk/data/datamodels/model_with_unicode_headers.json b/splunk/src/test/resources/data/datamodels/model_with_unicode_headers.json
similarity index 100%
rename from tests/com/splunk/data/datamodels/model_with_unicode_headers.json
rename to splunk/src/test/resources/data/datamodels/model_with_unicode_headers.json
diff --git a/tests/com/splunk/data/datamodels/object_with_one_search.json b/splunk/src/test/resources/data/datamodels/object_with_one_search.json
similarity index 100%
rename from tests/com/splunk/data/datamodels/object_with_one_search.json
rename to splunk/src/test/resources/data/datamodels/object_with_one_search.json
diff --git a/tests/com/splunk/data/datamodels/object_with_two_searches.json b/splunk/src/test/resources/data/datamodels/object_with_two_searches.json
similarity index 100%
rename from tests/com/splunk/data/datamodels/object_with_two_searches.json
rename to splunk/src/test/resources/data/datamodels/object_with_two_searches.json
diff --git a/tests/com/splunk/data/export/4.2.5/export_results.xml b/splunk/src/test/resources/data/export/4.2.5/export_results.xml
similarity index 100%
rename from tests/com/splunk/data/export/4.2.5/export_results.xml
rename to splunk/src/test/resources/data/export/4.2.5/export_results.xml
diff --git a/tests/com/splunk/data/export/4.3.5/export_results.xml b/splunk/src/test/resources/data/export/4.3.5/export_results.xml
similarity index 100%
rename from tests/com/splunk/data/export/4.3.5/export_results.xml
rename to splunk/src/test/resources/data/export/4.3.5/export_results.xml
diff --git a/tests/com/splunk/data/export/5.0.1/export_results.xml b/splunk/src/test/resources/data/export/5.0.1/export_results.xml
similarity index 100%
rename from tests/com/splunk/data/export/5.0.1/export_results.xml
rename to splunk/src/test/resources/data/export/5.0.1/export_results.xml
diff --git a/tests/com/splunk/data/export/5.0.1/nonreporting.xml b/splunk/src/test/resources/data/export/5.0.1/nonreporting.xml
similarity index 100%
rename from tests/com/splunk/data/export/5.0.1/nonreporting.xml
rename to splunk/src/test/resources/data/export/5.0.1/nonreporting.xml
diff --git a/tests/com/splunk/data/export_test_data.json b/splunk/src/test/resources/data/export_test_data.json
similarity index 100%
rename from tests/com/splunk/data/export_test_data.json
rename to splunk/src/test/resources/data/export_test_data.json
diff --git a/tests/com/splunk/data/pivot/empty_pivot.json b/splunk/src/test/resources/data/pivot/empty_pivot.json
similarity index 100%
rename from tests/com/splunk/data/pivot/empty_pivot.json
rename to splunk/src/test/resources/data/pivot/empty_pivot.json
diff --git a/tests/com/splunk/data/results/4.2.5/results-empty.xml b/splunk/src/test/resources/data/results/4.2.5/results-empty.xml
similarity index 100%
rename from tests/com/splunk/data/results/4.2.5/results-empty.xml
rename to splunk/src/test/resources/data/results/4.2.5/results-empty.xml
diff --git a/tests/com/splunk/data/results/4.2.5/results-preview.xml b/splunk/src/test/resources/data/results/4.2.5/results-preview.xml
similarity index 100%
rename from tests/com/splunk/data/results/4.2.5/results-preview.xml
rename to splunk/src/test/resources/data/results/4.2.5/results-preview.xml
diff --git a/tests/com/splunk/data/results/4.2.5/results.xml b/splunk/src/test/resources/data/results/4.2.5/results.xml
similarity index 100%
rename from tests/com/splunk/data/results/4.2.5/results.xml
rename to splunk/src/test/resources/data/results/4.2.5/results.xml
diff --git a/tests/com/splunk/data/results/4.3.5/results-empty.xml b/splunk/src/test/resources/data/results/4.3.5/results-empty.xml
similarity index 100%
rename from tests/com/splunk/data/results/4.3.5/results-empty.xml
rename to splunk/src/test/resources/data/results/4.3.5/results-empty.xml
diff --git a/tests/com/splunk/data/results/4.3.5/results-preview.xml b/splunk/src/test/resources/data/results/4.3.5/results-preview.xml
similarity index 100%
rename from tests/com/splunk/data/results/4.3.5/results-preview.xml
rename to splunk/src/test/resources/data/results/4.3.5/results-preview.xml
diff --git a/tests/com/splunk/data/results/4.3.5/results.xml b/splunk/src/test/resources/data/results/4.3.5/results.xml
similarity index 100%
rename from tests/com/splunk/data/results/4.3.5/results.xml
rename to splunk/src/test/resources/data/results/4.3.5/results.xml
diff --git a/tests/com/splunk/data/results/5.0.2/results-empty.xml b/splunk/src/test/resources/data/results/5.0.2/results-empty.xml
similarity index 100%
rename from tests/com/splunk/data/results/5.0.2/results-empty.xml
rename to splunk/src/test/resources/data/results/5.0.2/results-empty.xml
diff --git a/tests/com/splunk/data/results/5.0.2/results-empty_preview.xml b/splunk/src/test/resources/data/results/5.0.2/results-empty_preview.xml
similarity index 100%
rename from tests/com/splunk/data/results/5.0.2/results-empty_preview.xml
rename to splunk/src/test/resources/data/results/5.0.2/results-empty_preview.xml
diff --git a/tests/com/splunk/data/results/5.0.2/results-preview.xml b/splunk/src/test/resources/data/results/5.0.2/results-preview.xml
similarity index 100%
rename from tests/com/splunk/data/results/5.0.2/results-preview.xml
rename to splunk/src/test/resources/data/results/5.0.2/results-preview.xml
diff --git a/tests/com/splunk/data/results/5.0.2/results.xml b/splunk/src/test/resources/data/results/5.0.2/results.xml
similarity index 100%
rename from tests/com/splunk/data/results/5.0.2/results.xml
rename to splunk/src/test/resources/data/results/5.0.2/results.xml
diff --git a/tests/com/splunk/results.csv b/splunk/src/test/resources/data/results/results.csv
similarity index 100%
rename from tests/com/splunk/results.csv
rename to splunk/src/test/resources/data/results/results.csv
diff --git a/tests/com/splunk/results.xml b/splunk/src/test/resources/data/results/results.xml
similarity index 100%
rename from tests/com/splunk/results.xml
rename to splunk/src/test/resources/data/results/results.xml
diff --git a/tests/com/splunk/results4.json b/splunk/src/test/resources/data/results/results4.json
similarity index 100%
rename from tests/com/splunk/results4.json
rename to splunk/src/test/resources/data/results/results4.json
diff --git a/tests/com/splunk/results5.json b/splunk/src/test/resources/data/results/results5.json
similarity index 100%
rename from tests/com/splunk/results5.json
rename to splunk/src/test/resources/data/results/results5.json
diff --git a/tests/com/splunk/resultsExport.json b/splunk/src/test/resources/data/results/resultsExport.json
similarity index 100%
rename from tests/com/splunk/resultsExport.json
rename to splunk/src/test/resources/data/results/resultsExport.json
diff --git a/tests/com/splunk/resultsExport.xml b/splunk/src/test/resources/data/results/resultsExport.xml
similarity index 100%
rename from tests/com/splunk/resultsExport.xml
rename to splunk/src/test/resources/data/results/resultsExport.xml
diff --git a/tests/com/splunk/resultsMV.csv b/splunk/src/test/resources/data/results/resultsMV.csv
similarity index 100%
rename from tests/com/splunk/resultsMV.csv
rename to splunk/src/test/resources/data/results/resultsMV.csv
diff --git a/tests/com/splunk/resultsMV.xml b/splunk/src/test/resources/data/results/resultsMV.xml
similarity index 100%
rename from tests/com/splunk/resultsMV.xml
rename to splunk/src/test/resources/data/results/resultsMV.xml
diff --git a/tests/com/splunk/resultsMV4.json b/splunk/src/test/resources/data/results/resultsMV4.json
similarity index 100%
rename from tests/com/splunk/resultsMV4.json
rename to splunk/src/test/resources/data/results/resultsMV4.json
diff --git a/tests/com/splunk/resultsMV5.json b/splunk/src/test/resources/data/results/resultsMV5.json
similarity index 100%
rename from tests/com/splunk/resultsMV5.json
rename to splunk/src/test/resources/data/results/resultsMV5.json
diff --git a/tests/com/splunk/resultsMVFuture.json b/splunk/src/test/resources/data/results/resultsMVFuture.json
similarity index 100%
rename from tests/com/splunk/resultsMVFuture.json
rename to splunk/src/test/resources/data/results/resultsMVFuture.json
diff --git a/tests/com/splunk/resultsMVOneshot.csv b/splunk/src/test/resources/data/results/resultsMVOneshot.csv
similarity index 100%
rename from tests/com/splunk/resultsMVOneshot.csv
rename to splunk/src/test/resources/data/results/resultsMVOneshot.csv
diff --git a/tests/com/splunk/resultsMVOneshot.xml b/splunk/src/test/resources/data/results/resultsMVOneshot.xml
similarity index 100%
rename from tests/com/splunk/resultsMVOneshot.xml
rename to splunk/src/test/resources/data/results/resultsMVOneshot.xml
diff --git a/tests/com/splunk/resultsMVOneshot4.json b/splunk/src/test/resources/data/results/resultsMVOneshot4.json
similarity index 100%
rename from tests/com/splunk/resultsMVOneshot4.json
rename to splunk/src/test/resources/data/results/resultsMVOneshot4.json
diff --git a/tests/com/splunk/resultsMVOneshot5.json b/splunk/src/test/resources/data/results/resultsMVOneshot5.json
similarity index 100%
rename from tests/com/splunk/resultsMVOneshot5.json
rename to splunk/src/test/resources/data/results/resultsMVOneshot5.json
diff --git a/tests/com/splunk/resultsMVOneshotFuture.json b/splunk/src/test/resources/data/results/resultsMVOneshotFuture.json
similarity index 100%
rename from tests/com/splunk/resultsMVOneshotFuture.json
rename to splunk/src/test/resources/data/results/resultsMVOneshotFuture.json
diff --git a/tests/com/splunk/resultsPreview.xml b/splunk/src/test/resources/data/results/resultsPreview.xml
similarity index 100%
rename from tests/com/splunk/resultsPreview.xml
rename to splunk/src/test/resources/data/results/resultsPreview.xml
diff --git a/tests/com/splunk/data/resultsreader_test_data.json b/splunk/src/test/resources/data/resultsreader_test_data.json
similarity index 100%
rename from tests/com/splunk/data/resultsreader_test_data.json
rename to splunk/src/test/resources/data/resultsreader_test_data.json
diff --git a/tests/com/splunk/modularinput/data/argument_with_defaults.xml b/splunk/src/test/resources/modularinput/data/argument_with_defaults.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/argument_with_defaults.xml
rename to splunk/src/test/resources/modularinput/data/argument_with_defaults.xml
diff --git a/tests/com/splunk/modularinput/data/argument_without_defaults.xml b/splunk/src/test/resources/modularinput/data/argument_without_defaults.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/argument_without_defaults.xml
rename to splunk/src/test/resources/modularinput/data/argument_without_defaults.xml
diff --git a/tests/com/splunk/modularinput/data/conf_with_0_inputs.xml b/splunk/src/test/resources/modularinput/data/conf_with_0_inputs.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/conf_with_0_inputs.xml
rename to splunk/src/test/resources/modularinput/data/conf_with_0_inputs.xml
diff --git a/tests/com/splunk/modularinput/data/conf_with_2_inputs.xml b/splunk/src/test/resources/modularinput/data/conf_with_2_inputs.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/conf_with_2_inputs.xml
rename to splunk/src/test/resources/modularinput/data/conf_with_2_inputs.xml
diff --git a/tests/com/splunk/modularinput/data/conf_with_invalid_inputs.xml b/splunk/src/test/resources/modularinput/data/conf_with_invalid_inputs.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/conf_with_invalid_inputs.xml
rename to splunk/src/test/resources/modularinput/data/conf_with_invalid_inputs.xml
diff --git a/tests/com/splunk/modularinput/data/event_maximal.xml b/splunk/src/test/resources/modularinput/data/event_maximal.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/event_maximal.xml
rename to splunk/src/test/resources/modularinput/data/event_maximal.xml
diff --git a/tests/com/splunk/modularinput/data/event_minimal.xml b/splunk/src/test/resources/modularinput/data/event_minimal.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/event_minimal.xml
rename to splunk/src/test/resources/modularinput/data/event_minimal.xml
diff --git a/tests/com/splunk/modularinput/data/scheme_with_defaults.xml b/splunk/src/test/resources/modularinput/data/scheme_with_defaults.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/scheme_with_defaults.xml
rename to splunk/src/test/resources/modularinput/data/scheme_with_defaults.xml
diff --git a/tests/com/splunk/modularinput/data/scheme_without_defaults.xml b/splunk/src/test/resources/modularinput/data/scheme_without_defaults.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/scheme_without_defaults.xml
rename to splunk/src/test/resources/modularinput/data/scheme_without_defaults.xml
diff --git a/tests/com/splunk/modularinput/data/stream_with_one_event.xml b/splunk/src/test/resources/modularinput/data/stream_with_one_event.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/stream_with_one_event.xml
rename to splunk/src/test/resources/modularinput/data/stream_with_one_event.xml
diff --git a/tests/com/splunk/modularinput/data/stream_with_two_events.xml b/splunk/src/test/resources/modularinput/data/stream_with_two_events.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/stream_with_two_events.xml
rename to splunk/src/test/resources/modularinput/data/stream_with_two_events.xml
diff --git a/tests/com/splunk/modularinput/data/validation.xml b/splunk/src/test/resources/modularinput/data/validation.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/validation.xml
rename to splunk/src/test/resources/modularinput/data/validation.xml
diff --git a/tests/com/splunk/modularinput/data/validation_error.xml b/splunk/src/test/resources/modularinput/data/validation_error.xml
similarity index 100%
rename from tests/com/splunk/modularinput/data/validation_error.xml
rename to splunk/src/test/resources/modularinput/data/validation_error.xml
diff --git a/splunk/src/test/resources/results.csv b/splunk/src/test/resources/results.csv
new file mode 100644
index 00000000..64040eb7
--- /dev/null
+++ b/splunk/src/test/resources/results.csv
@@ -0,0 +1,4 @@
+"sum(kb)","series"
+"14372242.758775","twitter"
+"267802.333926","splunkd"
+"5979.036338","splunkd_access"
\ No newline at end of file
diff --git a/splunk/src/test/resources/results.xml b/splunk/src/test/resources/results.xml
new file mode 100644
index 00000000..b34137ab
--- /dev/null
+++ b/splunk/src/test/resources/results.xml
@@ -0,0 +1,53 @@
+
+
+
+
+series
+sum(kb)
+
+
+
+ base lispy: [ AND ]
+ search context: user='admin', app='search', bs-pathname='/some/path'
+
+
+
+ twitter
+
+
+ 14372242.758775
+
+
+
+
+ splunkd
+
+
+ 267802.333926
+
+
+
+
+ flurry
+
+
+ 12576.454102
+
+
+
+
+ splunkd_access
+
+
+ 5979.036338
+
+
+
+
+ splunk_web_access
+
+
+ 5838.935649
+
+
+
diff --git a/splunk/src/test/resources/results4.json b/splunk/src/test/resources/results4.json
new file mode 100644
index 00000000..98711985
--- /dev/null
+++ b/splunk/src/test/resources/results4.json
@@ -0,0 +1,14 @@
+[
+ {
+ "sum(kb)":"14372242.758775",
+ "series":"twitter"
+ },
+ {
+ "sum(kb)":"267802.333926",
+ "series":"splunkd"
+ },
+ {
+ "sum(kb)":"5979.036338",
+ "series":"splunkd_access"
+ }
+]
diff --git a/splunk/src/test/resources/results5.json b/splunk/src/test/resources/results5.json
new file mode 100644
index 00000000..6475c51b
--- /dev/null
+++ b/splunk/src/test/resources/results5.json
@@ -0,0 +1 @@
+{"preview":false,"init_offset":0,"messages":[{"type":"DEBUG","text":"base lispy: [ AND index::_internal ]"},{"type":"DEBUG","text":"search context: user=\"admin\", app=\"search\", bs-pathname=\"/Users/fross/splunks/splunk-5.0/etc\""}],"results":[{"sum(kb)":"14372242.758775","series":"twitter"},{"sum(kb)":"267802.333926","series":"splunkd"},{"sum(kb)":"5979.036338","series":"splunkd_access"}]}
diff --git a/splunk/src/test/resources/resultsExport.json b/splunk/src/test/resources/resultsExport.json
new file mode 100644
index 00000000..ca65e81f
--- /dev/null
+++ b/splunk/src/test/resources/resultsExport.json
@@ -0,0 +1,69 @@
+{"preview":true,"offset":0,"lastrow":true,"result":{"host":"Andy-PC","count":"62"}}
+{"preview":true,"offset":0,"result":{"host":"Andy-PC","count":"1682"}}
+{"preview":true,"offset":1,"result":{"host":"andy-pc","count":"3"}}
+{"preview":true,"offset":2,"lastrow":true,"result":{"host":"three.four.com","count":"1495"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"232"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"2766"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"133"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"2579"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"1786"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"3543"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"133"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"3356"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"3184"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"4242"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"133"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"4055"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"7052"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"6176"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"133"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"5989"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"10034"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"8388"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"135"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"7689"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"12668"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"11176"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"135"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"10323"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"13996"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"28317"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"135"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"11651"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"15030"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"28834"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"135"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"12685"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"17160"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"29899"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"135"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"14815"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"20432"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"31535"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"135"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"18087"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"23862"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"33250"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"135"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"21517"}}
+{"preview":true,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":true,"offset":1,"result":{"host":"ANDY-PC","count":"29732"}}
+{"preview":true,"offset":2,"result":{"host":"Andy-PC","count":"36185"}}
+{"preview":true,"offset":3,"result":{"host":"andy-pc","count":"135"}}
+{"preview":true,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"27772"}}
+{"preview":false,"offset":0,"result":{"host":"172.16.35.130","count":"16"}}
+{"preview":false,"offset":1,"result":{"host":"ANDY-PC","count":"29732"}}
+{"preview":false,"offset":2,"result":{"host":"Andy-PC","count":"36185"}}
+{"preview":false,"offset":3,"result":{"host":"andy-pc","count":"135"}}
+{"preview":false,"offset":4,"lastrow":true,"result":{"host":"three.four.com","count":"35994"}}
diff --git a/splunk/src/test/resources/resultsExport.xml b/splunk/src/test/resources/resultsExport.xml
new file mode 100644
index 00000000..1e388611
--- /dev/null
+++ b/splunk/src/test/resources/resultsExport.xml
@@ -0,0 +1,907 @@
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ Andy-PC
+
+
+ 62
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ Andy-PC
+
+
+ 1682
+
+
+
+
+ andy-pc
+
+
+ 3
+
+
+
+
+ three.four.com
+
+
+ 1495
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 232
+
+
+
+
+ Andy-PC
+
+
+ 2766
+
+
+
+
+ andy-pc
+
+
+ 133
+
+
+
+
+ three.four.com
+
+
+ 2579
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 1786
+
+
+
+
+ Andy-PC
+
+
+ 3543
+
+
+
+
+ andy-pc
+
+
+ 133
+
+
+
+
+ three.four.com
+
+
+ 3356
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 3184
+
+
+
+
+ Andy-PC
+
+
+ 4242
+
+
+
+
+ andy-pc
+
+
+ 133
+
+
+
+
+ three.four.com
+
+
+ 4055
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 4446
+
+
+
+
+ Andy-PC
+
+
+ 4873
+
+
+
+
+ andy-pc
+
+
+ 133
+
+
+
+
+ three.four.com
+
+
+ 4686
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 9222
+
+
+
+
+ Andy-PC
+
+
+ 7261
+
+
+
+
+ andy-pc
+
+
+ 133
+
+
+
+
+ three.four.com
+
+
+ 7074
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 11722
+
+
+
+
+ Andy-PC
+
+
+ 10039
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 9377
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 12668
+
+
+
+
+ Andy-PC
+
+
+ 11176
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 10323
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 13996
+
+
+
+
+ Andy-PC
+
+
+ 28317
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 11651
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 16034
+
+
+
+
+ Andy-PC
+
+
+ 29336
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 13689
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 19382
+
+
+
+
+ Andy-PC
+
+
+ 31010
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 17037
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 20432
+
+
+
+
+ Andy-PC
+
+
+ 31535
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 18087
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 23862
+
+
+
+
+ Andy-PC
+
+
+ 33250
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 21517
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 27080
+
+
+
+
+ Andy-PC
+
+
+ 34859
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 24735
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 28092
+
+
+
+
+ Andy-PC
+
+
+ 35365
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 25747
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 29732
+
+
+
+
+ Andy-PC
+
+
+ 36185
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 30641
+
+
+
+
+
+
+host
+count
+
+
+
+ base lispy: [ AND ]
+ search context: user="admin", app="search", bs-pathname="C:\Program Files\Splunk\etc"
+
+
+
+
+ 172.16.35.130
+
+
+ 16
+
+
+
+
+ ANDY-PC
+
+
+ 29732
+
+
+
+
+ Andy-PC
+
+
+ 36185
+
+
+
+
+ andy-pc
+
+
+ 135
+
+
+
+
+ three.four.com
+
+
+ 35994
+
+
+
\ No newline at end of file
diff --git a/splunk/src/test/resources/resultsMV.csv b/splunk/src/test/resources/resultsMV.csv
new file mode 100644
index 00000000..b78d26a4
--- /dev/null
+++ b/splunk/src/test/resources/resultsMV.csv
@@ -0,0 +1,3 @@
+"_bkt","_cd","_indextime","_raw","_serial","_si","_sourcetype","_subsecond","_time",host,index,linecount,source,sourcetype,"splunk_server"
+"_internal~115~BC509B13-C34D-4A69-B216-488806E9EA63","115:4933",1354063445,"11-27-2012 16:44:05.208 -0800 INFO Metrics - group=udpin_connections, *:9999, sourcePort=9999, _udp_bps=0.00, _udp_kbps=0.00, _udp_avg_thruput=0.00, _udp_kprocessed=0.00, _udp_eps=0.00",0,"dfoster-mbp17.local
+_internal",splunkd,".208","2012-11-27T16:44:05.208-08:00","dfoster-mbp17.local","_internal",1,"/Applications/splunkbeta_140868_rc7/var/log/splunk/metrics.log",splunkd,"dfoster-mbp17.local"
diff --git a/splunk/src/test/resources/resultsMV.xml b/splunk/src/test/resources/resultsMV.xml
new file mode 100644
index 00000000..4ef5d7e3
--- /dev/null
+++ b/splunk/src/test/resources/resultsMV.xml
@@ -0,0 +1,68 @@
+
+
+
+
+_bkt
+_cd
+_indextime
+_raw
+_serial
+_si
+_sourcetype
+_subsecond
+_time
+host
+index
+linecount
+source
+sourcetype
+splunk_server
+
+
+
+
+ _internal~115~BC509B13-C34D-4A69-B216-488806E9EA63
+
+
+ 115:4502
+
+
+ 1354063414
+
+ 11-27-2012 16:43:34.271 -0800 INFO Metrics - group=udpin_connections, *:9999, sourcePort=9999, _udp_bps=0.00, _udp_kbps=0.00, _udp_avg_thruput=0.00, _udp_kprocessed=0.00, _udp_eps=0.00
+
+ 0
+
+
+ dfoster-mbp17.local
+ _internal
+
+
+ splunkd
+
+
+ .271
+
+
+ 2012-11-27T16:43:34.271-08:00
+
+
+ dfoster-mbp17.local
+
+
+ _internal
+
+
+ 1
+
+
+ /Applications/splunkbeta_140868_rc7/var/log/splunk/metrics.log
+
+
+ splunkd
+
+
+ dfoster-mbp17.local
+
+
+
\ No newline at end of file
diff --git a/splunk/src/test/resources/resultsMV4.json b/splunk/src/test/resources/resultsMV4.json
new file mode 100644
index 00000000..a32aa549
--- /dev/null
+++ b/splunk/src/test/resources/resultsMV4.json
@@ -0,0 +1,18 @@
+[
+ {
+ "_cd": "187:18991",
+ "_indextime": "1354063535",
+ "_raw": "11-27-2012 16:45:34.924 -0800 INFO WatchedFile - Will begin reading at offset=22899111 for file='/Applications/splunk_434/var/log/splunk/metrics.log'.",
+ "_serial": "0",
+ "_si": "dfoster-mbp17.local\n_internal",
+ "_sourcetype": "splunkd",
+ "_subsecond": ".924",
+ "_time": "2012-11-27T16:45:34.924-08:00",
+ "host": "dfoster-mbp17.local",
+ "index": "_internal",
+ "linecount": "1",
+ "source": "/Applications/splunk_434/var/log/splunk/splunkd.log",
+ "sourcetype": "splunkd",
+ "splunk_server": "dfoster-mbp17.local"
+ }
+]
\ No newline at end of file
diff --git a/splunk/src/test/resources/resultsMV5.json b/splunk/src/test/resources/resultsMV5.json
new file mode 100644
index 00000000..da98dee3
--- /dev/null
+++ b/splunk/src/test/resources/resultsMV5.json
@@ -0,0 +1 @@
+{"preview":false,"init_offset":0,"messages":[{"type":"DEBUG","text":"base lispy: [ AND index::_internal ]"},{"type":"DEBUG","text":"search context: user=\"admin\", app=\"search\", bs-pathname=\"/Applications/splunkbeta_140868_rc7/etc\""}],"results":[{"_bkt":"_internal~115~BC509B13-C34D-4A69-B216-488806E9EA63","_cd":"115:5186","_indextime":"1354063462","_raw":"127.0.0.1 - admin [27/Nov/2012:16:44:22.581 -0800] \"GET /services/messages?count=-1 HTTP/1.1\" 200 1998 - - - 1ms","_serial":"0","_si":"dfoster-mbp17.local\n_internal","_sourcetype":"splunkd_access","_subsecond":".581","_time":"2012-11-27T16:44:22.581-08:00","host":"dfoster-mbp17.local","index":"_internal","linecount":"1","source":"/Applications/splunkbeta_140868_rc7/var/log/splunk/splunkd_access.log","sourcetype":"splunkd_access","splunk_server":"dfoster-mbp17.local"}]}
\ No newline at end of file
diff --git a/splunk/src/test/resources/resultsMVFuture.json b/splunk/src/test/resources/resultsMVFuture.json
new file mode 100644
index 00000000..643b1c8e
--- /dev/null
+++ b/splunk/src/test/resources/resultsMVFuture.json
@@ -0,0 +1 @@
+{"preview":false,"init_offset":0,"messages":[{"type":"DEBUG","text":"base lispy: [ AND index::_internal ]"},{"type":"DEBUG","text":"search context: user=\"admin\", app=\"search\", bs-pathname=\"/Applications/splunkbeta_140868_rc7/etc\""}],"results":[{"_bkt":"_internal~115~BC509B13-C34D-4A69-B216-488806E9EA63","_cd":"115:5186","_indextime":"1354063462","_raw":"127.0.0.1 - admin [27/Nov/2012:16:44:22.581 -0800] \"GET /services/messages?count=-1 HTTP/1.1\" 200 1998 - - - 1ms","_serial":"0","_si":["dfoster-mbp17.local","_internal"],"_sourcetype":"splunkd_access","_subsecond":".581","_time":"2012-11-27T16:44:22.581-08:00","host":"dfoster-mbp17.local","index":"_internal","linecount":"1","source":"/Applications/splunkbeta_140868_rc7/var/log/splunk/splunkd_access.log","sourcetype":"splunkd_access","splunk_server":"dfoster-mbp17.local"}]}
\ No newline at end of file
diff --git a/splunk/src/test/resources/resultsMVOneshot.csv b/splunk/src/test/resources/resultsMVOneshot.csv
new file mode 100644
index 00000000..9118b992
--- /dev/null
+++ b/splunk/src/test/resources/resultsMVOneshot.csv
@@ -0,0 +1,4 @@
+
+"_bkt","_cd","_indextime","_raw","_serial","_si","_sourcetype","_subsecond","_time",host,index,linecount,source,sourcetype,"splunk_server"
+"_internal~114~BC509B13-C34D-4A69-B216-488806E9EA63","114:33623",1354062581,"127.0.0.1 - admin [27/Nov/2012:16:29:39.149 -0800] ""GET /services/messages?count=-1 HTTP/1.1"" 200 1998 - - - 1ms",0,"dfoster-mbp17.local
+_internal","splunkd_access",".149","2012-11-27T16:29:39.149-08:00","dfoster-mbp17.local","_internal",1,"/Applications/splunkbeta_140868_rc7/var/log/splunk/splunkd_access.log","splunkd_access","dfoster-mbp17.local"
diff --git a/splunk/src/test/resources/resultsMVOneshot.xml b/splunk/src/test/resources/resultsMVOneshot.xml
new file mode 100644
index 00000000..a03c5746
--- /dev/null
+++ b/splunk/src/test/resources/resultsMVOneshot.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+_bkt
+_cd
+_indextime
+_raw
+_serial
+_si
+_sourcetype
+_subsecond
+_time
+host
+index
+linecount
+source
+sourcetype
+splunk_server
+
+
+
+
+ _internal~114~BC509B13-C34D-4A69-B216-488806E9EA63
+
+
+ 114:33595
+
+
+ 1354062575
+
+ 11-27-2012 16:29:35.217 -0800 INFO Metrics - group=udpin_connections, *:9999, sourcePort=9999, _udp_bps=0.00, _udp_kbps=0.00, _udp_avg_thruput=0.00, _udp_kprocessed=0.00, _udp_eps=0.00
+
+ 0
+
+
+ dfoster-mbp17.local
+ _internal
+
+
+ splunkd
+
+
+ .217
+
+
+ 2012-11-27T16:29:35.217-08:00
+
+
+ dfoster-mbp17.local
+
+
+ _internal
+
+
+ 1
+
+
+ /Applications/splunkbeta_140868_rc7/var/log/splunk/metrics.log
+
+
+ splunkd
+
+
+ dfoster-mbp17.local
+
+
+
\ No newline at end of file
diff --git a/splunk/src/test/resources/resultsMVOneshot4.json b/splunk/src/test/resources/resultsMVOneshot4.json
new file mode 100644
index 00000000..0dc668c7
--- /dev/null
+++ b/splunk/src/test/resources/resultsMVOneshot4.json
@@ -0,0 +1,19 @@
+
+[
+ {
+ "_cd": "184:21387",
+ "_indextime": "1353099184",
+ "_raw": "2012-11-16 12:53:04.502 -0800 Interrupt signal received",
+ "_serial": "0",
+ "_si": "dfoster-mbp17.local\n_internal",
+ "_sourcetype": "splunkd_stderr",
+ "_subsecond": ".502",
+ "_time": "2012-11-16T12:53:04.502-08:00",
+ "host": "dfoster-mbp17.local",
+ "index": "_internal",
+ "linecount": "1",
+ "source": "/Applications/splunk_434/var/log/splunk/splunkd_stderr.log",
+ "sourcetype": "splunkd_stderr",
+ "splunk_server": "dfoster-mbp17.local"
+ }
+]
\ No newline at end of file
diff --git a/splunk/src/test/resources/resultsMVOneshot5.json b/splunk/src/test/resources/resultsMVOneshot5.json
new file mode 100644
index 00000000..50846818
--- /dev/null
+++ b/splunk/src/test/resources/resultsMVOneshot5.json
@@ -0,0 +1,2 @@
+
+{"preview":false,"init_offset":0,"messages":[{"type":"DEBUG","text":"base lispy: [ AND index::_internal ]"},{"type":"DEBUG","text":"search context: user=\"admin\", app=\"search\", bs-pathname=\"/Applications/splunkbeta_140868_rc7/etc\""}],"results":[{"_bkt":"_internal~114~BC509B13-C34D-4A69-B216-488806E9EA63","_cd":"114:34048","_indextime":"1354062607","_raw":"11-27-2012 16:30:06.140 -0800 INFO Metrics - group=udpin_connections, *:9999, sourcePort=9999, _udp_bps=0.00, _udp_kbps=0.00, _udp_avg_thruput=0.00, _udp_kprocessed=0.00, _udp_eps=0.00","_serial":"0","_si":"dfoster-mbp17.local\n_internal","_sourcetype":"splunkd","_subsecond":".140","_time":"2012-11-27T16:30:06.140-08:00","host":"dfoster-mbp17.local","index":"_internal","linecount":"1","source":"/Applications/splunkbeta_140868_rc7/var/log/splunk/metrics.log","sourcetype":"splunkd","splunk_server":"dfoster-mbp17.local"}]}
\ No newline at end of file
diff --git a/splunk/src/test/resources/resultsMVOneshotFuture.json b/splunk/src/test/resources/resultsMVOneshotFuture.json
new file mode 100644
index 00000000..0d200b61
--- /dev/null
+++ b/splunk/src/test/resources/resultsMVOneshotFuture.json
@@ -0,0 +1,2 @@
+
+{"preview":false,"init_offset":0,"messages":[{"type":"DEBUG","text":"base lispy: [ AND index::_internal ]"},{"type":"DEBUG","text":"search context: user=\"admin\", app=\"search\", bs-pathname=\"/Applications/splunkbeta_140868_rc7/etc\""}],"results":[{"_bkt":"_internal~114~BC509B13-C34D-4A69-B216-488806E9EA63","_cd":"114:34048","_indextime":"1354062607","_raw":"11-27-2012 16:30:06.140 -0800 INFO Metrics - group=udpin_connections, *:9999, sourcePort=9999, _udp_bps=0.00, _udp_kbps=0.00, _udp_avg_thruput=0.00, _udp_kprocessed=0.00, _udp_eps=0.00","_serial":"0","_si":["dfoster-mbp17.local","_internal"],"_sourcetype":"splunkd","_subsecond":".140","_time":"2012-11-27T16:30:06.140-08:00","host":"dfoster-mbp17.local","index":"_internal","linecount":"1","source":"/Applications/splunkbeta_140868_rc7/var/log/splunk/metrics.log","sourcetype":"splunkd","splunk_server":"dfoster-mbp17.local"}]}
\ No newline at end of file
diff --git a/splunk/src/test/resources/resultsPreview.xml b/splunk/src/test/resources/resultsPreview.xml
new file mode 100644
index 00000000..54939576
--- /dev/null
+++ b/splunk/src/test/resources/resultsPreview.xml
@@ -0,0 +1,1057 @@
+
+
+
+
+_cd
+_indextime
+_kv
+_raw
+_serial
+_si
+_sourcetype
+_subsecond
+_time
+active_hist_searches
+active_realtime_searches
+app
+appCodeName
+appName
+browser
+bytes
+class
+client_app
+clientip
+component
+count
+date_hour
+date_mday
+date_minute
+date_month
+date_second
+date_wday
+date_year
+date_zone
+delimiter
+display_row_numbers
+drop_count
+earliest
+enable_event_actions
+enable_field_actions
+entity_name
+eventtype
+field_list
+fields
+file
+fillcontents
+group
+host
+ident
+index
+jobStatus
+latest
+line
+linecount
+log_level
+max_lines
+max_lines_constraint
+max_time
+mean_preview_period
+message
+message_level
+method
+min_freq
+min_lines
+name
+namespace
+offset
+other
+output_mode
+output_time_format
+platform
+prefix
+punct
+q
+referer
+referer_domain
+req_time
+requestid
+reverse_order
+root
+s
+search
+segmentation
+show_empty_fields
+sid
+sortDir
+sortKey
+sort_dir
+sort_key
+source
+sourcetype
+spent
+splunk_server
+staticFields
+status
+time_format
+timeendpos
+timestartpos
+truncation_mode
+uri
+uri_path
+uri_query
+user
+userAgent
+useragent
+version
+
+
+
+
+ 54:8568
+
+
+ 1355946537
+
+
+ 1
+
+ 2012-12-19 11:48:55,424 INFO [50d21a262616082d0] root:535 - CONFIG: mrsparkle_path (str): /Users/fross/splunks/splunk-4.3.5/share/search/mrsparkle
+
+ 731
+
+
+ fross-mbp15.local
+ _internal
+
+
+ splunk_web_service
+
+
+ .424
+
+
+ 2012-12-19T11:48:55.424-08:00
+
+
+ root
+
+
+ 11
+
+
+ 19
+
+
+ 48
+
+
+ december
+
+
+ 55
+
+
+ wednesday
+
+
+ 2012
+
+
+ local
+
+
+ fross-mbp15.local
+
+
+ _internal
+
+
+ 535
+
+
+ 1
+
+
+ INFO
+
+
+ CONFIG: mrsparkle_path (str): /Users/fross/splunks/splunk-4.3.5/share/search/mrsparkle
+
+
+ --_::,_t[]_:_-_:__():_////-..///
+
+
+ 50d21a262616082d0
+
+
+ /Users/fross/splunks/splunk-4.3.5/var/log/splunk/web_service.log
+
+
+ splunk_web_service
+
+
+ fross-mbp15.local
+
+
+ 24
+
+
+ 0
+
+
+
+
+ 54:8562
+
+
+ 1355946537
+
+
+ 1
+
+ 2012-12-19 11:48:55,424 INFO [50d21a262616082d0] root:535 - CONFIG: module_dir (str): share/splunk/search_mrsparkle/modules
+
+ 732
+
+
+ fross-mbp15.local
+ _internal
+
+
+ splunk_web_service
+
+
+ .424
+
+
+ 2012-12-19T11:48:55.424-08:00
+
+
+ root
+
+
+ 11
+
+
+ 19
+
+
+ 48
+
+
+ december
+
+
+ 55
+
+
+ wednesday
+
+
+ 2012
+
+
+ local
+
+
+ fross-mbp15.local
+
+
+ _internal
+
+
+ 535
+
+
+ 1
+
+
+ INFO
+
+
+ CONFIG: module_dir (str): share/splunk/search_mrsparkle/modules
+
+
+ --_::,_t[]_:_-_:__():_///
+
+
+ 50d21a262616082d0
+
+
+ /Users/fross/splunks/splunk-4.3.5/var/log/splunk/web_service.log
+
+
+ splunk_web_service
+
+
+ fross-mbp15.local
+
+
+ 24
+
+
+ 0
+
+
+
+
+ 54:8674
+
+
+ 1355946537
+
+
+ 1
+
+ 2012-12-19 11:48:55,425 INFO [50d21a262616082d0] root:535 - CONFIG: template_dir (str): share/splunk/search_mrsparkle/templates
+
+ 728
+
+
+ fross-mbp15.local
+ _internal
+
+
+ splunk_web_service
+
+
+ .425
+
+
+ 2012-12-19T11:48:55.425-08:00
+
+
+ root
+
+
+ 11
+
+
+ 19
+
+
+ 48
+
+
+ december
+
+
+ 55
+
+
+ wednesday
+
+
+ 2012
+
+
+ local
+
+
+ fross-mbp15.local
+
+
+ _internal
+
+
+ 535
+
+
+ 1
+
+
+ INFO
+
+
+ CONFIG: template_dir (str): share/splunk/search_mrsparkle/templates
+
+
+ --_::,_t[]_:_-_:__():_///
+
+
+ 50d21a262616082d0
+
+
+ /Users/fross/splunks/splunk-4.3.5/var/log/splunk/web_service.log
+
+
+ splunk_web_service
+
+
+ fross-mbp15.local
+
+
+ 24
+
+
+ 0
+
+
+
+
+ 54:8662
+
+
+ 1355946537
+
+
+ 1
+
+ 2012-12-19 11:48:55,425 INFO [50d21a262616082d0] root:535 - CONFIG: staticdir (str): /Users/fross/splunks/splunk-4.3.5/share/splunk/search_mrsparkle/exposed
+
+ 729
+
+
+ fross-mbp15.local
+ _internal
+
+
+ splunk_web_service
+
+
+ .425
+
+
+ 2012-12-19T11:48:55.425-08:00
+
+
+ root
+
+
+ 11
+
+
+ 19
+
+
+ 48
+
+
+ december
+
+
+ 55
+
+
+ wednesday
+
+
+ 2012
+
+
+ local
+
+
+ fross-mbp15.local
+
+
+ _internal
+
+
+ 535
+
+
+ 1
+
+
+ INFO
+
+
+ CONFIG: staticdir (str): /Users/fross/splunks/splunk-4.3.5/share/splunk/search_mrsparkle/exposed
+
+
+ --_::,_t[]_:_-_:__():_////-..////
+
+
+ 50d21a262616082d0
+
+
+ /Users/fross/splunks/splunk-4.3.5/var/log/splunk/web_service.log
+
+
+ splunk_web_service
+
+
+ fross-mbp15.local
+
+
+ 24
+
+
+ 0
+
+
+
+
+ 54:8651
+
+
+ 1355946537
+
+
+ 1
+
+ 2012-12-19 11:48:55,425 INFO [50d21a262616082d0] root:535 - CONFIG: static_dir (str): share/splunk/search_mrsparkle/exposed
+
+ 730
+
+
+ fross-mbp15.local
+ _internal
+
+
+ splunk_web_service
+
+
+ .425
+
+
+ 2012-12-19T11:48:55.425-08:00
+
+
+ root
+
+
+ 11
+
+
+ 19
+
+
+ 48
+
+
+ december
+
+
+ 55
+
+
+ wednesday
+
+
+ 2012
+
+
+ local
+
+
+ fross-mbp15.local
+
+
+ _internal
+
+
+ 535
+
+
+ 1
+
+
+ INFO
+
+
+ CONFIG: static_dir (str): share/splunk/search_mrsparkle/exposed
+
+
+ --_::,_t[]_:_-_:__():_///
+
+
+ 50d21a262616082d0
+
+
+ /Users/fross/splunks/splunk-4.3.5/var/log/splunk/web_service.log
+
+
+ splunk_web_service
+
+
+ fross-mbp15.local
+
+
+ 24
+
+
+ 0
+
+
+
+
+ 54:9267
+
+
+ 1355946552
+
+
+ 1
+
+ 12-19-2012 11:49:12.313 -0800 INFO Metrics - group=search_concurrency, system total, active_hist_searches=0, active_realtime_searches=0
+
+ 726
+
+
+ fross-mbp15.local
+ _internal
+
+
+ splunkd
+
+
+ .313
+
+
+ 2012-12-19T11:49:12.313-08:00
+
+
+ 0
+
+
+ 0
+
+
+ Metrics
+
+
+ 11
+
+
+ 19
+
+
+ 49
+
+
+ december
+
+
+ 12
+
+
+ wednesday
+
+
+ 2012
+
+
+ -480
+
+
+ search_concurrency
+
+
+ fross-mbp15.local
+
+
+ _internal
+
+
+ 1
+
+
+ INFO
+
+
+ group=search_concurrency, system total, active_hist_searches=0, active_realtime_searches=0
+
+
+ --_::._-____-_=,__,_=,_=
+
+
+ /Users/fross/splunks/splunk-4.3.5/var/log/splunk/metrics.log
+
+
+ splunkd
+
+
+ fross-mbp15.local
+
+
+ 29
+
+
+ 0
+
+
+
+
+ 54:9262
+
+
+ 1355946552
+
+
+ 1
+
+ 12-19-2012 11:49:12.313 -0800 INFO Metrics - group=realtime_search_data, system total, drop_count=0
+
+ 727
+
+
+ fross-mbp15.local
+ _internal
+
+
+ splunkd
+
+
+ .313
+
+
+ 2012-12-19T11:49:12.313-08:00
+
+
+ Metrics
+
+
+ 11
+
+
+ 19
+
+
+ 49
+
+
+ december
+
+
+ 12
+
+
+ wednesday
+
+
+ 2012
+
+
+ -480
+
+
+ 0
+
+
+ realtime_search_data
+
+
+ fross-mbp15.local
+
+
+ _internal
+
+
+ 1
+
+
+ INFO
+
+
+ group=realtime_search_data, system total, drop_count=0
+
+
+ --_::._-____-_=,__,_=
+
+
+ /Users/fross/splunks/splunk-4.3.5/var/log/splunk/metrics.log
+
+
+ splunkd
+
+
+ fross-mbp15.local
+
+
+ 29
+
+
+ 0
+
+
+
+
+ 54:9769
+
+
+ 1355946583
+
+
+ 1
+
+ 12-19-2012 11:49:43.322 -0800 INFO Metrics - group=search_concurrency, system total, active_hist_searches=0, active_realtime_searches=0
+
+ 724
+
+
+ fross-mbp15.local
+ _internal
+
+
+ splunkd
+
+
+ .322
+
+
+ 2012-12-19T11:49:43.322-08:00
+
+
+ 0
+
+
+ 0
+
+
+ Metrics
+
+
+ 11
+
+
+ 19
+
+
+ 49
+
+
+ december
+
+
+ 43
+
+
+ wednesday
+
+
+ 2012
+
+
+ -480
+
+
+ search_concurrency
+
+
+ fross-mbp15.local
+
+
+ _internal
+
+
+ 1
+
+
+ INFO
+
+
+ group=search_concurrency, system total, active_hist_searches=0, active_realtime_searches=0
+
+
+ --_::._-____-_=,__,_=,_=
+
+
+ /Users/fross/splunks/splunk-4.3.5/var/log/splunk/metrics.log
+
+
+ splunkd
+
+
+ fross-mbp15.local
+
+
+ 29
+
+
+ 0
+
+
+
+
+ 54:9764
+
+
+ 1355946583
+
+
+ 1
+
+ 12-19-2012 11:49:43.322 -0800 INFO Metrics - group=realtime_search_data, system total, drop_count=0
+
+ 725
+
+
+ fross-mbp15.local
+ _internal
+
+
+ splunkd
+
+
+ .322
+
+
+ 2012-12-19T11:49:43.322-08:00
+
+
+ Metrics
+
+
+ 11
+
+
+ 19
+
+
+ 49
+
+
+ december
+
+
+ 43
+
+
+ wednesday
+
+
+ 2012
+
+
+ -480
+
+
+ 0
+
+
+ realtime_search_data
+
+
+ fross-mbp15.local
+
+
+ _internal
+
+
+ 1
+
+
+ INFO
+
+
+ group=realtime_search_data, system total, drop_count=0
+
+
+ --_::._-____-_=,__,_=
+
+
+ /Users/fross/splunks/splunk-4.3.5/var/log/splunk/metrics.log
+
+
+ splunkd
+
+
+ fross-mbp15.local
+
+
+ 29
+
+
+ 0
+
+
+
+
+ 54:10097
+
+
+ 1355946614
+
+
+ 1
+
+ 12-19-2012 11:50:14.351 -0800 INFO Metrics - group=search_concurrency, system total, active_hist_searches=0, active_realtime_searches=0
+
+ 722
+
+
+ fross-mbp15.local
+ _internal
+
+
+ splunkd
+
+
+ .351
+
+
+ 2012-12-19T11:50:14.351-08:00
+
+
+ 0
+
+
+ 0
+
+
+ Metrics
+
+
+ 11
+
+
+ 19
+
+
+ 50
+
+
+ december
+
+
+ 14
+
+
+ wednesday
+
+
+ 2012
+
+
+ -480
+
+
+ search_concurrency
+
+
+ fross-mbp15.local
+
+
+ _internal
+
+
+ 1
+
+
+ INFO
+
+
+ group=search_concurrency, system total, active_hist_searches=0, active_realtime_searches=0
+
+
+ --_::._-____-_=,__,_=,_=
+
+
+ /Users/fross/splunks/splunk-4.3.5/var/log/splunk/metrics.log
+
+
+ splunkd
+
+
+ fross-mbp15.local
+
+
+ 29
+
+
+ 0
+
+
+
\ No newline at end of file
diff --git a/splunkrc.spec b/splunkrc.spec
index 9b835a25..76a61053 100644
--- a/splunkrc.spec
+++ b/splunkrc.spec
@@ -1,12 +1,12 @@
-# Splunk host (default: localhost)
+# Splunk Enterprise host (default: localhost)
host=localhost
-# Splunk admin port (default: 8089)
+# Splunk Enterprise admin port (default: 8089)
port=8089
-# Splunk username
+# Splunk Enterprise username
username=admin
-# Splunk password
+# Splunk Enterprise password
password=changeme
# Access scheme (default: https)
scheme=https
-# Your version of Splunk (default: 5.0)
-version=5.0
\ No newline at end of file
+# Your version of Splunk Enterprise
+version=7.0
\ No newline at end of file
diff --git a/tests/tests.iml b/tests/tests.iml
deleted file mode 100644
index cc79238f..00000000
--- a/tests/tests.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/util/util.iml b/util/util.iml
deleted file mode 100644
index f2ded401..00000000
--- a/util/util.iml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-