Move XSC tests to unit tests and remove from suits

jfrog · Sep 10, 2023 · 412c1e6 · 412c1e6
1 parent cd281a3
commit 412c1e6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 29 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -83,13 +83,13 @@ jobs:
       - name: artifactory tests
         run: go test -v github.com/jfrog/jfrog-client-go/tests --timeout 0 --test.${{ matrix.suite }} --ci.runId=${{ runner.os }}-${{ matrix.suite }}
 
-  JFrog-Client-Go-Ds-Xr-Xsc-Tests:
+  JFrog-Client-Go-Ds-Xr-Tests:
     needs: Pretest
     name: ${{ matrix.suite }} ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        suite: [ distribution, xray, xsc ]
+        suite: [ distribution, xray ]
         os: [ ubuntu, windows, macos ]
     runs-on: ${{ matrix.os }}-latest
     steps:

diff --git a/tests/utils_test.go b/tests/utils_test.go
@@ -548,10 +548,9 @@ func GetXrayDetails() auth.ServiceDetails {
 	xrayDetails := xrayAuth.NewXrayDetails()
 	xrayUrl := clientutils.AddTrailingSlashIfNeeded(*XrayUrl)
 	xrayDetails.SetUrl(xrayUrl)
-	if *TestXsc {
-		xrayDetails.SetXscUrl(strings.Replace(xrayUrl, "xray", "xsc", 1))
-		xrayDetails.SetXscVersion("0.0.0")
-	}
+	xrayDetails.SetXscUrl(strings.Replace(xrayUrl, "xray", "xsc", 1))
+	xrayDetails.SetXscVersion("0.0.0")
+
 	setAuthenticationDetail(xrayDetails)
 	return xrayDetails
 }
@@ -1130,9 +1129,8 @@ func createSecurityServiceManager() {
 	xrayDetails.SetUrl(xrayUrl)
 	xrayDetails.SetXscUrl(strings.Replace(xrayUrl, "/xray/", "/xsc/", 1))
 	// XSC version is used to determine if XSC in enabled or not.
-	if *TestXsc {
-		xrayDetails.SetXscVersion("0.0.0")
-	}
+	xrayDetails.SetXscVersion("0.0.0")
+
 	setAuthenticationDetail(xrayDetails)
 	initSecurityManagerByServerDetails(xrayDetails)
 }

diff --git a/tests/xray_test.go b/tests/xray_test.go
@@ -110,7 +110,8 @@ func initXrayTest(t *testing.T) {
 
 type testXrayDetails struct {
 	auth.ServiceDetails
-	version string
+	version    string
+	xscVersion string
 }
 
 func newTestXrayDetails(serviceDetails auth.ServiceDetails) testXrayDetails {

diff --git a/tests/xrayscan_test.go b/tests/xrayscan_test.go
@@ -64,7 +64,6 @@ func TestXrayScanGraph(t *testing.T) {
 	assert.NoError(t, err)
 	securityServiceManager, err = services2.New(serviceConfig)
 	assert.NoError(t, err)
-	assertSecurityManagerType(t)
 
 	scanId, err := securityServiceManager.ScanGraph(&services2.XrayGraphScanParams{})
 	assert.NoError(t, err)

diff --git a/tests/xsc_test.go b/tests/xsc_test.go
@@ -33,6 +33,7 @@ func TestXscScanGraph(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+
 			scanId, err := securityServiceManager.ScanGraph(test.xrayGraphParams)
 			assert.NoError(t, err)
 			assert.Equal(t, test.expectedMultiScanId, test.xrayGraphParams.MultiScanId)
@@ -52,13 +53,6 @@ func TestXscEnabled(t *testing.T) {
 }
 
 func initXscTest(t *testing.T) {
-	if !*TestXsc {
-		t.Skip("Skipping xray test. To run xray test add the '-test.xsc=true' option.")
-	}
-	prepareXscTest(t)
-}
-
-func prepareXscTest(t *testing.T) {
 	initializeTestSecurityManager(t, initMockXscServer())
 }
 
@@ -80,14 +74,5 @@ func initializeTestSecurityManager(t *testing.T, xscDetails testXrayDetails) {
 	securityServiceManager, err = services.New(serviceConfig)
 	assert.NoError(t, err)
 	// Assert correct security manager Xsc/Xray
-	assertSecurityManagerType(t)
-}
-
-func assertSecurityManagerType(t *testing.T) {
-	switch securityServiceManager.(type) {
-	case *services.XscServicesManger:
-		assert.Equal(t, true, *TestXsc)
-	case *services.XrayServicesManager:
-		assert.Equal(t, false, *TestXsc)
-	}
-}
+	assert.IsType(t, securityServiceManager,&services.XscServicesManger{})
+}