From 71f89dc7ec7cf993d1eca98771212afe6310e9c8 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 10 Oct 2021 19:42:48 +0300
Subject: refactor

---
 integrationtests/dmap_test.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'integrationtests/dmap_test.go')

diff --git a/integrationtests/dmap_test.go b/integrationtests/dmap_test.go
index f5c78e0..966944a 100644
--- a/integrationtests/dmap_test.go
+++ b/integrationtests/dmap_test.go
@@ -1,6 +1,7 @@
 package integrationtests
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"testing"
@@ -17,12 +18,15 @@ func TestDMap(t *testing.T) {
 	query := fmt.Sprintf("from STATS select count($line),last($time),"+
 		"avg($goroutines),min(concurrentConnections),max(lifetimeConnections) "+
 		"group by $hostname outfile %s", csvFile)
-	args := []string{"-query", query, inFile}
 
-	if _, err := runCommand(t, "../dmap", args, stdoutFile); err != nil {
+	_, err := runCommand(context.TODO(), stdoutFile,
+		"../dmap", "--query", query, inFile)
+
+	if err != nil {
 		t.Error(err)
 		return
 	}
+
 	if err := compareFiles(t, csvFile, expectedCsvFile); err != nil {
 		t.Error(err)
 		return
@@ -49,11 +53,13 @@ func TestDMap2(t *testing.T) {
 		"avg($goroutines),min($goroutines) group by $time order by count($time) "+
 		"outfile %s", csvFile)
 
-	args := []string{"-query", query, inFile}
-	if _, err := runCommand(t, "../dmap", args, stdoutFile); err != nil {
+	_, err := runCommand(context.TODO(), stdoutFile,
+		"../dmap", "--query", query, inFile)
+	if err != nil {
 		t.Error(err)
 		return
 	}
+
 	if err := compareFilesContents(t, csvFile, expectedCsvFile); err != nil {
 		t.Error(err)
 		return
@@ -86,7 +92,7 @@ func TestDMap3(t *testing.T) {
 		args = append(args, inFile)
 	}
 
-	if _, err := runCommand(t, "../dmap", args, stdoutFile); err != nil {
+	if _, err := runCommand(context.TODO(), stdoutFile, "../dmap", args...); err != nil {
 		t.Error(err)
 		return
 	}
-- 
cgit v1.2.3