From 498b8e6bda94aac244bb5b7954e6703bb940cb58 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 11 Feb 2019 10:49:22 +0100 Subject: [PATCH] openvidu-test-e2e: Jenkinsfile typo fix --- openvidu-test-e2e/jenkins/Jenkinsfile | 2 +- .../openvidu/test/e2e/OpenViduTestAppE2eTest.java | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile index 87d6f4b6..70fd87a9 100644 --- a/openvidu-test-e2e/jenkins/Jenkinsfile +++ b/openvidu-test-e2e/jenkins/Jenkinsfile @@ -24,7 +24,7 @@ node('container') { sh 'cd openvidu/openvidu-node-client && npm install --unsafe-perm && npm run build && npm link' } stage('OpenVidu TestApp build') { - sh 'cd openvidu/openvidu-testapp && npm install --unsafe-perm && npm link openvidu-browser && npm link openvidu-node-client && ./node_modules/\@angular/cli/bin/ng build --prod' + sh 'cd openvidu/openvidu-testapp && npm install --unsafe-perm && npm link openvidu-browser && npm link openvidu-node-client && ./node_modules/@angular/cli/bin/ng build --prod' } stage ('Environment Launch') { sh 'openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -subj "/CN=www.mydom.com/O=My Company LTD./C=US" -keyout openvidu/openvidu-testapp/dist/key.pem -out openvidu/openvidu-testapp/dist/cert.pem' diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java index 5542b783..daf584fc 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java @@ -1986,7 +1986,8 @@ public class OpenViduTestAppE2eTest { .assertMediaTracks(user.getDriver().findElements(By.tagName("video")), true, true)); Assert.assertTrue("Session.fetch() should return true after users connected", OV.fetch()); - Assert.assertFalse("Session.fetch() should return false after OpenVidu.fetch() has been called", session.fetch()); + Assert.assertFalse("Session.fetch() should return false after OpenVidu.fetch() has been called", + session.fetch()); // Verify that users have the role and data they were assigned through // TokenOptions @@ -2315,9 +2316,8 @@ public class OpenViduTestAppE2eTest { // Should be only 2 files: zip and metadata File folder = new File(recPath); - Assert.assertEquals( - "There are more than 2 files (ZIP and metadata) inside individual recording folder " + recPath, 2, - folder.listFiles().length); + Assert.assertEquals("There are more than 2 files (ZIP and metadata) inside individual recording folder " + + recPath + ": " + Arrays.toString(folder.listFiles()), 2, folder.listFiles().length); File file1 = new File(recPath + recording.getName() + ".zip"); File file2 = new File(recPath + ".recording." + recording.getId()); @@ -2329,8 +2329,9 @@ public class OpenViduTestAppE2eTest { List unzippedWebmFiles = new Unzipper().unzipFile(recPath, recording.getName() + ".zip"); - Assert.assertEquals("Expecting " + numberOfVideoFiles + " inside ZIP file but " + unzippedWebmFiles.size() - + " found: " + unzippedWebmFiles.toString(), numberOfVideoFiles, unzippedWebmFiles.size()); + Assert.assertEquals("Expecting " + numberOfVideoFiles + " videos inside ZIP file but " + + unzippedWebmFiles.size() + " found: " + unzippedWebmFiles.toString(), numberOfVideoFiles, + unzippedWebmFiles.size()); File jsonSyncFile = new File(recPath + recording.getName() + ".json"); Assert.assertTrue("JSON sync file " + jsonSyncFile.getAbsolutePath() + "does not exist or is empty",