Skip to content

Commit

Permalink
Bugfix resolve #1155 (#1158)
Browse files Browse the repository at this point in the history
* Revert "Revert "bugfix - resolve issue #1155" (#1157)"

This reverts commit 25457ed.

* added unit test for user provided input
  • Loading branch information
kapishmalik authored Nov 30, 2024
1 parent 25457ed commit 23b405d
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 5 deletions.
35 changes: 30 additions & 5 deletions core/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
log "github.com/sirupsen/logrus"
"io/ioutil"
"k8s.io/client-go/util/jsonpath"
"math/big"
"math/rand"
"net/http"
"net/url"
Expand Down Expand Up @@ -401,11 +402,14 @@ func jsonPath(query, toMatch string) interface{} {

// Jsonpath library converts large int into a string with scientific notion, the following
// reverts that process to avoid mismatching when using the jsonpath result for csv data lookup
floatResult, err := strconv.ParseFloat(result, 64)
// if the string is a float and a whole number
if err == nil && floatResult == float64(int64(floatResult)) {
intResult := int(floatResult)
result = strconv.Itoa(intResult)
// Handle large integers in scientific notation by converting back to big.Int
if isScientific(result) {
// If result is in scientific notation, try converting to a big.Int
bigInt := new(big.Int)
bigInt, success := bigIntFromString(result)
if success {
result = bigInt.String() // Convert back to string representation of the big integer
}
}

// convert to array data if applicable
Expand All @@ -420,6 +424,27 @@ func jsonPath(query, toMatch string) interface{} {
return arrayData
}

// isScientific checks if a string is in scientific notation (e.g., "1.349599e+37")
func isScientific(value string) bool {
return strings.Contains(value, "e") || strings.Contains(value, "E")
}

// bigIntFromString converts a string representing a number (potentially in scientific notation) to big.Int
func bigIntFromString(value string) (*big.Int, bool) {
// Parse the string as a big.Float to handle scientific notation
flt := new(big.Float)
flt, _, err := big.ParseFloat(value, 10, 0, big.ToNearestEven)
if err != nil {
return nil, false
}

// Convert the big.Float to big.Int (rounding down)
bigInt := new(big.Int)
flt.Int(bigInt)

return bigInt, true
}

func xPath(query, toMatch string) string {
result, err := XpathExecution(query, toMatch)
if err != nil {
Expand Down
21 changes: 21 additions & 0 deletions core/util/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,27 @@ func Test_CopyMap(t *testing.T) {
Expect(newMap["second"]).To(Equal("2"))
}

func Test_JsonPathMethod_WithBigFloatingNumber(t *testing.T) {

RegisterTestingT(t)
res := jsonPath("$.registrant", `{"registrant":"13495985898986869898697879879987978978.12345566777"}`)
Expect(res).To(Equal("13495985898986869898697879879987978978.12345566777"))
}

func Test_JsonPathMethod_WithBigIntegerUserProvidedNumber(t *testing.T) {

RegisterTestingT(t)
res := jsonPath("$.registrant", `{"registrant":"0009007199254740999"}`)
Expect(res).To(Equal("0009007199254740999"))
}

func Test_JsonPathMethod_WithWordContainingEe(t *testing.T) {

RegisterTestingT(t)
res := jsonPath("$.registrant", `{"registrant":"ETest"}`)
Expect(res).To(Equal("ETest"))
}

func Test_Identical_ReturnsTrue_WithExactlySameArray(t *testing.T) {
RegisterTestingT(t)
first := [2]string{"q1", "q2"}
Expand Down

0 comments on commit 23b405d

Please sign in to comment.