unit test performance (#3194)

* DataTable (-4 sec)

* PaginationComponent (-1 sec)

* DocumentList

* custom testbed setup, test upgrades

* test fixes

* more test fixes

* remove fdescribe

* test fixes

* test fixes

* more test fixes

* test fixes

* upgrade tests

* update tests

* upgrade tests

* upgrade tests

* upgrade tests

* upgrade tests

* update tests

* translate loader fixes

* auth and cookie fixes

* upgrade tests

* upgrade tests

* test fixes

* almost there

* diable broken tests

* process tests (part 1)

* fix lint issues

* another test upgrade

* almost there

* cleanup

* insights testing upgrade

* improve tests

* tests cleanup

* tests cleanup

* cleanup tests

* test cleanup

* favorite nodes tests

* rebase fix syntax

* fix core test

* give up test focus

* flush tabs

* fix search test

* Update document-list.component.spec.ts

* fix document list lock

* increase tick time

* remove duplicate test

lib/core/services/alfresco-api.service.ts

@@ -40,6 +40,14 @@ export class AlfrescoApiService {
         return this.alfrescoApi;
     }
 
+    get taskApi(): alfrescoApi.TaskApi {
+        return this.getInstance().activiti.taskApi;
+    }
+
+    get modelsApi(): alfrescoApi.ModelsApi {
+        return this.getInstance().activiti.modelsApi;
+    }
+
     get contentApi(): ContentApi {
         return this.getInstance().content;
     }

lib/core/services/apps-process.service.spec.ts

@@ -18,19 +18,18 @@
 import { TestBed } from '@angular/core/testing';
 import { fakeApps } from '../mock/apps-service.mock';
 import { AppsProcessService } from './apps-process.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 declare let jasmine: any;
-describe('Apps Service', () => {
+
+describe('AppsProcessService', () => {
 
     let service: AppsProcessService;
 
-    beforeEach((() => {
-        TestBed.configureTestingModule({
-            providers: [
-                AppsProcessService
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         service = TestBed.get(AppsProcessService);

lib/core/services/auth-guard-bpm.service.spec.ts

@@ -16,16 +16,12 @@
  */
 
 import { async, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { CookieServiceMock } from './../mock/cookie.service.mock';
-import { AppConfigModule } from '../app-config/app-config.module';
 import { AppConfigService } from '../app-config/app-config.service';
 import { AuthGuardBpm } from './auth-guard-bpm.service';
 import { AuthenticationService } from './authentication.service';
-import { CookieService } from './cookie.service';
-import { TranslateLoaderService } from './translate-loader.service';
 import { RouterStateSnapshot, Router } from '@angular/router';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 describe('AuthGuardService BPM', () => {
 
@@ -34,24 +30,9 @@ describe('AuthGuardService BPM', () => {
     let routerService: Router;
     let appConfigService: AppConfigService;
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AppConfigModule,
-                RouterTestingModule,
-                TranslateModule.forRoot({
-                    loader: {
-                        provide: TranslateLoader,
-                        useClass: TranslateLoaderService
-                    }
-                })
-            ],
-            providers: [
-                AuthGuardBpm,
-                { provide: CookieService, useClass: CookieServiceMock }
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         authService = TestBed.get(AuthenticationService);

lib/core/services/auth-guard-ecm.service.spec.ts

@@ -20,6 +20,8 @@ import { Router } from '@angular/router';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { AuthGuardEcm } from './auth-guard-ecm.service';
 import { AuthenticationService } from './authentication.service';
+import { AppConfigService } from '../app-config/app-config.service';
+import { HttpClientModule } from '@angular/common/http';
 
 class RouterProvider {
     navigate: Function = jasmine.createSpy('RouterProviderNavigate');
@@ -79,7 +81,11 @@ class TestConfig {
         Object.assign(this.settings, settings);
 
         TestBed.configureTestingModule({
+            imports: [
+                HttpClientModule
+            ],
             providers: [
+                AppConfigService,
                 this.routerProvider,
                 this.alfrescoApiServiceProvider,
                 this.authenticationProvider,

lib/core/services/auth-guard.service.spec.ts

@@ -17,16 +17,11 @@
 
 import { async, TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { CookieServiceMock } from './../mock/cookie.service.mock';
-import { AppConfigModule } from '../app-config/app-config.module';
 import { AppConfigService } from '../app-config/app-config.service';
 import { AuthGuard } from './auth-guard.service';
 import { AuthenticationService } from './authentication.service';
-import { CookieService } from './cookie.service';
-import { TranslateLoaderService } from './translate-loader.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 describe('AuthGuardService', () => {
     let state;
@@ -35,25 +30,9 @@ describe('AuthGuardService', () => {
     let service: AuthGuard;
     let appConfigService: AppConfigService;
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AppConfigModule,
-                RouterTestingModule,
-                TranslateModule.forRoot({
-                    loader: {
-                        provide: TranslateLoader,
-                        useClass: TranslateLoaderService
-                    }
-                })
-            ],
-            providers: [
-                AuthGuard,
-                AuthenticationService,
-                { provide: CookieService, useClass: CookieServiceMock }
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         state = { url: '' };

lib/core/services/authentication.service.spec.ts

@@ -15,16 +15,14 @@
  * limitations under the License.
  */
 
-import { async, TestBed } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { CookieServiceMock } from './../mock/cookie.service.mock';
+import { TestBed } from '@angular/core/testing';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AppConfigModule } from '../app-config/app-config.module';
 import { AuthenticationService } from './authentication.service';
 import { CookieService } from './cookie.service';
 import { StorageService } from './storage.service';
-import { TranslateLoaderService } from './translate-loader.service';
 import { UserPreferencesService } from './user-preferences.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 declare let jasmine: any;
 
@@ -35,31 +33,18 @@ describe('AuthenticationService', () => {
     let storage: StorageService;
     let cookie: CookieService;
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AppConfigModule,
-                TranslateModule.forRoot({
-                    loader: {
-                        provide: TranslateLoader,
-                        useClass: TranslateLoaderService
-                    }
-                })
-            ],
-            providers: [
-                AuthenticationService,
-                StorageService,
-                UserPreferencesService,
-                { provide: CookieService, useClass: CookieServiceMock }
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         apiService = TestBed.get(AlfrescoApiService);
         authService = TestBed.get(AuthenticationService);
         preferences = TestBed.get(UserPreferencesService);
+
         cookie = TestBed.get(CookieService);
+        cookie.clear();
+
         storage = TestBed.get(StorageService);
         storage.clear();
 
@@ -67,6 +52,8 @@ describe('AuthenticationService', () => {
     });
 
     afterEach(() => {
+        cookie.clear();
+        storage.clear();
         jasmine.Ajax.uninstall();
     });
 
@@ -182,7 +169,7 @@ describe('AuthenticationService', () => {
             });
         });
 
-        xit('[ECM] should return ticket undefined when the credentials are wrong', (done) => {
+        it('[ECM] should return ticket undefined when the credentials are wrong', (done) => {
             authService.login('fake-wrong-username', 'fake-wrong-password').subscribe(
                 (res) => {
                 },
@@ -343,7 +330,7 @@ describe('AuthenticationService', () => {
             });
         });
 
-        xit('[BPM] should return ticket undefined when the credentials are wrong', (done) => {
+        it('[BPM] should return ticket undefined when the credentials are wrong', (done) => {
             authService.login('fake-wrong-username', 'fake-wrong-password').subscribe(
                 (res) => {
                 },
@@ -507,7 +494,7 @@ describe('AuthenticationService', () => {
             });
         });
 
-        xit('[ALL] should return ticket undefined when the credentials are wrong', (done) => {
+        it('[ALL] should return ticket undefined when the credentials are wrong', (done) => {
             authService.login('fake-username', 'fake-password').subscribe(
                 (res) => {
                 },

lib/core/services/comment-content.service.spec.ts

@@ -19,23 +19,18 @@ import { TestBed } from '@angular/core/testing';
 import { CommentModel } from '../models/comment.model';
 import { fakeContentComment, fakeContentComments } from '../mock/comment-content-service.mock';
 import { CommentContentService } from './comment-content.service';
-import { LogService } from './log.service';
-import { StorageService } from './storage.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 declare let jasmine: any;
+
 describe('Comment Content Service', () => {
 
     let service: CommentContentService;
 
-    beforeEach((() => {
-        TestBed.configureTestingModule({
-            providers: [
-                CommentContentService,
-                StorageService,
-                LogService
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         service = TestBed.get(CommentContentService);

lib/core/services/comment-process.service.spec.ts

@@ -19,21 +19,20 @@ import { async, TestBed } from '@angular/core/testing';
 import { CommentModel } from '../models/comment.model';
 import { fakeProcessComment, fakeTasksComment, fakeUser1 } from '../mock/comment-process-service.mock';
 import { CommentProcessService } from './comment-process.service';
+import { setupTestBed } from '../testing/setupTestBed';
 import { AlfrescoApiService } from './alfresco-api.service';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 declare let jasmine: any;
+
 describe('Comment ProcessService Service', () => {
 
     let service: CommentProcessService;
     let alfrescoApi: any;
 
-    beforeEach((() => {
-        TestBed.configureTestingModule({
-            providers: [
-                CommentProcessService
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         service = TestBed.get(CommentProcessService);

lib/core/services/content.service.spec.ts

@@ -15,18 +15,20 @@
  * limitations under the License.
  */
 
-import { async, TestBed } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TestBed } from '@angular/core/testing';
 import { CookieServiceMock } from '../mock/cookie.service.mock';
 import { ContentService } from './content.service';
 import { SettingsService } from './settings.service';
 import { AppConfigService } from '../app-config/app-config.service';
-import { AppConfigModule } from '../app-config/app-config.module';
 import { AuthenticationService } from './authentication.service';
 import { CookieService } from './cookie.service';
 import { StorageService } from './storage.service';
-import { TranslateLoaderService } from './translate-loader.service';
-import { UserPreferencesService } from './user-preferences.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreModule } from '../core.module';
+import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
+import { TranslationService } from './translation.service';
+import { TranslationMock } from '../mock/translation.service.mock';
 
 declare let jasmine: any;
 
@@ -40,28 +42,16 @@ describe('ContentService', () => {
 
     const nodeId = 'fake-node-id';
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AppConfigModule,
-                TranslateModule.forRoot({
-                    loader: {
-                        provide: TranslateLoader,
-                        useClass: TranslateLoaderService
-                    }
-                })
-            ],
-            declarations: [],
-            providers: [
-                ContentService,
-                AuthenticationService,
-                SettingsService,
-                StorageService,
-                UserPreferencesService,
-                {provide: CookieService, useClass: CookieServiceMock}
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [
+            CoreModule.forRoot()
+        ],
+        providers: [
+            { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
+            { provide: TranslationService, useClass: TranslationMock },
+            { provide: CookieService, useClass: CookieServiceMock }
+        ]
+    });
 
     beforeEach(() => {
         authService = TestBed.get(AuthenticationService);

lib/core/services/cookie.service.ts

@@ -57,4 +57,8 @@ export class CookieService {
             (expiration ? ';expires=' + expiration.toUTCString() : '') +
             (path ? `;path=${path}` : ';path=/');
     }
+
+    clear() {
+        /* placeholder for testing purposes */
+    }
 }

lib/core/services/discovery-api.service.spec.ts

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-import { async, TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { BpmProductVersionModel, EcmProductVersionModel } from '../models/product-version.model';
 import { AppConfigService } from '../app-config/app-config.service';
-import { AppConfigModule } from '../app-config/app-config.module';
 import { DiscoveryApiService } from './discovery-api.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 declare let jasmine: any;
 
@@ -90,16 +91,9 @@ describe('Discovery Api Service', () => {
 
     let service;
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AppConfigModule
-            ],
-            providers: [
-                DiscoveryApiService
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         let appConfig: AppConfigService = TestBed.get(AppConfigService);

lib/core/services/people-process.service.spec.ts

@@ -18,6 +18,8 @@
 import { TestBed } from '@angular/core/testing';
 import { UserProcessModel } from '../models';
 import { PeopleProcessService } from './people-process.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 declare let jasmine: any;
 
@@ -41,12 +43,11 @@ describe('PeopleProcessService', () => {
 
     let service: PeopleProcessService;
 
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
+
     beforeEach(() => {
-        TestBed.configureTestingModule({
-            providers: [
-                PeopleProcessService
-            ]
-        });
         service = TestBed.get(PeopleProcessService);
     });
 

lib/core/services/renditions.service.spec.ts

@@ -15,26 +15,27 @@
  * limitations under the License.
  */
 
-import { async, TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { fakeRedition, fakeReditionCreated, fakeReditionsList } from '../mock/renditionsService.mock';
-import { AppConfigModule } from '../app-config/app-config.module';
 import { RenditionsService } from './renditions.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreModule } from '../core.module';
+import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
 
 declare let jasmine: any;
 
 describe('RenditionsService', () => {
     let service: RenditionsService;
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AppConfigModule
-            ],
-            providers: [
-                RenditionsService
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [
+            CoreModule.forRoot()
+        ],
+        providers: [
+            { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }
+        ]
+    });
 
     beforeEach(() => {
         jasmine.Ajax.install();
@@ -45,7 +46,7 @@ describe('RenditionsService', () => {
         jasmine.Ajax.uninstall();
     });
 
-    it('Get redition list service should return the list', (done) => {
+    it('Get rendition list service should return the list', (done) => {
         service.getRenditionsListByNodeId('fake-node-id').subscribe((res) => {
             expect(res.list.entries[0].entry.id).toBe('avatar');
             done();
@@ -58,7 +59,7 @@ describe('RenditionsService', () => {
         });
     });
 
-    it('Create redition service should call the server with the ID passed and the asked encoding', (done) => {
+    it('Create rendition service should call the server with the ID passed and the asked encoding', (done) => {
         service.createRendition('fake-node-id', 'pdf').subscribe((res) => {
             expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
             expect(jasmine.Ajax.requests.mostRecent().url).toContain('/ecm/alfresco/api/-default-/public/alfresco/versions/1/nodes/fake-node-id/renditions');
@@ -83,7 +84,7 @@ describe('RenditionsService', () => {
         });
     });
 
-    it('Get redition service should catch the error', (done) => {
+    it('Get rendition service should catch the error', (done) => {
         service.getRenditionsListByNodeId('fake-node-id').subscribe((res) => {
             }, (res) => {
                 done();

lib/core/services/search.service.spec.ts

@@ -15,38 +15,33 @@
  * limitations under the License.
  */
 
-import { async, TestBed } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TestBed } from '@angular/core/testing';
 import { searchMockApi, mockError, fakeSearch } from '../mock/search.service.mock';
 import { CookieServiceMock } from './../mock/cookie.service.mock';
-import { AlfrescoApiService } from './alfresco-api.service';
-import { AppConfigModule } from '../app-config/app-config.module';
 import { CookieService } from './cookie.service';
 import { SearchService } from './search.service';
-import { TranslateLoaderService } from './translate-loader.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreModule } from '../core.module';
+import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
+import { TranslationService } from './translation.service';
+import { TranslationMock } from '../mock/translation.service.mock';
 
 describe('SearchService', () => {
 
     let service: SearchService;
     let apiService: AlfrescoApiService;
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AppConfigModule,
-                TranslateModule.forRoot({
-                    loader: {
-                        provide: TranslateLoader,
-                        useClass: TranslateLoaderService
-                    }
-                })
-            ],
-            providers: [
-                SearchService,
-                { provide: CookieService, useClass: CookieServiceMock }
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [
+            CoreModule.forRoot()
+        ],
+        providers: [
+            { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
+            { provide: TranslationService, useClass: TranslationMock },
+            { provide: CookieService, useClass: CookieServiceMock }
+        ]
+    });
 
     beforeEach(() => {
         service = TestBed.get(SearchService);

lib/core/services/settings.service.spec.ts

@@ -15,24 +15,18 @@
  * limitations under the License.
  */
 
-import { async, TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { SettingsService } from './settings.service';
-import { AppConfigModule } from '../app-config/app-config.module';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 describe('SettingsService', () => {
 
     let service: SettingsService;
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AppConfigModule
-            ],
-            providers: [
-                SettingsService
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         service = TestBed.get(SettingsService);

lib/core/services/sites.service.spec.ts

@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-import { async, TestBed } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TestBed } from '@angular/core/testing';
 import { AppConfigService } from '../app-config/app-config.service';
-import { AppConfigModule } from '../app-config/app-config.module';
 import { SitesService } from './sites.service';
-import { TranslateLoaderService } from './translate-loader.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 declare let jasmine: any;
 
@@ -28,22 +27,9 @@ describe('Sites service', () => {
 
     let service;
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AppConfigModule,
-                TranslateModule.forRoot({
-                    loader: {
-                        provide: TranslateLoader,
-                        useClass: TranslateLoaderService
-                    }
-                })
-            ],
-            providers: [
-                SitesService
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         let appConfig: AppConfigService = TestBed.get(AppConfigService);

lib/core/services/thumbnail.service.spec.ts

@@ -15,42 +15,18 @@
  * limitations under the License.
  */
 
-import { HttpClientModule } from '@angular/common/http';
-import { async, TestBed } from '@angular/core/testing';
-import { MatIconRegistry } from '@angular/material';
-import { BrowserModule } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { CookieServiceMock } from './../mock/cookie.service.mock';
-import { ContentService } from './content.service';
-import { CookieService } from './cookie.service';
+import { TestBed } from '@angular/core/testing';
 import { ThumbnailService } from './thumbnail.service';
-import { TranslateLoaderService } from './translate-loader.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 describe('ThumbnailService', () => {
 
     let service: ThumbnailService;
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                BrowserModule,
-                HttpClientModule,
-                TranslateModule.forRoot({
-                    loader: {
-                        provide: TranslateLoader,
-                        useClass: TranslateLoaderService
-                    }
-                })
-            ],
-            providers: [
-                ContentService,
-                { provide: CookieService, useClass: CookieServiceMock },
-                ThumbnailService,
-                MatIconRegistry
-            ]
-        }).compileComponents();
-
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         service = TestBed.get(ThumbnailService);

lib/core/services/translate-loader.spec.ts

@@ -15,48 +15,28 @@
  * limitations under the License.
  */
 
-import { HttpClientModule } from '@angular/common/http';
-import { Injector } from '@angular/core';
-import { getTestBed, TestBed } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
+import { TestBed } from '@angular/core/testing';
 import { TranslateLoaderService } from './translate-loader.service';
-import { TRANSLATION_PROVIDER, TranslationService } from './translation.service';
+import { TranslationService } from './translation.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreModule } from '../core.module';
 
 let componentJson1 = ' {"TEST": "This is a test", "TEST2": "This is another test"} ' ;
 
 declare let jasmine: any;
 
 describe('TranslateLoader', () => {
-    let injector: Injector;
     let translationService: TranslationService;
     let customLoader: TranslateLoaderService;
 
+    setupTestBed({
+        imports: [
+            CoreModule.forRoot()
+        ]
+    });
+
     beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                HttpClientModule,
-                TranslateModule.forRoot({
-                    loader: {
-                        provide: TranslateLoader,
-                        useClass: TranslateLoaderService
-                    }
-                })
-            ],
-            providers: [
-                TranslationService,
-                {
-                    provide: TRANSLATION_PROVIDER,
-                    multi: true,
-                    useValue: {
-                        name: '@alfresco/adf-core',
-                        source: 'assets/ng2-alfresco-core'
-                    }
-                }
-            ]
-        });
-        injector = getTestBed();
-        translationService = injector.get(TranslationService);
+        translationService = TestBed.get(TranslationService);
         customLoader = <TranslateLoaderService> translationService.translate.currentLoader;
 
         jasmine.Ajax.install();

lib/core/services/translation.service.spec.ts

@@ -22,6 +22,13 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { TranslateLoaderService } from './translate-loader.service';
 import { TRANSLATION_PROVIDER, TranslationService } from './translation.service';
+import { LogService } from './log.service';
+import { AppConfigService } from '../app-config/app-config.service';
+import { AppConfigServiceMock } from '../mock/app-config.service.mock';
+import { UserPreferencesService } from './user-preferences.service';
+import { StorageService } from './storage.service';
+import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
 
 declare let jasmine: any;
 
@@ -41,6 +48,11 @@ describe('TranslationService', () => {
                 })
             ],
             providers: [
+                { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
+                LogService,
+                { provide: AppConfigService, useClass: AppConfigServiceMock },
+                UserPreferencesService,
+                StorageService,
                 TranslationService,
                 {
                     provide: TRANSLATION_PROVIDER,

lib/core/services/upload.service.spec.ts

@@ -21,6 +21,9 @@ import { FileModel, FileUploadOptions, FileUploadStatus } from '../models/file.m
 import { AppConfigModule } from '../app-config/app-config.module';
 import { UploadService } from './upload.service';
 import { AppConfigService } from '../app-config/app-config.service';
+import { AlfrescoApiService } from './alfresco-api.service';
+import { StorageService } from './storage.service';
+import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
 
 declare let jasmine: any;
 
@@ -33,6 +36,8 @@ describe('UploadService', () => {
                 AppConfigModule
             ],
             providers: [
+                { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
+                StorageService,
                 UploadService
             ]
         }).compileComponents();

lib/core/services/user-preferences.service.spec.ts

@@ -16,15 +16,13 @@
  */
 
 import { async, TestBed } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { DirectiveModule } from '../directives/directive.module';
-
+import { TranslateService } from '@ngx-translate/core';
 import { AppConfigService } from '../app-config/app-config.service';
-import { AppConfigModule } from '../app-config/app-config.module';
 import { StorageService } from './storage.service';
-import { TranslateLoaderService } from './translate-loader.service';
 import { UserPreferencesService } from './user-preferences.service';
 import { UserPreferenceValues } from './user-preferences.service';
+import { setupTestBed } from '../testing/setupTestBed';
+import { CoreTestingModule } from '../testing/core.testing.module';
 
 describe('UserPreferencesService', () => {
 
@@ -35,23 +33,9 @@ describe('UserPreferencesService', () => {
     let appConfig: AppConfigService;
     let translate: TranslateService;
 
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AppConfigModule,
-                DirectiveModule,
-                TranslateModule.forRoot({
-                    loader: {
-                        provide: TranslateLoader,
-                        useClass: TranslateLoaderService
-                    }
-                })
-            ],
-            providers: [
-                UserPreferencesService
-            ]
-        }).compileComponents();
-    }));
+    setupTestBed({
+        imports: [CoreTestingModule]
+    });
 
     beforeEach(() => {
         appConfig = TestBed.get(AppConfigService);