Source release v3.5.0

core/test/config_test_env.h

@@ -24,18 +24,25 @@
 // Useful configurations
 namespace wvcdm {
 typedef enum {
-  kGooglePlayServer,   // not tested recently
-  kContentProtectionProdLicense,
-  kContentProtectionUatLicense,
-  kContentProtectionStagingLicense,
-  kContentProtectionProdPlusProv30,
-  kContentProtectionUatPlusProv30,
-  kContentProtectionStagingPlusProv30,
+  kGooglePlayServer,
+  kContentProtectionUatServer,
+  kContentProtectionStagingServer,
+  kContentProtectionProductionServer,
 } ServerConfigurationId;
 
+// Identifies content used in tests. Specify Prod/Uat/Staging if content
+// has been registered across license services.
+enum ContentId {
+  kContentIdStreaming,
+  kContentIdOffline,
+  kContentIdStagingSrmOuputProtectionRequested,
+  kContentIdStagingSrmOuputProtectionRequired,
+};
+
 // Configures default test environment.
 class ConfigTestEnv {
  public:
+
   typedef struct {
     ServerConfigurationId id;
     std::string license_server_url;
@@ -68,6 +75,10 @@ class ConfigTestEnv {
   }
   const KeyId& wrong_key_id() const { return wrong_key_id_; }
 
+  static const CdmInitData GetInitData(ContentId content_id);
+  static const std::string& GetLicenseServerUrl(
+      ServerConfigurationId server_configuration_id);
+
   void set_key_id(KeyId& key_id) { key_id_.assign(key_id); }
   void set_key_system(CdmKeySystem& key_system) {
     key_system_.assign(key_system);
@@ -75,6 +86,9 @@ class ConfigTestEnv {
   void set_license_server(std::string& license_server) {
     license_server_.assign(license_server);
   }
+  void set_provisioning_server(std::string& provisioning_server) {
+    provisioning_server_.assign(provisioning_server);
+  }
 
  private:
   void Init(ServerConfigurationId server_id);