1
- return ;
2
1
var helper = require ( './test-helper' ) ;
3
2
var Client = helper . Client ;
4
3
4
+ var suite = new helper . Suite ( ) ;
5
+
5
6
var conInfo = helper . config ;
6
7
7
8
function getConInfo ( override ) {
@@ -26,34 +27,37 @@ function getAppName(conf, cb) {
26
27
} ) ) ;
27
28
}
28
29
29
- test ( 'No default appliation_name ' , function ( ) {
30
+ suite . test ( 'No default appliation_name ' , function ( done ) {
30
31
var conf = getConInfo ( ) ;
31
- getAppName ( conf , function ( res ) {
32
+ getAppName ( { } , function ( res ) {
32
33
assert . strictEqual ( res , '' ) ;
34
+ done ( )
33
35
} ) ;
34
36
} ) ;
35
37
36
- test ( 'fallback_application_name is used' , function ( ) {
38
+ suite . test ( 'fallback_application_name is used' , function ( done ) {
37
39
var fbAppName = 'this is my app' ;
38
40
var conf = getConInfo ( {
39
41
'fallback_application_name' : fbAppName
40
42
} ) ;
41
43
getAppName ( conf , function ( res ) {
42
44
assert . strictEqual ( res , fbAppName ) ;
45
+ done ( )
43
46
} ) ;
44
47
} ) ;
45
48
46
- test ( 'application_name is used' , function ( ) {
49
+ suite . test ( 'application_name is used' , function ( done ) {
47
50
var appName = 'some wired !@#$% application_name' ;
48
51
var conf = getConInfo ( {
49
52
'application_name' : appName
50
53
} ) ;
51
54
getAppName ( conf , function ( res ) {
52
55
assert . strictEqual ( res , appName ) ;
56
+ done ( )
53
57
} ) ;
54
58
} ) ;
55
59
56
- test ( 'application_name has precedence over fallback_application_name' , function ( ) {
60
+ suite . test ( 'application_name has precedence over fallback_application_name' , function ( done ) {
57
61
var appName = 'some wired !@#$% application_name' ;
58
62
var fbAppName = 'some other strange $$test$$ appname' ;
59
63
var conf = getConInfo ( {
@@ -62,10 +66,11 @@ test('application_name has precedence over fallback_application_name', function(
62
66
} ) ;
63
67
getAppName ( conf , function ( res ) {
64
68
assert . strictEqual ( res , appName ) ;
69
+ done ( )
65
70
} ) ;
66
71
} ) ;
67
72
68
- test ( 'application_name from connection string' , function ( ) {
73
+ suite . test ( 'application_name from connection string' , function ( done ) {
69
74
var appName = 'my app' ;
70
75
var conParams = require ( __dirname + '/../../../lib/connection-parameters' ) ;
71
76
var conf ;
@@ -76,21 +81,20 @@ test('application_name from connection string', function(){
76
81
}
77
82
getAppName ( conf , function ( res ) {
78
83
assert . strictEqual ( res , appName ) ;
84
+ done ( )
79
85
} ) ;
80
86
} ) ;
81
87
82
88
83
89
84
90
// TODO: make the test work for native client too
85
91
if ( ! helper . args . native ) {
86
- test ( 'application_name is read from the env' , function ( ) {
92
+ suite . test ( 'application_name is read from the env' , function ( done ) {
87
93
var appName = process . env . PGAPPNAME = 'testest' ;
88
- var conf = getConInfo ( {
89
- 'just some bla' : 'to fool the pool'
90
- } ) ;
91
- getAppName ( conf , function ( res ) {
94
+ getAppName ( { } , function ( res ) {
92
95
delete process . env . PGAPPNAME ;
93
96
assert . strictEqual ( res , appName ) ;
97
+ done ( )
94
98
} ) ;
95
99
} ) ;
96
100
}
0 commit comments