From 84db78db8315b0a985eec7a95ba89b80f49497ad Mon Sep 17 00:00:00 2001
From: Lucas Clemente <lclemente@google.com>
Date: Thu, 3 Aug 2017 20:56:10 +0200
Subject: [PATCH] Move rest of integration tests into the gquic folder

---
 integrationtests/data_manager.go              | 32 -----------------
 integrationtests/{ => gquic}/client_test.go   |  2 +-
 .../{ => gquic}/data_manager_test.go          | 34 +++++++++++++++++--
 integrationtests/{ => gquic}/drop_test.go     |  2 +-
 integrationtests/gquic/gquic.go               |  1 +
 .../gquic_suite_test.go}                      |  8 ++---
 .../{ => gquic}/integration_test.go           |  2 +-
 .../{ => gquic}/random_rtt_test.go            |  2 +-
 integrationtests/{ => gquic}/rtt_test.go      |  2 +-
 integrationtests/{ => gquic}/server_test.go   |  2 +-
 integrationtests/integration.go               |  1 -
 integrationtests/self/self_suite_test.go      |  2 ++
 12 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 integrationtests/data_manager.go
 rename integrationtests/{ => gquic}/client_test.go (99%)
 rename integrationtests/{ => gquic}/data_manager_test.go (50%)
 rename integrationtests/{ => gquic}/drop_test.go (99%)
 create mode 100644 integrationtests/gquic/gquic.go
 rename integrationtests/{integrationtests_suite_test.go => gquic/gquic_suite_test.go} (83%)
 rename integrationtests/{ => gquic}/integration_test.go (99%)
 rename integrationtests/{ => gquic}/random_rtt_test.go (99%)
 rename integrationtests/{ => gquic}/rtt_test.go (98%)
 rename integrationtests/{ => gquic}/server_test.go (99%)
 delete mode 100644 integrationtests/integration.go

diff --git a/integrationtests/data_manager.go b/integrationtests/data_manager.go
deleted file mode 100644
index 627782a06..000000000
--- a/integrationtests/data_manager.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package integrationtests
-
-import (
-	"crypto/md5"
-	"math/rand"
-	"time"
-)
-
-type dataManager struct {
-	data []byte
-	md5  []byte
-}
-
-func (m *dataManager) GenerateData(len int) error {
-	m.data = make([]byte, len)
-	r := rand.New(rand.NewSource(int64(time.Now().Nanosecond())))
-	_, err := r.Read(m.data)
-	if err != nil {
-		return err
-	}
-	sum := md5.Sum(m.data)
-	m.md5 = sum[:]
-	return nil
-}
-
-func (m *dataManager) GetData() []byte {
-	return m.data
-}
-
-func (m *dataManager) GetMD5() []byte {
-	return m.md5
-}
diff --git a/integrationtests/client_test.go b/integrationtests/gquic/client_test.go
similarity index 99%
rename from integrationtests/client_test.go
rename to integrationtests/gquic/client_test.go
index a7ae278d6..5fbfae6f7 100644
--- a/integrationtests/client_test.go
+++ b/integrationtests/gquic/client_test.go
@@ -1,4 +1,4 @@
-package integrationtests
+package gquic_test
 
 import (
 	"bytes"
diff --git a/integrationtests/data_manager_test.go b/integrationtests/gquic/data_manager_test.go
similarity index 50%
rename from integrationtests/data_manager_test.go
rename to integrationtests/gquic/data_manager_test.go
index b9baef01c..ba3103448 100644
--- a/integrationtests/data_manager_test.go
+++ b/integrationtests/gquic/data_manager_test.go
@@ -1,10 +1,40 @@
-package integrationtests
+package gquic_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	"crypto/md5"
+	"math/rand"
+	"time"
+
+		. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+
 )
 
+type dataManager struct {
+	data []byte
+	md5  []byte
+}
+
+func (m *dataManager) GenerateData(len int) error {
+	m.data = make([]byte, len)
+	r := rand.New(rand.NewSource(int64(time.Now().Nanosecond())))
+	_, err := r.Read(m.data)
+	if err != nil {
+		return err
+	}
+	sum := md5.Sum(m.data)
+	m.md5 = sum[:]
+	return nil
+}
+
+func (m *dataManager) GetData() []byte {
+	return m.data
+}
+
+func (m *dataManager) GetMD5() []byte {
+	return m.md5
+}
+
 var _ = Describe("Data Manager", func() {
 	dm := dataManager{}
 
diff --git a/integrationtests/drop_test.go b/integrationtests/gquic/drop_test.go
similarity index 99%
rename from integrationtests/drop_test.go
rename to integrationtests/gquic/drop_test.go
index f6dbf2b22..41705ffaf 100644
--- a/integrationtests/drop_test.go
+++ b/integrationtests/gquic/drop_test.go
@@ -1,4 +1,4 @@
-package integrationtests
+package gquic_test
 
 import (
 	"bytes"
diff --git a/integrationtests/gquic/gquic.go b/integrationtests/gquic/gquic.go
new file mode 100644
index 000000000..36ba02f34
--- /dev/null
+++ b/integrationtests/gquic/gquic.go
@@ -0,0 +1 @@
+package gquic
diff --git a/integrationtests/integrationtests_suite_test.go b/integrationtests/gquic/gquic_suite_test.go
similarity index 83%
rename from integrationtests/integrationtests_suite_test.go
rename to integrationtests/gquic/gquic_suite_test.go
index 1cccab2dc..e1fbc3f21 100644
--- a/integrationtests/integrationtests_suite_test.go
+++ b/integrationtests/gquic/gquic_suite_test.go
@@ -1,4 +1,4 @@
-package integrationtests
+package gquic_test
 
 import (
 	"fmt"
@@ -30,7 +30,7 @@ var (
 
 func TestIntegration(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Integration Tests Suite")
+	RunSpecs(t, "GQuic Tests Suite")
 }
 
 var _ = JustBeforeEach(testserver.StartQuicServer)
@@ -42,8 +42,8 @@ func init() {
 	if !ok {
 		panic("Failed to get current path")
 	}
-	clientPath = filepath.Join(thisfile, fmt.Sprintf("../../../quic-clients/client-%s-debug", runtime.GOOS))
-	serverPath = filepath.Join(thisfile, fmt.Sprintf("../../../quic-clients/server-%s-debug", runtime.GOOS))
+	clientPath = filepath.Join(thisfile, fmt.Sprintf("../../../../quic-clients/client-%s-debug", runtime.GOOS))
+	serverPath = filepath.Join(thisfile, fmt.Sprintf("../../../../quic-clients/server-%s-debug", runtime.GOOS))
 
 	http.HandleFunc("/hello", func(w http.ResponseWriter, r *http.Request) {
 		defer GinkgoRecover()
diff --git a/integrationtests/integration_test.go b/integrationtests/gquic/integration_test.go
similarity index 99%
rename from integrationtests/integration_test.go
rename to integrationtests/gquic/integration_test.go
index fc92e3086..d24615c1e 100644
--- a/integrationtests/integration_test.go
+++ b/integrationtests/gquic/integration_test.go
@@ -1,4 +1,4 @@
-package integrationtests
+package gquic_test
 
 import (
 	"bytes"
diff --git a/integrationtests/random_rtt_test.go b/integrationtests/gquic/random_rtt_test.go
similarity index 99%
rename from integrationtests/random_rtt_test.go
rename to integrationtests/gquic/random_rtt_test.go
index e8cfd7e31..336d780ef 100644
--- a/integrationtests/random_rtt_test.go
+++ b/integrationtests/gquic/random_rtt_test.go
@@ -1,4 +1,4 @@
-package integrationtests
+package gquic_test
 
 import (
 	"bytes"
diff --git a/integrationtests/rtt_test.go b/integrationtests/gquic/rtt_test.go
similarity index 98%
rename from integrationtests/rtt_test.go
rename to integrationtests/gquic/rtt_test.go
index a0a570fcd..76489b5a6 100644
--- a/integrationtests/rtt_test.go
+++ b/integrationtests/gquic/rtt_test.go
@@ -1,4 +1,4 @@
-package integrationtests
+package gquic_test
 
 import (
 	"bytes"
diff --git a/integrationtests/server_test.go b/integrationtests/gquic/server_test.go
similarity index 99%
rename from integrationtests/server_test.go
rename to integrationtests/gquic/server_test.go
index 0c05c60fa..c064b9398 100644
--- a/integrationtests/server_test.go
+++ b/integrationtests/gquic/server_test.go
@@ -1,4 +1,4 @@
-package integrationtests
+package gquic_test
 
 import (
 	"crypto/rand"
diff --git a/integrationtests/integration.go b/integrationtests/integration.go
deleted file mode 100644
index c94303b8c..000000000
--- a/integrationtests/integration.go
+++ /dev/null
@@ -1 +0,0 @@
-package integrationtests
diff --git a/integrationtests/self/self_suite_test.go b/integrationtests/self/self_suite_test.go
index a6e0d4cd7..dce74e177 100644
--- a/integrationtests/self/self_suite_test.go
+++ b/integrationtests/self/self_suite_test.go
@@ -4,6 +4,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
+	_ "github.com/lucas-clemente/quic-go/integrationtests/tools/testlog"
+
 	"testing"
 )