From 08d66b8d645f7b3d98ef2f7853d49bf6566b2a75 Mon Sep 17 00:00:00 2001 From: Juan Navarro Date: Tue, 25 Feb 2020 14:42:11 +0100 Subject: [PATCH] kurento-test: change config "test.files.url" to "test.player.url" This config param is actually used to provide a generic URL that all PlayerEndpoint tests should use. So, the new name is more descriptive and makes much more sense. --- .../src/main/java/org/kurento/test/base/KurentoTest.java | 4 ++-- .../main/java/org/kurento/test/config/TestConfiguration.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kurento-integration-tests/kurento-test/src/main/java/org/kurento/test/base/KurentoTest.java b/kurento-integration-tests/kurento-test/src/main/java/org/kurento/test/base/KurentoTest.java index 4200ed079..7cb22533a 100644 --- a/kurento-integration-tests/kurento-test/src/main/java/org/kurento/test/base/KurentoTest.java +++ b/kurento-integration-tests/kurento-test/src/main/java/org/kurento/test/base/KurentoTest.java @@ -31,12 +31,12 @@ import static org.kurento.test.config.TestConfiguration.TEST_FILES_MONGO_PROP; import static org.kurento.test.config.TestConfiguration.TEST_FILES_S3_DEFAULT; import static org.kurento.test.config.TestConfiguration.TEST_FILES_S3_PROP; -import static org.kurento.test.config.TestConfiguration.TEST_FILES_URL_PROP; import static org.kurento.test.config.TestConfiguration.TEST_ICE_SERVER_CREDENTIAL_PROPERTY; import static org.kurento.test.config.TestConfiguration.TEST_ICE_SERVER_URL_PROPERTY; import static org.kurento.test.config.TestConfiguration.TEST_ICE_SERVER_USERNAME_PROPERTY; import static org.kurento.test.config.TestConfiguration.TEST_NUMRETRIES_PROPERTY; import static org.kurento.test.config.TestConfiguration.TEST_NUM_NUMRETRIES_DEFAULT; +import static org.kurento.test.config.TestConfiguration.TEST_PLAYER_URL_PROP; import static org.kurento.test.config.TestConfiguration.TEST_PRINT_LOG_DEFAULT; import static org.kurento.test.config.TestConfiguration.TEST_PRINT_LOG_PROP; import static org.kurento.test.config.TestConfiguration.TEST_PROJECT_PATH_DEFAULT; @@ -241,7 +241,7 @@ public static String getRecordUrl(String suffix) { } public static String getPlayerUrl(String mediaName) { - String playerUrl = getProperty(TEST_FILES_URL_PROP); + String playerUrl = getProperty(TEST_PLAYER_URL_PROP); if (playerUrl == null) { return HTTP + "://" + getTestFilesHttpPath() + mediaName; } diff --git a/kurento-integration-tests/kurento-test/src/main/java/org/kurento/test/config/TestConfiguration.java b/kurento-integration-tests/kurento-test/src/main/java/org/kurento/test/config/TestConfiguration.java index 56e0f42c1..116587711 100755 --- a/kurento-integration-tests/kurento-test/src/main/java/org/kurento/test/config/TestConfiguration.java +++ b/kurento-integration-tests/kurento-test/src/main/java/org/kurento/test/config/TestConfiguration.java @@ -224,10 +224,11 @@ public class TestConfiguration { public static final String TEST_PRINT_LOG_PROP = "test.print.log"; public static final boolean TEST_PRINT_LOG_DEFAULT = true; - public static final String TEST_FILES_URL_PROP = "test.files.url"; public static final String TEST_RECORD_URL_PROP = "test.record.url"; public static final String TEST_RECORD_DEFAULTPATH_PROP = "test.record.defaultpath"; + public static final String TEST_PLAYER_URL_PROP = "test.player.url"; + public static final String TEST_FILES_DISK_PROP = "test.files.disk"; public static final String TEST_FILES_DISK_DEFAULT = "/var/lib/jenkins/test-files";