fixing test case to be compatible with 8+

Author: nitinp19

gradle_test.go

@@ -453,6 +453,12 @@ func TestGradleBuildWithFlexPackFallback(t *testing.T) {
 	configFilePath := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "buildspecs", tests.GradleConfig)
 	destPath := filepath.Join(filepath.Dir(buildGradlePath), ".jfrog", "projects")
 	createConfigFile(destPath, configFilePath, t)
+
+	// Create the search spec before changing the working directory.
+	// tests.GetTestResourcesPath() is relative ("testdata"), so creating the spec after chdir may fail on CI.
+	searchSpec, err := tests.CreateSpec(tests.SearchAllGradle)
+	require.NoError(t, err)
+
 	oldHomeDir := changeWD(t, filepath.Dir(buildGradlePath))
 	defer clientTestUtils.ChangeDirAndAssert(t, oldHomeDir)
 
@@ -466,8 +472,6 @@ func TestGradleBuildWithFlexPackFallback(t *testing.T) {
 	runJfrogCli(t, "gradle", "clean", "artifactoryPublish", "-b"+buildGradlePath, "--build-name="+buildName, "--build-number="+buildNumber)
 
 	// Validate artifacts were deployed (traditional approach deploys to Artifactory)
-	searchSpec, err := tests.CreateSpec(tests.SearchAllGradle)
-	assert.NoError(t, err)
 	inttestutils.VerifyExistInArtifactory(tests.GetGradleDeployedArtifacts(), searchSpec, serverDetails, t)
 
 	cleanGradleTest(t)

inttestutils/artifactory.go

@@ -9,6 +9,7 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-cli/utils/tests"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // Verify the input slice exist in Artifactory
@@ -17,23 +18,39 @@ import (
 // serverDetails - Target Artifactory server details
 // t - Tests object
 func VerifyExistInArtifactory(expected []string, specFile string, serverDetails *config.ServerDetails, t *testing.T) {
-	results, _ := SearchInArtifactory(specFile, serverDetails, t)
+	results, err := SearchInArtifactory(specFile, serverDetails, t)
+	require.NoError(t, err)
 	tests.CompareExpectedVsActual(expected, results, t)
 }
 
 func SearchInArtifactory(specFile string, serverDetails *config.ServerDetails, t *testing.T) ([]utils.SearchResult, error) {
-	searchSpec, _ := spec.CreateSpecFromFile(specFile, nil)
+	searchSpec, err := spec.CreateSpecFromFile(specFile, nil)
+	if err != nil {
+		return nil, err
+	}
+	if searchSpec == nil {
+		return nil, assert.AnError
+	}
 	searchCmd := generic.NewSearchCommand()
 	searchCmd.SetServerDetails(serverDetails).SetSpec(searchSpec)
 	reader, err := searchCmd.Search()
-	assert.NoError(t, err)
+	if err != nil {
+		return nil, err
+	}
 	var resultItems []utils.SearchResult
 	readerNoDate, err := utils.SearchResultNoDate(reader)
-	assert.NoError(t, err)
+	if err != nil {
+		_ = reader.Close()
+		return nil, err
+	}
 	for searchResult := new(utils.SearchResult); readerNoDate.NextRecord(searchResult) == nil; searchResult = new(utils.SearchResult) {
 		resultItems = append(resultItems, *searchResult)
 	}
-	assert.NoError(t, reader.Close(), "Couldn't close reader")
-	assert.NoError(t, reader.GetError(), "Couldn't get reader error")
-	return resultItems, err
+	if cerr := reader.Close(); cerr != nil {
+		return resultItems, cerr
+	}
+	if rerr := reader.GetError(); rerr != nil {
+		return resultItems, rerr
+	}
+	return resultItems, nil
 }

testdata/gradle/gradleproject/build.gradle

@@ -5,6 +5,22 @@ repositories {
     mavenCentral()
 }
 
+// Gradle 8+ blocks http:// repositories unless allowInsecureProtocol=true is set.
+// The JFrog Gradle integration (traditional extractor flow) may add an Artifactory resolver repo using http://localhost in tests.
+// This block is safe across Gradle versions because it checks for the property before setting it.
+allprojects {
+    repositories.all { repo ->
+        try {
+            def urlStr = repo.respondsTo('getUrl') && repo.url != null ? repo.url.toString() : ""
+            if (urlStr.startsWith("http://") && repo.hasProperty("allowInsecureProtocol")) {
+                repo.allowInsecureProtocol = true
+            }
+        } catch (Throwable ignored) {
+            // Best-effort; ignore repositories that don't support URL/allowInsecureProtocol.
+        }
+    }
+}
+
 dependencies {
     implementation "junit:junit:4.7"
 }

testdata/gradle/projectwithplugin/build.gradle

@@ -11,6 +11,22 @@ apply plugin: 'idea'
 apply plugin: 'com.jfrog.artifactory'
 apply plugin: 'maven-publish'
 
+// Gradle 8+ blocks http:// repositories unless allowInsecureProtocol=true is set.
+// The JFrog Gradle integration / Artifactory plugin may add an Artifactory resolver repo using http://localhost in tests.
+// This block is safe across Gradle versions because it checks for the property before setting it.
+allprojects {
+    repositories.all { repo ->
+        try {
+            def urlStr = repo.respondsTo('getUrl') && repo.url != null ? repo.url.toString() : ""
+            if (urlStr.startsWith("http://") && repo.hasProperty("allowInsecureProtocol")) {
+                repo.allowInsecureProtocol = true
+            }
+        } catch (Throwable ignored) {
+            // Best-effort; ignore repositories that don't support URL/allowInsecureProtocol.
+        }
+    }
+}
+
 version = 1.0
 task initProject(description: 'Initialize project directory structure.') {
     doLast {