Merged in feature/shorttestsanddirtidy (pull request #26)

Add short tests and Tidy internal directories

* complete the tasks

internal/test/queue_test.go

@@ -2,7 +2,7 @@ package test_test
 
 import (
 	"context"
-	"queryorchestration/internal/queue"
+	"queryorchestration/internal/server/queue"
 	"queryorchestration/internal/test"
 	"testing"
 
@@ -12,6 +12,9 @@ import (
 )
 
 func TestCreateQueue(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping long test in short mode")
+	}
 	ctx := context.Background()
 
 	qcfg, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{})
@@ -22,6 +25,9 @@ func TestCreateQueue(t *testing.T) {
 }
 
 func TestAssertMessageWait(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping long test in short mode")
+	}
 	ctx := context.Background()
 
 	qcfg, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{})
@@ -40,6 +46,9 @@ func TestAssertMessageWait(t *testing.T) {
 }
 
 func TestAssertMessageBodyWait(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping long test in short mode")
+	}
 	ctx := context.Background()
 
 	qcfg, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{})
@@ -57,6 +66,9 @@ func TestAssertMessageBodyWait(t *testing.T) {
 }
 
 func TestAssertMessageAttrWait(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping long test in short mode")
+	}
 	ctx := context.Background()
 
 	qcfg, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{})