Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Commit 9b3ea71

Browse files
cftorrescftorres
committed
Fixing size outputs to convert to B, KB, MB etc.
1 parent d7ebf6d commit 9b3ea71

14 files changed

+524
-391
lines changed

‎differs/aptDiff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func parseLine(text string, currPackage string, packages map[string]utils.Packag
9090
size = -1
9191
}
9292
// Installed-Size is in KB, so we convert it to bytes to keep consistent with the tool's size units
93-
currPackageInfo.Size = size * 1024
93+
currPackageInfo.Size = size * 1024
9494
packages[currPackage] = currPackageInfo
9595
return currPackage
9696
default:

‎differs/aptDiff_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ func TestParseLine(t *testing.T) {
4949
},
5050
{
5151
descrip: "Size line",
52-
line: "Installed-Size: 12floz",
52+
line: "Installed-Size: 12",
5353
packages: map[string]utils.PackageInfo{},
5454
currPackage: "La-Croix",
5555
expPackage: "La-Croix",
56-
expected: map[string]utils.PackageInfo{"La-Croix": {Size: "12floz"}},
56+
expected: map[string]utils.PackageInfo{"La-Croix": {Size: 12288}},
5757
},
5858
{
5959
descrip: "Pre-existing PackageInfo struct",
60-
line: "Installed-Size: 12floz",
60+
line: "Installed-Size: 12",
6161
packages: map[string]utils.PackageInfo{"La-Croix": {Version: "Lime"}},
6262
currPackage: "La-Croix",
6363
expPackage: "La-Croix",
64-
expected: map[string]utils.PackageInfo{"La-Croix": {Version: "Lime", Size: "12floz"}},
64+
expected: map[string]utils.PackageInfo{"La-Croix": {Version: "Lime", Size: 12288}},
6565
},
6666
}
6767

‎differs/nodeDiff_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ func TestGetNodePackages(t *testing.T) {
2929
descrip: "all packages in one layer",
3030
path: "testDirs/packageOne",
3131
expected: map[string]map[string]utils.PackageInfo{
32-
"pac1": {"/node_modules/pac1/": {Version: "1.0", Size: "41"}},
33-
"pac2": {"/usr/local/lib/node_modules/pac2/": {Version: "2.0", Size: "41"}},
34-
"pac3": {"/node_modules/pac3/": {Version: "3.0", Size: "41"}}},
32+
"pac1": {"/node_modules/pac1/": {Version: "1.0", Size: 41}},
33+
"pac2": {"/usr/local/lib/node_modules/pac2/": {Version: "2.0", Size: 41}},
34+
"pac3": {"/node_modules/pac3/": {Version: "3.0", Size: 41}}},
3535
},
3636
{
3737
descrip: "Multi version packages",
3838
path: "testDirs/packageMulti",
3939
expected: map[string]map[string]utils.PackageInfo{
40-
"pac1": {"/node_modules/pac1/": {Version: "1.0", Size: "41"}},
41-
"pac2": {"/node_modules/pac2/": {Version: "2.0", Size: "41"},
42-
"/usr/local/lib/node_modules/pac2/": {Version: "3.0", Size: "41"}}},
40+
"pac1": {"/node_modules/pac1/": {Version: "1.0", Size: 41}},
41+
"pac2": {"/node_modules/pac2/": {Version: "2.0", Size: 41},
42+
"/usr/local/lib/node_modules/pac2/": {Version: "3.0", Size: 41}}},
4343
},
4444
}
4545

‎differs/pipDiff_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ func TestGetPythonPackages(t *testing.T) {
7878
},
7979
expectedPackages: map[string]map[string]utils.PackageInfo{
8080
"packageone": {
81-
"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"},
82-
"/usr/local/lib/python2.7/site-packages": {Version: "0.1.1", Size: "0"},
81+
"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: 0},
82+
"/usr/local/lib/python2.7/site-packages": {Version: "0.1.1", Size: 0},
8383
},
84-
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
85-
"script1": {"/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: "0"}},
86-
"script2": {"/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: "0"}},
87-
"script3": {"/usr/local/lib/python2.7/site-packages": {Version: "3.0", Size: "0"}},
84+
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: 0}},
85+
"script1": {"/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: 0}},
86+
"script2": {"/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: 0}},
87+
"script3": {"/usr/local/lib/python2.7/site-packages": {Version: "3.0", Size: 0}},
8888
},
8989
},
9090
{
@@ -93,10 +93,10 @@ func TestGetPythonPackages(t *testing.T) {
9393
FSPath: "testDirs/pipTests/packagesSingleVersion",
9494
},
9595
expectedPackages: map[string]map[string]utils.PackageInfo{
96-
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
97-
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
98-
"script1": {"/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: "0"}},
99-
"script2": {"/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: "0"}},
96+
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: 0}},
97+
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: 0}},
98+
"script1": {"/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: 0}},
99+
"script2": {"/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: 0}},
100100
},
101101
},
102102
{
@@ -110,11 +110,11 @@ func TestGetPythonPackages(t *testing.T) {
110110
},
111111
},
112112
expectedPackages: map[string]map[string]utils.PackageInfo{
113-
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
114-
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
115-
"packagefive": {"/pythonPath2/subdir": {Version: "3.6.9", Size: "0"}},
116-
"packagesix": {"/pythonPath1": {Version: "3.6.9", Size: "0"}},
117-
"packageseven": {"/pythonPath1": {Version: "4.6.2", Size: "0"}},
113+
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: 0}},
114+
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: 0}},
115+
"packagefive": {"/pythonPath2/subdir": {Version: "3.6.9", Size: 0}},
116+
"packagesix": {"/pythonPath1": {Version: "3.6.9", Size: 0}},
117+
"packageseven": {"/pythonPath1": {Version: "4.6.2", Size: 0}},
118118
},
119119
},
120120
{
@@ -128,8 +128,8 @@ func TestGetPythonPackages(t *testing.T) {
128128
},
129129
},
130130
expectedPackages: map[string]map[string]utils.PackageInfo{
131-
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
132-
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
131+
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: 0}},
132+
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: 0}},
133133
},
134134
},
135135
}

0 commit comments

Comments
 (0)