@@ -40,10 +40,8 @@ export default class App {
40
40
41
41
const sdkRelay = new ClientSDKRelay ( ) ;
42
42
const sdkInfo = await sdkRelay . isReady ( ) ;
43
- if ( 'errorMessage' in sdkInfo ) {
44
- const error = sdkInfo as SDKConnectionFailure ;
45
- log ( red ( 'SDK Relay Client failed to load: ' ) ) ;
46
- log ( red ( error . errorMessage ) ) ;
43
+
44
+ if ( ! this . validateSdkInfo ( sdkInfo ) ) {
47
45
return false ;
48
46
}
49
47
@@ -58,10 +56,8 @@ export default class App {
58
56
59
57
const sdkRelay = new ServerSDKRelay ( this . config . sdkServer , this . config . sdkName ) ;
60
58
const sdkInfo = await sdkRelay . isReady ( ) ;
61
- if ( 'errorMessage' in sdkInfo && typeof sdkInfo . errorMessage === 'string' ) {
62
- const error = sdkInfo as SDKConnectionFailure ;
63
- log ( red ( 'SDK Relay Server failed to load: ' ) ) ;
64
- log ( red ( error . errorMessage ) ) ;
59
+
60
+ if ( ! this . validateSdkInfo ( sdkInfo ) ) {
65
61
return false ;
66
62
}
67
63
@@ -70,6 +66,24 @@ export default class App {
70
66
return this . innerRun ( sdkRelay ) ;
71
67
}
72
68
69
+ private validateSdkInfo ( sdkInfo : SDKInfo | SDKConnectionFailure ) : boolean {
70
+ if ( 'errorMessage' in sdkInfo ) {
71
+ const error = sdkInfo as SDKConnectionFailure ;
72
+ log ( red ( 'SDK Relay failed to load: ' ) ) ;
73
+ log ( red ( error . errorMessage ) ) ;
74
+ return false ;
75
+ }
76
+
77
+ if ( sdkInfo && ( sdkInfo as SDKInfo ) . sdkName !== this . config . sdkName ) {
78
+ const actualName = ( sdkInfo as SDKInfo ) . sdkName ;
79
+ // Throw an error as setting the test scenarios won't work if the names don't match.
80
+ log ( red ( `SDK name ${ actualName } does not match expected ${ this . config . sdkName } .` ) ) ;
81
+ return false ;
82
+ }
83
+
84
+ return true ;
85
+ }
86
+
73
87
private printHeader ( ) : void {
74
88
log ( `Running tests for ${ this . config . sdkType } SDK: ${ this . config . sdkName } ` ) ;
75
89
log ( `Test Cluster Details` ) ;
@@ -283,9 +297,13 @@ export default class App {
283
297
message : `Value ${ JSON . stringify ( result . result ) } did not match expected ${ JSON . stringify ( subject . assignment ) } ` ,
284
298
} ) ;
285
299
286
- logIndent ( 1 , red ( 'fail' ) + ` ${ testCaseLabel } :\n` +
287
- ` Expected: ${ JSON . stringify ( subject . assignment , null , 2 ) } \n` +
288
- ` Received: ${ JSON . stringify ( result . result , null , 2 ) } ` ) ;
300
+ logIndent (
301
+ 1 ,
302
+ red ( 'fail' ) +
303
+ ` ${ testCaseLabel } :\n` +
304
+ ` Expected: ${ JSON . stringify ( subject . assignment , null , 2 ) } \n` +
305
+ ` Received: ${ JSON . stringify ( result . result , null , 2 ) } ` ,
306
+ ) ;
289
307
} else {
290
308
testCaseResult . assertions = 1 ;
291
309
0 commit comments