@@ -246,7 +246,7 @@ <h4>Declaration</h4>
                       <section class="section">
                         <div class="pointer"></div>
                         <div class="abstract">
-                          <p>The name of the database of the Postgres server.  Defaults to <code>postgres</code>.</p>
+                          <p>The name of the database on the Postgres server.  Defaults to <code>postgres</code>.</p>
 
                         </div>
                         <div class="declaration">
 
@@ -66,4 +66,4 @@ psql --host=127.0.0.1 --port=5432 --dbname=postgres --username=root < CreateTest
 
 ## Review the test suite configuration
 
-The file `Tests/PostgresClientKitTests/TestEnvironment.json` describes the environment used by the PostgresClientKit test suite.  Review its content and make any changes for your environment.
+The file `Tests/PostgresClientKitTests/TestEnvironment.swift` describes the environment used by the PostgresClientKit test suite.  Review its content and make any changes for your environment.
@@ -51,7 +51,7 @@ public struct ConnectionConfiguration {
     /// The timeout for socket operations, in seconds, or 0 for no timeout.  Defaults to 0.
     public var socketTimeout: Int = 0
 
-    /// The name of the database of the Postgres server.  Defaults to `postgres`.
+    /// The name of the database on the Postgres server.  Defaults to `postgres`.
     public var database = "postgres"
 
     /// The Postgres username.  Defaults to an empty string.
 
@@ -79,37 +79,7 @@ class PostgresClientKitTestCase: XCTestCase {
     //
     // MARK: Connections
     //
-    
-    /// An environment for testing PostgresClientKit.
-    struct TestEnvironment: Codable {
-        
-        var postgresHost: String
-        var postgresPort: Int
-        var postgresDatabase: String
-        var terryUsername: String
-        var terryPassword: String
-        var charlieUsername: String
-        var charliePassword: String
-        var maryUsername: String
-        var maryPassword: String
-        
-        static let current: TestEnvironment = {
-            
-            let url = URL(fileURLWithPath: #file)
-                .appendingPathComponent("../TestEnvironment.json")
-                .standardized
-            
-            let environment: TestEnvironment
-
-            do {
-                let data = try Data(contentsOf: url)
-                return try JSONDecoder().decode(TestEnvironment.self, from: data)
-            } catch {
-                fatalError("Error reading TestEnvironment.json: \(error)")
-            }
-        }()
-    }
-    
+        
     /// Creates a `ConnectionConfiguration` for Terry, authenticating by `Credential.trust`.
     ///
     /// - Parameter ssl: whether to use SSL/TLS
 
@@ -0,0 +1,57 @@
+//
+//  TestEnvironment.swift
+//  PostgresClientKit
+//
+//  Copyright 2020 David Pitfield and the PostgresClientKit contributors
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+/// The configuration for unit testing.
+///
+/// Edit the properties' default values to reflect your environment.
+struct TestEnvironment {
+    
+    /// The hostname or IP address of the Postgres server.
+    let postgresHost = "127.0.0.1"
+    
+    /// The port number of the Postgres server.
+    let postgresPort = 5432
+    
+    /// The name of the database on the Postgres server.
+    let postgresDatabase = "postgresclientkittest"
+    
+    /// The username of a Postgres user who can connect by `Credential.trust`.
+    let terryUsername = "terry_postgresclientkittest"
+    
+    /// The password of the Postgres user identified by `terryUsername`.
+    let terryPassword = "welcome1"
+    
+    /// The username of a Postgres user who can connect by `Credential.cleartextPassword`.
+    let charlieUsername = "charlie_postgresclientkittest"
+
+    /// The password of the Postgres user identified by `charlieUsername`.
+    let charliePassword = "welcome1"
+    
+    /// The username of a Postgres user who can connect by `Credential.md5Password`.
+    let maryUsername = "mary_postgresclientkittest"
+
+    /// The password of the Postgres user identified by `maryUsername`.
+    let maryPassword = "welcome1"
+    
+    
+    /// The current test environment.
+    static let current = TestEnvironment()
+}
+
+// EOF
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,4 @@ psql --host=127.0.0.1 --port=5432 --dbname=postgres --username=root < CreateTest`
`66`	`66`
`67`	`67`	`## Review the test suite configuration`
`68`	`68`
`69`		-The file `Tests/PostgresClientKitTests/TestEnvironment.json` describes the environment used by the PostgresClientKit test suite. Review its content and make any changes for your environment.
	`69`	+The file `Tests/PostgresClientKitTests/TestEnvironment.swift` describes the environment used by the PostgresClientKit test suite. Review its content and make any changes for your environment.