From c6f3e7a2858ecbbb25f228b42b5fc4ff832ba84f Mon Sep 17 00:00:00 2001
From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com>
Date: Sun, 2 Nov 2025 16:54:38 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=9B=E4=B8=80=E6=AD=A5=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cputest/cputest_test.go                       | 11 ----
 disktest/disktest_test.go                     | 11 ----
 internal/runner/runner.go                     | 62 +++++++++----------
 cputest/cputest.go => internal/tests/cpu.go   |  2 +-
 .../disktest.go => internal/tests/disk.go     |  2 +-
 .../memorytest.go => internal/tests/memory.go |  2 +-
 {nexttrace => internal/tests}/nexttrace.go    |  2 +-
 speedtest/sp.go => internal/tests/speed.go    |  7 ++-
 .../media.go => internal/tests/unlock.go      |  4 +-
 {upstreams => internal/tests}/upstreams.go    |  2 +-
 memorytest/memorytest_test.go                 | 11 ----
 nexttrace/nexttrace_test.go                   | 13 ----
 speedtest/sp_test.go                          |  8 ---
 unlocktest/media_test.go                      | 10 ---
 upstreams/uptreams_test.go                    |  8 ---
 15 files changed, 39 insertions(+), 116 deletions(-)
 delete mode 100644 cputest/cputest_test.go
 delete mode 100644 disktest/disktest_test.go
 rename cputest/cputest.go => internal/tests/cpu.go (98%)
 rename disktest/disktest.go => internal/tests/disk.go (98%)
 rename memorytest/memorytest.go => internal/tests/memory.go (99%)
 rename {nexttrace => internal/tests}/nexttrace.go (97%)
 rename speedtest/sp.go => internal/tests/speed.go (99%)
 rename unlocktest/media.go => internal/tests/unlock.go (96%)
 rename {upstreams => internal/tests}/upstreams.go (98%)
 delete mode 100644 memorytest/memorytest_test.go
 delete mode 100644 nexttrace/nexttrace_test.go
 delete mode 100644 speedtest/sp_test.go
 delete mode 100644 unlocktest/media_test.go
 delete mode 100644 upstreams/uptreams_test.go

diff --git a/cputest/cputest_test.go b/cputest/cputest_test.go
deleted file mode 100644
index 543e914..0000000
--- a/cputest/cputest_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package cputest
-
-import (
-	"fmt"
-	"testing"
-)
-
-func Test(t *testing.T) {
-	_, res := CpuTest("zh", "sysbench", "1")
-	fmt.Print(res)
-}
diff --git a/disktest/disktest_test.go b/disktest/disktest_test.go
deleted file mode 100644
index 6df6b44..0000000
--- a/disktest/disktest_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package disktest
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestDiskIoTest(t *testing.T) {
-	_, res := DiskTest("zh", "sysbench", "", false, false)
-	fmt.Print(res)
-}
diff --git a/internal/runner/runner.go b/internal/runner/runner.go
index 027403e..7f0d2d0 100644
--- a/internal/runner/runner.go
+++ b/internal/runner/runner.go
@@ -10,14 +10,8 @@ import (
 	"time"
 
 	"github.com/oneclickvirt/CommonMediaTests/commediatests"
-	"github.com/oneclickvirt/ecs/cputest"
-	"github.com/oneclickvirt/ecs/disktest"
 	"github.com/oneclickvirt/ecs/internal/params"
-	"github.com/oneclickvirt/ecs/memorytest"
-	"github.com/oneclickvirt/ecs/nexttrace"
-	"github.com/oneclickvirt/ecs/speedtest"
-	"github.com/oneclickvirt/ecs/unlocktest"
-	"github.com/oneclickvirt/ecs/upstreams"
+	"github.com/oneclickvirt/ecs/internal/tests"
 	"github.com/oneclickvirt/ecs/utils"
 	"github.com/oneclickvirt/pingtest/pt"
 	"github.com/oneclickvirt/portchecker/email"
@@ -36,7 +30,7 @@ func RunChineseTests(preCheck utils.NetCheckResult, config *params.Config, wg1,
 		wg1.Add(1)
 		go func() {
 			defer wg1.Done()
-			*mediaInfo = unlocktest.MediaTest(config.Language)
+			*mediaInfo = tests.MediaTest(config.Language)
 		}()
 	}
 	if config.EmailTestStatus && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
@@ -81,7 +75,7 @@ func RunEnglishTests(preCheck utils.NetCheckResult, config *params.Config, wg1,
 			wg1.Add(1)
 			go func() {
 				defer wg1.Done()
-				*mediaInfo = unlocktest.MediaTest(config.Language)
+				*mediaInfo = tests.MediaTest(config.Language)
 			}()
 		}
 		if config.EmailTestStatus {
@@ -106,7 +100,7 @@ func RunIpInfoCheck(config *params.Config, output, tempOutput string, outputMute
 	defer outputMutex.Unlock()
 	return utils.PrintAndCapture(func() {
 		var ipinfo string
-		upstreams.IPV4, upstreams.IPV6, ipinfo = utils.OnlyBasicsIpInfo(config.Language)
+		tests.IPV4, tests.IPV6, ipinfo = utils.OnlyBasicsIpInfo(config.Language)
 		if ipinfo != "" {
 			if config.Language == "zh" {
 				utils.PrintCenteredTitle("IP信息", config.Width)
@@ -133,13 +127,13 @@ func RunBasicTests(preCheck utils.NetCheckResult, config *params.Config, basicIn
 				}
 			}
 			if preCheck.Connected && preCheck.StackType == "DualStack" {
-				upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, config.Nt3CheckType, config.SecurityTestStatus)
+				tests.IPV4, tests.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, config.Nt3CheckType, config.SecurityTestStatus)
 			} else if preCheck.Connected && preCheck.StackType == "IPv4" {
-				upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "ipv4", config.SecurityTestStatus)
+				tests.IPV4, tests.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "ipv4", config.SecurityTestStatus)
 			} else if preCheck.Connected && preCheck.StackType == "IPv6" {
-				upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "ipv6", config.SecurityTestStatus)
+				tests.IPV4, tests.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "ipv6", config.SecurityTestStatus)
 			} else {
-				upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "", false)
+				tests.IPV4, tests.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "", false)
 				config.SecurityTestStatus = false
 			}
 			if config.BasicStatus {
@@ -163,7 +157,7 @@ func RunCPUTest(config *params.Config, output, tempOutput string, outputMutex *s
 	defer outputMutex.Unlock()
 	return utils.PrintAndCapture(func() {
 		if config.CpuTestStatus {
-			realTestMethod, res := cputest.CpuTest(config.Language, config.CpuTestMethod, config.CpuTestThreadMode)
+			realTestMethod, res := tests.CpuTest(config.Language, config.CpuTestMethod, config.CpuTestThreadMode)
 			if config.Language == "zh" {
 				utils.PrintCenteredTitle(fmt.Sprintf("CPU测试-通过%s测试", realTestMethod), config.Width)
 			} else {
@@ -180,7 +174,7 @@ func RunMemoryTest(config *params.Config, output, tempOutput string, outputMutex
 	defer outputMutex.Unlock()
 	return utils.PrintAndCapture(func() {
 		if config.MemoryTestStatus {
-			realTestMethod, res := memorytest.MemoryTest(config.Language, config.MemoryTestMethod)
+			realTestMethod, res := tests.MemoryTest(config.Language, config.MemoryTestMethod)
 			if config.Language == "zh" {
 				utils.PrintCenteredTitle(fmt.Sprintf("内存测试-通过%s测试", realTestMethod), config.Width)
 			} else {
@@ -197,7 +191,7 @@ func RunDiskTest(config *params.Config, output, tempOutput string, outputMutex *
 	defer outputMutex.Unlock()
 	return utils.PrintAndCapture(func() {
 		if config.DiskTestStatus && config.AutoChangeDiskMethod {
-			realTestMethod, res := disktest.DiskTest(config.Language, config.DiskTestMethod, config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
+			realTestMethod, res := tests.DiskTest(config.Language, config.DiskTestMethod, config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
 			if config.Language == "zh" {
 				utils.PrintCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", realTestMethod), config.Width)
 			} else {
@@ -207,17 +201,17 @@ func RunDiskTest(config *params.Config, output, tempOutput string, outputMutex *
 		} else if config.DiskTestStatus && !config.AutoChangeDiskMethod {
 			if config.Language == "zh" {
 				utils.PrintCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", "dd"), config.Width)
-				_, res := disktest.DiskTest(config.Language, "dd", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
+				_, res := tests.DiskTest(config.Language, "dd", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
 				fmt.Print(res)
 				utils.PrintCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", "fio"), config.Width)
-				_, res = disktest.DiskTest(config.Language, "fio", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
+				_, res = tests.DiskTest(config.Language, "fio", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
 				fmt.Print(res)
 			} else {
 				utils.PrintCenteredTitle(fmt.Sprintf("Disk-Test--%s-Method", "dd"), config.Width)
-				_, res := disktest.DiskTest(config.Language, "dd", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
+				_, res := tests.DiskTest(config.Language, "dd", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
 				fmt.Print(res)
 				utils.PrintCenteredTitle(fmt.Sprintf("Disk-Test--%s-Method", "fio"), config.Width)
-				_, res = disktest.DiskTest(config.Language, "fio", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
+				_, res = tests.DiskTest(config.Language, "fio", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
 				fmt.Print(res)
 			}
 		}
@@ -287,11 +281,11 @@ func RunNetworkTests(config *params.Config, wg3 *sync.WaitGroup, ptInfo *string,
 	return utils.PrintAndCapture(func() {
 		if config.BacktraceStatus && !config.OnlyChinaTest {
 			utils.PrintCenteredTitle("上游及回程线路检测", config.Width)
-			upstreams.UpstreamsCheck()
+			tests.UpstreamsCheck()
 		}
 		if config.Nt3Status && !config.OnlyChinaTest {
 			utils.PrintCenteredTitle("三网回程路由检测", config.Width)
-			nexttrace.NextTrace3Check(config.Language, config.Nt3Location, config.Nt3CheckType)
+			tests.NextTrace3Check(config.Language, config.Nt3Location, config.Nt3CheckType)
 		}
 		if config.OnlyChinaTest && *ptInfo != "" {
 			wg3.Wait()
@@ -328,17 +322,17 @@ func RunSpeedTests(config *params.Config, output, tempOutput string, outputMutex
 	return utils.PrintAndCapture(func() {
 		if config.SpeedTestStatus {
 			utils.PrintCenteredTitle("就近节点测速", config.Width)
-			speedtest.ShowHead(config.Language)
+			tests.ShowHead(config.Language)
 			if config.Choice == "1" || !config.MenuMode {
-				speedtest.NearbySP()
-				speedtest.CustomSP("net", "global", 2, config.Language)
-				speedtest.CustomSP("net", "cu", config.SpNum, config.Language)
-				speedtest.CustomSP("net", "ct", config.SpNum, config.Language)
-				speedtest.CustomSP("net", "cmcc", config.SpNum, config.Language)
+				tests.NearbySP()
+				tests.CustomSP("net", "global", 2, config.Language)
+				tests.CustomSP("net", "cu", config.SpNum, config.Language)
+				tests.CustomSP("net", "ct", config.SpNum, config.Language)
+				tests.CustomSP("net", "cmcc", config.SpNum, config.Language)
 			} else if config.Choice == "2" || config.Choice == "3" || config.Choice == "4" || config.Choice == "5" {
-				speedtest.CustomSP("net", "global", 4, config.Language)
+				tests.CustomSP("net", "global", 4, config.Language)
 			} else if config.Choice == "6" {
-				speedtest.CustomSP("net", "global", 11, config.Language)
+				tests.CustomSP("net", "global", 11, config.Language)
 			}
 		}
 	}, tempOutput, output)
@@ -368,9 +362,9 @@ func RunEnglishSpeedTests(config *params.Config, output, tempOutput string, outp
 	return utils.PrintAndCapture(func() {
 		if config.SpeedTestStatus {
 			utils.PrintCenteredTitle("Speed-Test", config.Width)
-			speedtest.ShowHead(config.Language)
-			speedtest.NearbySP()
-			speedtest.CustomSP("net", "global", -1, config.Language)
+			tests.ShowHead(config.Language)
+			tests.NearbySP()
+			tests.CustomSP("net", "global", -1, config.Language)
 		}
 	}, tempOutput, output)
 }
diff --git a/cputest/cputest.go b/internal/tests/cpu.go
similarity index 98%
rename from cputest/cputest.go
rename to internal/tests/cpu.go
index eab6601..92453fa 100644
--- a/cputest/cputest.go
+++ b/internal/tests/cpu.go
@@ -1,4 +1,4 @@
-package cputest
+package tests
 
 import (
 	"runtime"
diff --git a/disktest/disktest.go b/internal/tests/disk.go
similarity index 98%
rename from disktest/disktest.go
rename to internal/tests/disk.go
index e273f46..871a260 100644
--- a/disktest/disktest.go
+++ b/internal/tests/disk.go
@@ -1,4 +1,4 @@
-package disktest
+package tests
 
 import (
 	"runtime"
diff --git a/memorytest/memorytest.go b/internal/tests/memory.go
similarity index 99%
rename from memorytest/memorytest.go
rename to internal/tests/memory.go
index 18a5195..c920369 100644
--- a/memorytest/memorytest.go
+++ b/internal/tests/memory.go
@@ -1,4 +1,4 @@
-package memorytest
+package tests
 
 import (
 	"runtime"
diff --git a/nexttrace/nexttrace.go b/internal/tests/nexttrace.go
similarity index 97%
rename from nexttrace/nexttrace.go
rename to internal/tests/nexttrace.go
index 64816bc..7616047 100644
--- a/nexttrace/nexttrace.go
+++ b/internal/tests/nexttrace.go
@@ -1,4 +1,4 @@
-package nexttrace
+package tests
 
 import (
 	"fmt"
diff --git a/speedtest/sp.go b/internal/tests/speed.go
similarity index 99%
rename from speedtest/sp.go
rename to internal/tests/speed.go
index 1864588..9883654 100644
--- a/speedtest/sp.go
+++ b/internal/tests/speed.go
@@ -1,10 +1,11 @@
-package speedtest
+package tests
 
 import (
-	"github.com/oneclickvirt/speedtest/model"
-	"github.com/oneclickvirt/speedtest/sp"
 	"runtime"
 	"strings"
+
+	"github.com/oneclickvirt/speedtest/model"
+	"github.com/oneclickvirt/speedtest/sp"
 )
 
 func ShowHead(language string) {
diff --git a/unlocktest/media.go b/internal/tests/unlock.go
similarity index 96%
rename from unlocktest/media.go
rename to internal/tests/unlock.go
index e20415f..86f45a5 100644
--- a/unlocktest/media.go
+++ b/internal/tests/unlock.go
@@ -1,8 +1,8 @@
-package unlocktest
+package tests
 
 import (
-	"github.com/oneclickvirt/UnlockTests/utils"
 	"github.com/oneclickvirt/UnlockTests/executor"
+	"github.com/oneclickvirt/UnlockTests/utils"
 	"github.com/oneclickvirt/defaultset"
 )
 
diff --git a/upstreams/upstreams.go b/internal/tests/upstreams.go
similarity index 98%
rename from upstreams/upstreams.go
rename to internal/tests/upstreams.go
index 11ccc93..908b94c 100644
--- a/upstreams/upstreams.go
+++ b/internal/tests/upstreams.go
@@ -1,4 +1,4 @@
-package upstreams
+package tests
 
 import (
 	"fmt"
diff --git a/memorytest/memorytest_test.go b/memorytest/memorytest_test.go
deleted file mode 100644
index aed6be1..0000000
--- a/memorytest/memorytest_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package memorytest
-
-import (
-	"fmt"
-	"testing"
-)
-
-func Test(t *testing.T) {
-	_, res := MemoryTest("zh", "stream")
-	fmt.Print(res)
-}
diff --git a/nexttrace/nexttrace_test.go b/nexttrace/nexttrace_test.go
deleted file mode 100644
index 9d78c6d..0000000
--- a/nexttrace/nexttrace_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package nexttrace
-
-import (
-	"testing"
-	"time"
-)
-
-func TestNextTrace3Check(t *testing.T) {
-	start := time.Now()
-	NextTrace3Check("zh", "ALL", "ipv4")
-	duration := time.Since(start)
-	t.Logf("执行耗时: %s", duration)
-}
diff --git a/speedtest/sp_test.go b/speedtest/sp_test.go
deleted file mode 100644
index 4115175..0000000
--- a/speedtest/sp_test.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package speedtest
-
-import "testing"
-
-func Test(t *testing.T) {
-	ShowHead("en")
-	NearbySP()
-}
diff --git a/unlocktest/media_test.go b/unlocktest/media_test.go
deleted file mode 100644
index 4aee5a9..0000000
--- a/unlocktest/media_test.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package unlocktest
-
-import (
-	"fmt"
-	"testing"
-)
-
-func Test(t *testing.T) {
-	fmt.Printf("%s", MediaTest("zh"))
-}
diff --git a/upstreams/uptreams_test.go b/upstreams/uptreams_test.go
deleted file mode 100644
index ed49b71..0000000
--- a/upstreams/uptreams_test.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package upstreams
-
-import "testing"
-
-func TestUpstreamsCheck(t *testing.T) {
-	IPV4 = "148.100.85.25"
-	UpstreamsCheck()
-}