diff --git a/openvidu-testapp/.gitignore b/openvidu-testapp/.gitignore deleted file mode 100644 index b83d2226..00000000 --- a/openvidu-testapp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/openvidu-testapp/LICENSE b/openvidu-testapp/LICENSE deleted file mode 100644 index 7a4a3ea2..00000000 --- a/openvidu-testapp/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. \ No newline at end of file diff --git a/openvidu-testapp/NOTICE b/openvidu-testapp/NOTICE deleted file mode 100644 index b7393e6f..00000000 --- a/openvidu-testapp/NOTICE +++ /dev/null @@ -1,13 +0,0 @@ -(C) Copyright 2016 Kurento (http://kurento.org) - -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. diff --git a/openvidu-testapp/README.md b/openvidu-testapp/README.md deleted file mode 100644 index 9ea3117a..00000000 --- a/openvidu-testapp/README.md +++ /dev/null @@ -1,11 +0,0 @@ -[![License badge](https://img.shields.io/badge/license-Apache2-orange.svg)](http://www.apache.org/licenses/LICENSE-2.0) -[![Documentation badge](https://readthedocs.org/projects/fiware-orion/badge/?version=latest)](http://openvidu.io/docs/home/) -[![Docker badge](https://img.shields.io/docker/pulls/fiware/orion.svg)](https://hub.docker.com/r/openvidu/) -[![Support badge](https://img.shields.io/badge/support-sof-yellowgreen.svg)](https://groups.google.com/forum/#!forum/openvidu) - -[![][OpenViduLogo]](http://openvidu.io) - -openvidu-testapp -=== - -[OpenViduLogo]: https://secure.gravatar.com/avatar/5daba1d43042f2e4e85849733c8e5702?s=120 \ No newline at end of file diff --git a/openvidu-testapp/pom.xml b/openvidu-testapp/pom.xml deleted file mode 100644 index 1abdd9d4..00000000 --- a/openvidu-testapp/pom.xml +++ /dev/null @@ -1,253 +0,0 @@ - - 4.0.0 - - - io.openvidu - openvidu-parent - 1.0.0-beta.3 - ../ - - - openvidu-testapp - jar - - OpenVidu Sample App "Minimal" - - This project contains a minimal sample app using OpenVidu platorm. - - https://github.com/OpenVidu/openvidu - - - - Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - OpenVidu - https://github.com/OpenVidu/openvidu - - - - ${openvidu.scm.url} - scm:git:${openvidu.scm.connection} - scm:git:${openvidu.scm.connection} - develop - - - - - openvidu.io - -openvidu.io Community - OpenVidu - http://openvidu.io - - - - - - io.openvidu.testapp.OpenViduTestApp - - - - - - src/main/resources - false - - - src/main/resources - true - - banner.txt - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - ${start-class} - ZIP - - - - - repackage - - - - - - org.codehaus.mojo - exec-maven-plugin - - - java - - java - - - - - ${start-class} - - - - org.apache.maven.plugins - maven-assembly-plugin - - src/assembly/bin.xml - ${project.artifactId}-${project.version} - false - - - - package - - single - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - package - - - - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - exec-maven-plugin - - - [1.0.0,) - - - exec - - - - - - - - - - org.apache.maven.plugins - - - maven-dependency-plugin - - - [2.8,) - - - unpack - - - - - - - - - - - - - - - - - io.openvidu - openvidu-server - - - org.springframework.boot - spring-boot-starter-logging - - - - - io.openvidu - openvidu-browser - - - org.springframework.boot - spring-boot-starter-log4j2 - - - io.openvidu - openvidu-test - test - - - org.webjars.bower - system.js - 0.19.17 - - - - - - default - - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - org.apache.maven.plugins - maven-failsafe-plugin - - true - - - - - - - integration - - - diff --git a/openvidu-testapp/src/assembly/bin.xml b/openvidu-testapp/src/assembly/bin.xml deleted file mode 100644 index 6bb59757..00000000 --- a/openvidu-testapp/src/assembly/bin.xml +++ /dev/null @@ -1,27 +0,0 @@ - - bin - - zip - - - - - - target/${project.artifactId}-${project.version}.jar - lib - - kroombasic.jar - - - - - - package - - - - - \ No newline at end of file diff --git a/openvidu-testapp/src/main/java/io/openvidu/testapp/OpenViduTestApp.java b/openvidu-testapp/src/main/java/io/openvidu/testapp/OpenViduTestApp.java deleted file mode 100644 index 742306d2..00000000 --- a/openvidu-testapp/src/main/java/io/openvidu/testapp/OpenViduTestApp.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * (C) Copyright 2017 OpenVidu (http://openvidu.io/) - * - * 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. - */ -package io.openvidu.testapp; - -import org.kurento.commons.ConfigFileManager; -import io.openvidu.server.OpenViduServer; -import org.springframework.boot.SpringApplication; -import org.springframework.context.annotation.Import; - -/** - * Basic demo application for Kurento Room, uses the Room Server and the Room Client JS libraries. - * - * @author Micael Gallego (micael.gallego@gmail.com) - * @author Radu Tom Vlad (rvlad@naevatec.com) - * @since 5.0.0 - */ -@Import(OpenViduServer.class) -public class OpenViduTestApp { - - private final static String BASICAPP_CFG_FILENAME = "kroombasic.conf.json"; - - static { - ConfigFileManager.loadConfigFile(BASICAPP_CFG_FILENAME); - } - - public static void main(String[] args) { - SpringApplication.run(OpenViduTestApp.class, args); - } -} diff --git a/openvidu-testapp/src/main/resources/application.properties b/openvidu-testapp/src/main/resources/application.properties deleted file mode 100644 index 8ecb26df..00000000 --- a/openvidu-testapp/src/main/resources/application.properties +++ /dev/null @@ -1,10 +0,0 @@ -server.port: 8443 -server.ssl.key-store: classpath:keystore.jks -server.ssl.key-store-password: kurento -server.ssl.keyStoreType: JKS -server.ssl.keyAlias: kurento-selfsigned - -kms.uris=[\"ws://localhost:8888/kurento\"] - -openvidu.secret: MY_SECRET -openvidu.publicurl: local \ No newline at end of file diff --git a/openvidu-testapp/src/main/resources/banner.txt b/openvidu-testapp/src/main/resources/banner.txt deleted file mode 100644 index 03e81872..00000000 --- a/openvidu-testapp/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ - -================================================== - ____ _ ___ __ - / __ \____ ___ ____| | / (_)___/ /_ __ - / / / / __ \/ _ \/ __ \ | / / / __ / / / / - / /_/ / /_/ / __/ / / / |/ / / /_/ / /_/ / - \____/ .___/\___/_/ /_/|___/_/\__,_/\__,_/ - /_/ - v${project.version} -================================================== diff --git a/openvidu-testapp/src/main/resources/keystore.jks b/openvidu-testapp/src/main/resources/keystore.jks deleted file mode 100644 index c13f8038..00000000 Binary files a/openvidu-testapp/src/main/resources/keystore.jks and /dev/null differ diff --git a/openvidu-testapp/src/main/resources/kroombasic.conf.json b/openvidu-testapp/src/main/resources/kroombasic.conf.json deleted file mode 100644 index 675a1958..00000000 --- a/openvidu-testapp/src/main/resources/kroombasic.conf.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "kms": { - "uris": [ - "ws://127.0.0.1:8888/kurento" - ] - }, - "kurento": { - "client": { - //milliseconds - "requestTimeout": 20000 - } - } -} diff --git a/openvidu-testapp/src/main/resources/log4j.properties b/openvidu-testapp/src/main/resources/log4j.properties deleted file mode 100644 index ecbc4db1..00000000 --- a/openvidu-testapp/src/main/resources/log4j.properties +++ /dev/null @@ -1,21 +0,0 @@ -log4j.rootLogger=WARN,CONSOLE,file -log4j.logger.org.kurento=WARN -log4j.logger.org.kurento.commons=DEBUG -log4j.logger.org.kurento.room=INFO -log4j.logger.org.kurento.room.test=DEBUG -log4j.logger.io.github.bonigarcia=DEBUG - -# Appenders -log4j.threshold=ALL - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c [%t] (%F:%L) - %m%n - -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=target/kurento-room-test.log -log4j.appender.file.ImmediateFlush=true -log4j.appender.file.MaxFileSize=10MB -log4j.appender.file.MaxBackupIndex=50 -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c (%F:%L(%M)) - %m%n diff --git a/openvidu-testapp/src/main/resources/static/index.html b/openvidu-testapp/src/main/resources/static/index.html deleted file mode 100644 index ccc924f4..00000000 --- a/openvidu-testapp/src/main/resources/static/index.html +++ /dev/null @@ -1,50 +0,0 @@ - - -Room Example - - - - - - - - - - - - - -
-
- -
-

Join a Room

-
-

- - -

-

- - -

-

- -

-
-
- - -
-
-
- - - diff --git a/openvidu-testapp/src/main/resources/static/js/color.js b/openvidu-testapp/src/main/resources/static/js/color.js deleted file mode 100644 index 30f2bb53..00000000 --- a/openvidu-testapp/src/main/resources/static/js/color.js +++ /dev/null @@ -1,94 +0,0 @@ -/* - * (C) Copyright 2016 OpenVidu (http://kurento.org/) - * - * 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. - * - */ -var colorMap = {}; -var initTime; -var maxDistance = 60; // Default max distance for color comparison - -window.onload = function() { - initTime = new Date(); -} - -window.requestAnimationFrame = window.requestAnimationFrame - || window.mozRequestAnimationFrame - || window.webkitRequestAnimationFrame || window.msRequestAnimationFrame; - -function checkColor(video, canvas, userId) { - - canvas.width = 1; - canvas.height = 1; - var canvasContext = canvas.getContext("2d"); - - video.crossOrigin = 'anonymous'; - - function step() { - var x = 0; - var y = 0; - - try { - canvasContext.drawImage(video, x, y, 1, 1, 0, 0, 1, 1); - } catch (e) { - // NS_ERROR_NOT_AVAILABLE can happen in Firefox due a bug - if (e.name != "NS_ERROR_NOT_AVAILABLE") { - throw e; - } - } - - var color = Array.prototype.slice.apply( - canvasContext.getImageData(0, 0, 1, 1).data).toString(); - - if (colorMap[userId]) { - if (colorChanged(color, colorMap[userId].rgba)) { - var time = new Date() - initTime; - console.info("Detected color change on user " + userId - + " from " + colorMap[userId].rgba + " to " + color - + " at " + time); - - colorMap[userId].rgba = color; - colorMap[userId].time = time; - } - } else { - // First time - var firstEntry = { - rgba : "0,0,0,0", - time : null - }; - colorMap[userId] = firstEntry; - } - - requestAnimationFrame(step); - } - requestAnimationFrame(step); -} - -function colorChanged(expectedColorStr, realColorStr) { - var realColor = realColorStr.split(","); - var expectedColor = expectedColorStr.split(","); - - var realRed = realColor[0]; - var realGreen = realColor[1]; - var realBlue = realColor[2]; - - var expectedRed = expectedColor[0]; - var expectedGreen = expectedColor[1]; - var expectedBlue = expectedColor[2]; - - var distance = Math.sqrt((realRed - expectedRed) * (realRed - expectedRed) - + (realGreen - expectedGreen) * (realGreen - expectedGreen) - + (realBlue - expectedBlue) * (realBlue - expectedBlue)); - - return distance > maxDistance; -} diff --git a/openvidu-testapp/src/main/resources/static/js/console.js b/openvidu-testapp/src/main/resources/static/js/console.js deleted file mode 100644 index e9d45cdb..00000000 --- a/openvidu-testapp/src/main/resources/static/js/console.js +++ /dev/null @@ -1,93 +0,0 @@ -/* - * (C) Copyright 2013 OpenVidu (http://kurento.org/) - * - * 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. - * - */ - -/** - * Object that piggy-back the browser console and show their messages on a DIV - * - * Inspired by Node.js ClIM module (https://github.com/epeli/node-clim) - * - * @constructor - * - * @param {String} - * id: id attribute of the DIV tag where to show the messages - * @param console: - * reference to the original browser console - */ -function Console(id, console) { - var div = document.getElementById(id); - - function createMessage(msg, color) { - // Sanitize the input - msg = msg.toString().replace(/ data() { - return localChromes(MethodHandles.lookup().lookupClass().getSimpleName(), NUM_USERS, - WebPageType.ROOM); - } -} diff --git a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/AddRemoveUsersNoSinkVerifyBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/AddRemoveUsersNoSinkVerifyBasicTest.java deleted file mode 100644 index 7bcaaabd..00000000 --- a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/AddRemoveUsersNoSinkVerifyBasicTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * (C) Copyright 2017 OpenVidu (http://openvidu.io/) - * - * 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. - */ - -package io.openvidu.testapp.test; - -import java.lang.invoke.MethodHandles; -import java.util.Collection; - -import org.junit.runners.Parameterized.Parameters; -import org.kurento.test.browser.WebPageType; -import io.openvidu.test.browser.AddRemoveUsersNoSinkVerify; - -/** - * @see AddRemoveUsersNoSinkVerify - * @author Radu Tom Vlad (rvlad@naevatec.com) - */ -public class AddRemoveUsersNoSinkVerifyBasicTest extends AddRemoveUsersNoSinkVerify { - - @Override - public void setupBrowserTest() throws InterruptedException { - webPageType = WebPageType.ROOM; - super.setupBrowserTest(); - } - - @Parameters(name = "{index}: {0}") - public static Collection data() { - return localChromes(MethodHandles.lookup().lookupClass().getSimpleName(), NUM_USERS, - WebPageType.ROOM); - } -} diff --git a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/NUsersEqualLifetimeBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/NUsersEqualLifetimeBasicTest.java deleted file mode 100644 index 79be4ed6..00000000 --- a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/NUsersEqualLifetimeBasicTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * (C) Copyright 2017 OpenVidu (http://openvidu.io/) - * - * 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. - */ - -package io.openvidu.testapp.test; - -import java.lang.invoke.MethodHandles; -import java.util.Collection; - -import org.junit.runners.Parameterized.Parameters; -import org.kurento.test.browser.WebPageType; -import io.openvidu.test.browser.NUsersEqualLifetime; - -/** - * @see NUsersEqualLifetime - * @author Radu Tom Vlad (rvlad@naevatec.com) - */ -public class NUsersEqualLifetimeBasicTest extends NUsersEqualLifetime { - - @Override - public void setupBrowserTest() throws InterruptedException { - webPageType = WebPageType.ROOM; - super.setupBrowserTest(); - } - - @Parameters(name = "{index}: {0}") - public static Collection data() { - return localChromes(MethodHandles.lookup().lookupClass().getSimpleName(), NUM_USERS, - WebPageType.ROOM); - } - -} diff --git a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/OneUserQuickReentryBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/OneUserQuickReentryBasicTest.java deleted file mode 100644 index c42cdf73..00000000 --- a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/OneUserQuickReentryBasicTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * (C) Copyright 2017 OpenVidu (http://openvidu.io/) - * - * 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. - */ - -package io.openvidu.testapp.test; - -import java.lang.invoke.MethodHandles; -import java.util.Collection; - -import org.junit.runners.Parameterized.Parameters; -import org.kurento.test.browser.WebPageType; -import io.openvidu.test.browser.OneUserQuickReentry; - -/** - * @see OneUserQuickReentry - * @author Radu Tom Vlad (rvlad@naevatec.com) - */ -public class OneUserQuickReentryBasicTest extends OneUserQuickReentry { - - @Override - public void setupBrowserTest() throws InterruptedException { - webPageType = WebPageType.ROOM; - super.setupBrowserTest(); - } - - @Parameters(name = "{index}: {0}") - public static Collection data() { - return localChromes(MethodHandles.lookup().lookupClass().getSimpleName(), NUM_USERS, - WebPageType.ROOM); - } -} diff --git a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqAddRemoveUserBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqAddRemoveUserBasicTest.java deleted file mode 100644 index 6d4019a2..00000000 --- a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqAddRemoveUserBasicTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * (C) Copyright 2017 OpenVidu (http://openvidu.io/) - * - * 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. - */ - -package io.openvidu.testapp.test; - -import java.lang.invoke.MethodHandles; -import java.util.Collection; - -import org.junit.runners.Parameterized.Parameters; -import org.kurento.test.browser.WebPageType; -import io.openvidu.test.browser.SeqAddRemoveUser; - -/** - * @see SeqAddRemoveUser - * @author Radu Tom Vlad (rvlad@naevatec.com) - */ -public class SeqAddRemoveUserBasicTest extends SeqAddRemoveUser { - - @Override - public void setupBrowserTest() throws InterruptedException { - webPageType = WebPageType.ROOM; - super.setupBrowserTest(); - } - - @Parameters(name = "{index}: {0}") - public static Collection data() { - return localChromes(MethodHandles.lookup().lookupClass().getSimpleName(), NUM_USERS, - WebPageType.ROOM); - } - -} diff --git a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqNUsersEqualLifetimeBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqNUsersEqualLifetimeBasicTest.java deleted file mode 100644 index 12571f73..00000000 --- a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqNUsersEqualLifetimeBasicTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * (C) Copyright 2017 OpenVidu (http://openvidu.io/) - * - * 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. - */ - -package io.openvidu.testapp.test; - -import java.lang.invoke.MethodHandles; -import java.util.Collection; - -import org.junit.runners.Parameterized.Parameters; -import org.kurento.test.browser.WebPageType; -import io.openvidu.test.browser.SeqNUsersEqualLifetime; - -/** - * @see SeqNUsersEqualLifetime - * @author Radu Tom Vlad (rvlad@naevatec.com) - */ -public class SeqNUsersEqualLifetimeBasicTest extends SeqNUsersEqualLifetime { - - @Override - public void setupBrowserTest() throws InterruptedException { - webPageType = WebPageType.ROOM; - super.setupBrowserTest(); - } - - @Parameters(name = "{index}: {0}") - public static Collection data() { - return localChromes(MethodHandles.lookup().lookupClass().getSimpleName(), NUM_USERS, - WebPageType.ROOM); - } - -} diff --git a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/TwoUsersEqualLifetimeBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/TwoUsersEqualLifetimeBasicTest.java deleted file mode 100644 index 0ae1094a..00000000 --- a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/TwoUsersEqualLifetimeBasicTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * (C) Copyright 2017 OpenVidu (http://openvidu.io/) - * - * 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. - */ - -package io.openvidu.testapp.test; - -import java.lang.invoke.MethodHandles; -import java.util.Collection; - -import org.junit.runners.Parameterized.Parameters; -import org.kurento.test.browser.WebPageType; -import io.openvidu.test.browser.TwoUsersEqualLifetime; - -/** - * @see TwoUsersEqualLifetime - * @author Radu Tom Vlad (rvlad@naevatec.com) - */ -public class TwoUsersEqualLifetimeBasicTest extends TwoUsersEqualLifetime { - - @Override - public void setupBrowserTest() throws InterruptedException { - webPageType = WebPageType.ROOM; - super.setupBrowserTest(); - } - - @Parameters(name = "{index}: {0}") - public static Collection data() { - return localChromes(MethodHandles.lookup().lookupClass().getSimpleName(), NUM_USERS, - WebPageType.ROOM); - } - -} diff --git a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/WebAppAvailabilityBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/WebAppAvailabilityBasicTest.java deleted file mode 100644 index 2e58c3f7..00000000 --- a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/WebAppAvailabilityBasicTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * (C) Copyright 2017 OpenVidu (http://openvidu.io/) - * - * 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. - */ - -package io.openvidu.testapp.test; - -import java.lang.invoke.MethodHandles; -import java.util.Collection; - -import org.junit.runners.Parameterized.Parameters; -import org.kurento.test.browser.WebPageType; -import io.openvidu.test.browser.WebAppAvailability; - -/** - * @author Radu Tom Vlad (rvlad@naevatec.com) - * @see WebAppAvailability - */ -public class WebAppAvailabilityBasicTest extends WebAppAvailability { - - @Override - public void setupBrowserTest() throws InterruptedException { - webPageType = WebPageType.ROOM; - super.setupBrowserTest(); - } - - @Parameters(name = "{index}: {0}") - public static Collection data() { - return localChromes(MethodHandles.lookup().lookupClass().getSimpleName(), NUM_USERS, - WebPageType.ROOM); - } -} diff --git a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ExtraKmsFakeUsersBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ExtraKmsFakeUsersBasicTest.java deleted file mode 100644 index 0c6beb35..00000000 --- a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ExtraKmsFakeUsersBasicTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * (C) Copyright 2017 OpenVidu (http://openvidu.io/) - * - * 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. - */ -package io.openvidu.testapp.test.fake; - -import java.lang.invoke.MethodHandles; -import java.util.Collection; - -import org.junit.runners.Parameterized.Parameters; -import org.kurento.test.browser.WebPageType; -import io.openvidu.test.fake.ExtraKmsFakeUsers; - -/** - * @see ExtraKmsFakeUsers - * @author Radu Tom Vlad (rvlad@naevatec.com) - */ -public class ExtraKmsFakeUsersBasicTest extends ExtraKmsFakeUsers { - - @Override - public void setupBrowserTest() throws InterruptedException { - webPageType = WebPageType.ROOM; - ROOM_ACTIVITY_IN_SECONDS = 20; // shorter idle period - super.setupBrowserTest(); - } - - @Parameters(name = "{index}: {0}") - public static Collection data() { - return localChromes(MethodHandles.lookup().lookupClass().getSimpleName(), NUM_USERS, - WebPageType.ROOM); - } - -} diff --git a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ParallelNFakeUsersBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ParallelNFakeUsersBasicTest.java deleted file mode 100644 index 78c99c8b..00000000 --- a/openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ParallelNFakeUsersBasicTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * (C) Copyright 2017 OpenVidu (http://openvidu.io/) - * - * 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. - */ -package io.openvidu.testapp.test.fake; - -import java.lang.invoke.MethodHandles; -import java.util.Collection; - -import org.junit.runners.Parameterized.Parameters; -import org.kurento.test.browser.WebPageType; -import io.openvidu.test.fake.ParallelNFakeUsers; - -/** - * @see ParallelNFakeUsers - * @author Radu Tom Vlad (rvlad@naevatec.com) - */ -public class ParallelNFakeUsersBasicTest extends ParallelNFakeUsers { - - @Override - public void setupBrowserTest() throws InterruptedException { - webPageType = WebPageType.ROOM; - ROOM_ACTIVITY_IN_SECONDS = 20; // shorter idle period - super.setupBrowserTest(); - } - - @Parameters(name = "{index}: {0}") - public static Collection data() { - return localChromes(MethodHandles.lookup().lookupClass().getSimpleName(), NUM_USERS, - WebPageType.ROOM); - } -} diff --git a/openvidu-testapp/src/test/resources/log4j.properties b/openvidu-testapp/src/test/resources/log4j.properties deleted file mode 100644 index fa21a45b..00000000 --- a/openvidu-testapp/src/test/resources/log4j.properties +++ /dev/null @@ -1,22 +0,0 @@ -log4j.rootLogger=WARN,CONSOLE,file -log4j.logger.org.kurento=INFO -log4j.logger.org.kurento.client.internal=WARN -log4j.logger.org.kurento.room=DEBUG -log4j.logger.io.github.bonigarcia=DEBUG -log4j.logger.org.kurento.commons=DEBUG -log4j.logger.org.kurento.test=DEBUG - -# Appenders -log4j.threshold=ALL - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %c [%t] (%F:%L) - %m%n - -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=target/kurento-room-basicapp-test.log -log4j.appender.file.ImmediateFlush=true -log4j.appender.file.MaxFileSize=10MB -log4j.appender.file.MaxBackupIndex=50 -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%t] %c (%F:%L(%M)) - %m%n diff --git a/openvidu-testapp/src/test/resources/test.conf.json b/openvidu-testapp/src/test/resources/test.conf.json deleted file mode 100644 index a02fcc75..00000000 --- a/openvidu-testapp/src/test/resources/test.conf.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "kurento": { - "client": { - //milliseconds - "requestTimeout": 20000 - }, - "test": { - "fake": { - //"kmsUri": "ws://127.0.0.1:8888/kurento", - "wr": { - //absolute path on the KMS's machine or http resource - //"files": "/tmp", - - //readable by the user that runs KMS (default is nobody:nogroup) - //"filenames": [] - } - }, - "chrome": { - //if not absolute path, is considered relative to user's home - //"files": "/tmp", - - //accessible to the user that runs the test - "filenames": { - "wav": [], - "y4m": ["video/15sec/rgbHD.y4m"] - } - } - } - } -} diff --git a/pom.xml b/pom.xml index 64f999fb..ecfa6eff 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,6 @@ openvidu-client openvidu-browser openvidu-test - openvidu-testapp openvidu-java-client @@ -208,11 +207,6 @@ openvidu-test ${version.openvidu} - - io.openvidu - openvidu-testapp - ${version.openvidu} - io.openvidu openvidu-java-client