Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions artifactory/commands/conan/artifacts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ func TestBuildArtifactQuery(t *testing.T) {
}
}


func TestBuildPropertySetter_FormatBuildProperties(t *testing.T) {
tests := []struct {
name string
Expand Down Expand Up @@ -192,9 +191,9 @@ func TestBuildPropertySetter_FormatBuildProperties(t *testing.T) {

func TestNewArtifactCollector(t *testing.T) {
targetRepo := "conan-local"

collector := NewArtifactCollector(nil, targetRepo)

assert.NotNil(t, collector)
assert.Equal(t, targetRepo, collector.targetRepo)
assert.Nil(t, collector.serverDetails)
Expand All @@ -205,16 +204,12 @@ func TestNewBuildPropertySetter(t *testing.T) {
buildNumber := "1"
projectKey := "test-project"
targetRepo := "conan-local"

setter := NewBuildPropertySetter(nil, targetRepo, buildName, buildNumber, projectKey)

assert.NotNil(t, setter)
assert.Equal(t, buildName, setter.buildName)
assert.Equal(t, buildNumber, setter.buildNumber)
assert.Equal(t, projectKey, setter.projectKey)
assert.Equal(t, targetRepo, setter.targetRepo)
}




47 changes: 21 additions & 26 deletions artifactory/commands/conan/command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

func TestNewConanCommand(t *testing.T) {
cmd := NewConanCommand()

assert.NotNil(t, cmd)
assert.Empty(t, cmd.commandName)
assert.Nil(t, cmd.args)
Expand All @@ -19,19 +19,19 @@ func TestNewConanCommand(t *testing.T) {

func TestConanCommand_SetCommandName(t *testing.T) {
cmd := NewConanCommand()

result := cmd.SetCommandName("install")

assert.Equal(t, "install", cmd.commandName)
assert.Same(t, cmd, result, "SetCommandName should return same instance for chaining")
}

func TestConanCommand_SetArgs(t *testing.T) {
cmd := NewConanCommand()
args := []string{".", "--build=missing"}

result := cmd.SetArgs(args)

assert.Equal(t, args, cmd.args)
assert.Same(t, cmd, result, "SetArgs should return same instance for chaining")
}
Expand All @@ -41,18 +41,18 @@ func TestConanCommand_SetServerDetails(t *testing.T) {
serverDetails := &config.ServerDetails{
ServerId: "test-server",
}

result := cmd.SetServerDetails(serverDetails)

assert.Equal(t, serverDetails, cmd.serverDetails)
assert.Same(t, cmd, result, "SetServerDetails should return same instance for chaining")
}

func TestConanCommand_CommandName(t *testing.T) {
cmd := NewConanCommand()

result := cmd.CommandName()

assert.Equal(t, "rt_conan", result)
}

Expand All @@ -62,9 +62,9 @@ func TestConanCommand_ServerDetails(t *testing.T) {
ServerId: "test-server",
}
cmd.serverDetails = serverDetails

result, err := cmd.ServerDetails()

assert.NoError(t, err)
assert.Equal(t, serverDetails, result)
}
Expand All @@ -73,9 +73,9 @@ func TestConanCommand_GetCmd(t *testing.T) {
cmd := NewConanCommand()
cmd.commandName = "install"
cmd.args = []string{".", "--build=missing"}

execCmd := cmd.GetCmd()

assert.NotNil(t, execCmd)
assert.Equal(t, "conan", execCmd.Path[len(execCmd.Path)-5:]) // ends with "conan"
assert.Contains(t, execCmd.Args, "install")
Expand All @@ -85,43 +85,38 @@ func TestConanCommand_GetCmd(t *testing.T) {

func TestConanCommand_GetEnv(t *testing.T) {
cmd := NewConanCommand()

env := cmd.GetEnv()

assert.NotNil(t, env)
assert.Empty(t, env)
}

func TestConanCommand_GetStdWriter(t *testing.T) {
cmd := NewConanCommand()

writer := cmd.GetStdWriter()

assert.Nil(t, writer)
}

func TestConanCommand_GetErrWriter(t *testing.T) {
cmd := NewConanCommand()

writer := cmd.GetErrWriter()

assert.Nil(t, writer)
}

func TestConanCommand_ChainedSetters(t *testing.T) {
serverDetails := &config.ServerDetails{ServerId: "test"}

cmd := NewConanCommand().
SetCommandName("upload").
SetArgs([]string{"pkg/1.0", "-r", "remote"}).
SetServerDetails(serverDetails)

assert.Equal(t, "upload", cmd.commandName)
assert.Equal(t, []string{"pkg/1.0", "-r", "remote"}, cmd.args)
assert.Equal(t, serverDetails, cmd.serverDetails)
}





4 changes: 0 additions & 4 deletions artifactory/commands/conan/login_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,3 @@ func TestFormatServerIDs(t *testing.T) {
})
}
}




10 changes: 2 additions & 8 deletions artifactory/commands/conan/upload_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,19 +114,13 @@ Upload completed in 3s
}
}


func TestNewUploadProcessor(t *testing.T) {
workingDir := "/test/path"

processor := NewUploadProcessor(workingDir, nil, nil)

assert.NotNil(t, processor)
assert.Equal(t, workingDir, processor.workingDir)
assert.Nil(t, processor.buildConfiguration)
assert.Nil(t, processor.serverDetails)
}





4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ require (
github.com/forPelevin/gomoji v1.4.1
github.com/google/go-containerregistry v0.20.7
github.com/jedib0t/go-pretty/v6 v6.7.5
github.com/jfrog/build-info-go v1.13.1-0.20260106060835-a1a07c967546
github.com/jfrog/build-info-go v1.13.1-0.20260106203543-03b99793ca5a
github.com/jfrog/gofrog v1.7.6
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b
github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23
github.com/pkg/errors v0.9.1
github.com/spf13/viper v1.21.0
Expand Down
Loading