@@ -11,29 +11,32 @@ import (
1111 "time"
1212)
1313
14- var gitRepoUrl = "https://github.com/devtron-labs/getting-started-nodejs.git "
15- var location1 = "/tmp /git-base/1/github.com/devtron-labs/getting-started-nodejs.git"
16- var location2 = "/tmp /git-base/2/github.com/devtron-labs/getting-started-nodejs.git"
14+ var gitRepoUrl = "https://github.com/devtron-labs/getting-started-nodejs"
15+ var location1 = baseDir + " /git-base/1/github.com/devtron-labs/getting-started-nodejs.git"
16+ var location2 = baseDir + " /git-base/2/github.com/devtron-labs/getting-started-nodejs.git"
1717var commitHash = "dfde5ecae5cd1ae6a7e3471a63a8277177898a7d"
1818var tag = "v0.0.2"
1919var branchName = "do-not-touch-this-branch"
20- var baseDir = "tmp/ "
21- var privateGitRepoUrl = "https://github.com/prakash100198/HelloWorldProject .git"
22- var privateGitRepoLocation = "/tmp/ git-base/42/github.com/prakash100198/HelloWorldProject .git"
23- var username = "prakash100198 "
24- var password = ""
20+ var baseDir = "/Users/subhashish/tmp1 "
21+ var privateGitRepoUrl = "https://github.com/devtron-labs/getting-started-nodejs .git"
22+ var privateGitRepoLocation = baseDir + "/ git-base/42/github.com/devtron-labs/getting-started-nodejs .git"
23+ var username = "subhashish-devtron "
24+ var password = "Subs2303 "
2525var sshPrivateKey = ``
2626
2727func getRepoManagerImpl (t * testing.T ) * RepositoryManagerImpl {
2828 logger , err := utils .NewSugardLogger ()
2929 assert .Nil (t , err )
30- gitCliImpl := NewCliGitManagerImpl (logger )
31- gogitImpl := NewGoGitManagerImpl (logger )
32- repositoryManagerImpl := NewRepositoryManagerImpl ( logger , & internal.Configuration {
30+ gitCliImpl := NewGitCliManagerImpl (logger )
31+ gogitImpl := NewGoGitSDKManagerImpl (logger )
32+ conf := & internal.Configuration {
3333 CommitStatsTimeoutInSec : 0 ,
3434 EnableFileStats : true ,
3535 GitHistoryCount : 2 ,
36- }, gitCliImpl , gogitImpl )
36+ UseGitCli : true ,
37+ }
38+ gitUtil := NewGitManagerImpl (conf , gitCliImpl , gogitImpl )
39+ repositoryManagerImpl := NewRepositoryManagerImpl (logger , conf , gitUtil )
3740 return repositoryManagerImpl
3841}
3942
@@ -52,7 +55,7 @@ func TestRepositoryManager_Add(t *testing.T) {
5255 gitProviderId int
5356 location string
5457 url string
55- gitContext * GitContext
58+ gitCtx * GitContext
5659 authMode sql.AuthMode
5760 sshPrivateKeyContent string
5861 }
@@ -66,7 +69,7 @@ func TestRepositoryManager_Add(t *testing.T) {
6669 gitProviderId : 1 ,
6770 location : privateGitRepoLocation ,
6871 url : privateGitRepoUrl ,
69- gitContext : & GitContext {
72+ gitCtx : & GitContext {
7073 Username : username ,
7174 Password : password ,
7275 },
@@ -79,7 +82,7 @@ func TestRepositoryManager_Add(t *testing.T) {
7982 gitProviderId : 1 ,
8083 location : privateGitRepoLocation ,
8184 url : privateGitRepoUrl ,
82- gitContext : & GitContext {
85+ gitCtx : & GitContext {
8386 Username : "" ,
8487 Password : "" ,
8588 },
@@ -92,7 +95,7 @@ func TestRepositoryManager_Add(t *testing.T) {
9295 gitProviderId : 1 ,
9396 location : location1 ,
9497 url : gitRepoUrl + "dhs" ,
95- gitContext : & GitContext {
98+ gitCtx : & GitContext {
9699 Username : "" ,
97100 Password : "" ,
98101 },
@@ -105,7 +108,7 @@ func TestRepositoryManager_Add(t *testing.T) {
105108 gitProviderId : 1 ,
106109 location : location2 ,
107110 url : gitRepoUrl ,
108- gitContext : & GitContext {
111+ gitCtx : & GitContext {
109112 Username : "" ,
110113 Password : "" ,
111114 },
@@ -117,11 +120,11 @@ func TestRepositoryManager_Add(t *testing.T) {
117120 repositoryManagerImpl := getRepoManagerImpl (t )
118121 for _ , tt := range tests {
119122 if tt .payload .authMode == "SSH" {
120- err := repositoryManagerImpl .CreateSshFileIfNotExistsAndConfigureSshCommand (tt . payload . location , tt . payload . gitProviderId , tt . payload . sshPrivateKeyContent )
123+ err := repositoryManagerImpl.CreateSshFileIfNotExistsAndConfigureSshCommand (
121124 assert .Nil (t , err )
122125 }
123126 t .Run (tt .name , func (t * testing.T ) {
124- err := repositoryManagerImpl .Add (tt .payload .gitProviderId , tt .payload .location , tt .payload .url , tt .payload .gitContext , tt .payload .authMode , tt .payload .sshPrivateKeyContent )
127+ err := repositoryManagerImpl .Add (tt .payload .gitProviderId , tt .payload .location , tt .payload .url , tt .payload .gitCtx , tt .payload .authMode , tt .payload .sshPrivateKeyContent )
125128 if (err != nil ) != tt .wantErr {
126129 t .Errorf ("Add() error in %s, error = %v, wantErr %v" , tt .name , err , tt .wantErr )
127130 return
@@ -135,7 +138,7 @@ func TestRepositoryManager_Fetch(t *testing.T) {
135138 type args struct {
136139 location string
137140 url string
138- gitContext * GitContext
141+ gitCtx * GitContext
139142 }
140143 tests := []struct {
141144 name string
@@ -146,7 +149,7 @@ func TestRepositoryManager_Fetch(t *testing.T) {
146149 name : "Test1_Fetch_InvokingWithValidGitUrlWithoutCreds" , payload : args {
147150 location : location2 ,
148151 url : gitRepoUrl ,
149- gitContext : & GitContext {
152+ gitCtx : & GitContext {
150153 Username : "" ,
151154 Password : "" ,
152155 },
@@ -156,7 +159,7 @@ func TestRepositoryManager_Fetch(t *testing.T) {
156159 name : "Test2_Fetch_InvokingWithInvalidGitUrlWithoutCreds" , payload : args {
157160 location : location1 ,
158161 url : gitRepoUrl + "dhs" ,
159- gitContext : & GitContext {
162+ gitCtx : & GitContext {
160163 Username : "" ,
161164 Password : "" ,
162165 },
@@ -166,17 +169,17 @@ func TestRepositoryManager_Fetch(t *testing.T) {
166169 name : "Test3_Fetch_InvokingWithCorrectArgumentsWithCreds" , payload : args {
167170 location : privateGitRepoLocation ,
168171 url : privateGitRepoUrl ,
169- gitContext : & GitContext {
172+ gitCtx : & GitContext {
170173 Username : username ,
171174 Password : password ,
172175 },
173176 }, wantErr : false ,
174177 },
175178 {
176179 name : "Test4_Fetch_InvokingWithWrongLocationOfLocalDir" , payload : args {
177- location : privateGitRepoLocation + "/hjwbwfdj " ,
180+ location : baseDir + "/git-base/42/github.com/devtron-labs/agetting-started-nodejsgits " ,
178181 url : privateGitRepoUrl ,
179- gitContext : & GitContext {
182+ gitCtx : & GitContext {
180183 Username : username ,
181184 Password : password ,
182185 },
@@ -186,7 +189,7 @@ func TestRepositoryManager_Fetch(t *testing.T) {
186189 repositoryManagerImpl := getRepoManagerImpl (t )
187190 for _ , tt := range tests {
188191 t .Run (tt .name , func (t * testing.T ) {
189- _ , _ , err := repositoryManagerImpl .Fetch (tt .payload .gitContext , tt .payload .url , tt .payload .location )
192+ _ , _ , err := repositoryManagerImpl .Fetch (tt .payload .gitCtx , tt .payload .url , tt .payload .location )
190193
191194 if (err != nil ) != tt .wantErr {
192195 t .Errorf ("Fetch() error in %s, error = %v, wantErr %v" , tt .name , err , tt .wantErr )
@@ -249,6 +252,7 @@ func TestRepositoryManager_GetCommitMetadata(t *testing.T) {
249252 got .Author = ""
250253 got .Message = ""
251254 got .Changes = nil
255+ got .CheckoutPath = ""
252256
253257 if ! reflect .DeepEqual (* got , * tt .want ) {
254258 t .Errorf ("GetCommitMetadata() got = %v, want %v" , got , tt .want )
@@ -380,6 +384,7 @@ func TestRepositoryManager_ChangesSince(t *testing.T) {
380384 }
381385
382386 got [index ].FileStats = nil
387+ got [index ].CheckoutPath = ""
383388 want .FileStats = nil
384389
385390 if ! reflect .DeepEqual (* got [index ], * want ) {
@@ -561,10 +566,10 @@ func TestRepositoryManager_ChangesSinceByRepository(t *testing.T) {
561566 repositoryManagerImpl := getRepoManagerImpl (t )
562567 for _ , tt := range tests {
563568 //r, err := git.PlainOpen(tt.payload.checkoutPath)
564- r , err := repositoryManagerImpl .gitUtil .OpenRepoPlain (tt .payload .checkoutPath )
569+ r , err := repositoryManagerImpl .gitManager .OpenRepoPlain (tt .payload .checkoutPath )
565570 assert .Nil (t , err )
566571 t .Run (tt .name , func (t * testing.T ) {
567- got , err := repositoryManagerImpl .ChangesSinceByRepository (r , tt .payload .branch , tt .payload .from , tt .payload .to , tt .payload .count , "" )
572+ got , err := repositoryManagerImpl .ChangesSinceByRepository (r , tt .payload .branch , tt .payload .from , tt .payload .to , tt .payload .count )
568573 if (err != nil ) != tt .wantErr {
569574 t .Errorf ("ChangesSinceByRepository() error in %s, error = %v, wantErr %v" , tt .name , err , tt .wantErr )
570575 return
@@ -580,6 +585,7 @@ func TestRepositoryManager_ChangesSinceByRepository(t *testing.T) {
580585 got [index ].Author = ""
581586 got [index ].Message = ""
582587 got [index ].Changes = nil
588+ got [index ].CheckoutPath = ""
583589
584590 if ! reflect .DeepEqual (* got [index ], * want ) {
585591 t .Errorf ("ChangesSinceByRepository() got = %v, want %v" , got , tt .want )
@@ -643,6 +649,7 @@ func TestRepositoryManager_GetCommitForTag(t *testing.T) {
643649 got .Author = ""
644650 got .Message = ""
645651 got .Changes = nil
652+ got .CheckoutPath = ""
646653
647654 if ! reflect .DeepEqual (* got , * tt .want ) {
648655 t .Errorf ("GetCommitMetadata() got = %v, want %v" , got , tt .want )
0 commit comments