Source release v3.3.0

core/test/config_test_env.h

@@ -6,28 +6,50 @@
 #include <string>
 #include "wv_cdm_types.h"
 
+// Declare class ConfigTestEnv - holds the configuration settings needed
+// to talk to the various provisioning and license servers.
+//
+// License Servers
+//   QA  - early test server (corporate access only, not generally usable).
+//   UAT  - test server with non-production data.
+//   Staging  - test server with access to production data.
+//   Production  - live, production server.
+//   Google Play  - Allows testing on Google Play servers (very stale).
+//
+// Provisioning Servers
+//   UAT  - early access provisioning server.
+//   Staging  - early access to features.
+//   Production  - live production server.
+
+// Useful configurations
 namespace wvcdm {
 typedef enum {
-  kGooglePlayServer,
-  kContentProtectionUatServer,
-  kContentProtectionStagingServer,
-} LicenseServerId;
+  kGooglePlayServer,   // not tested recently
+  kContentProtectionProdLicense,
+  kContentProtectionUatLicense,
+  kContentProtectionStagingLicense,
+  kContentProtectionProdPlusProv30,
+  kContentProtectionUatPlusProv30,
+  kContentProtectionStagingPlusProv30,
+} ServerConfigurationId;
 
 // Configures default test environment.
 class ConfigTestEnv {
  public:
   typedef struct {
-    LicenseServerId id;
-    std::string url;
+    ServerConfigurationId id;
+    std::string license_server_url;
+    std::string license_service_certificate;
     std::string client_tag;
     std::string key_id;
     std::string offline_key_id;
-    std::string service_certificate;
+    std::string provisioning_server_url;
+    std::string provisioning_service_certificate;
   } LicenseServerConfiguration;
 
-  explicit ConfigTestEnv(LicenseServerId server_id);
-  ConfigTestEnv(LicenseServerId server_id, bool streaming);
-  ConfigTestEnv(LicenseServerId server_id, bool streaming, bool renew,
+  explicit ConfigTestEnv(ServerConfigurationId server_id);
+  ConfigTestEnv(ServerConfigurationId server_id, bool streaming);
+  ConfigTestEnv(ServerConfigurationId server_id, bool streaming, bool renew,
                 bool release);
   ~ConfigTestEnv() {};
 
@@ -35,11 +57,14 @@ class ConfigTestEnv {
   const KeyId& key_id() const { return key_id_; }
   const CdmKeySystem& key_system() const { return key_system_; }
   const std::string& license_server() const { return license_server_; }
-  const std::string& provisioning_server_url() const {
-    return provisioning_server_url_;
+  const std::string& provisioning_server() const {
+    return provisioning_server_;
   }
-  const std::string& service_certificate() const {
-    return service_certificate_;
+  const std::string& license_service_certificate() const {
+    return license_service_certificate_;
+  }
+  const std::string& provisioning_service_certificate() const {
+    return provisioning_service_certificate_;
   }
   const KeyId& wrong_key_id() const { return wrong_key_id_; }
 
@@ -52,14 +77,15 @@ class ConfigTestEnv {
   }
 
  private:
-  void Init(LicenseServerId server_id);
+  void Init(ServerConfigurationId server_id);
 
   std::string client_auth_;
   KeyId key_id_;
   CdmKeySystem key_system_;
   std::string license_server_;
-  std::string provisioning_server_url_;
-  std::string service_certificate_;
+  std::string provisioning_server_;
+  std::string license_service_certificate_;
+  std::string provisioning_service_certificate_;
   KeyId wrong_key_id_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(ConfigTestEnv);