This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new ae9acb8 [OPENMEETINGS-2177] couple of tests are fixed
ae9acb8 is described below
commit ae9acb82c64b6d14507a41089fb9ac9dea32939f
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Mar 3 08:31:40 2020 +0700
[OPENMEETINGS-2177] couple of tests are fixed
---
.../org/apache/openmeetings/backup/user/users.xml | 123 +++++++++++++++++++++
1 file changed, 123 insertions(+)
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
new file mode 100644
index 0000000..a64f265
--- /dev/null
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+
+-->
+<!-- ###############################################
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
+###############################################
+ --><root>
+ <users>
+ <user>
+ <user_id><![CDATA[1]]></user_id>
+ <age class="java.util.Date"><![CDATA[1502426202010]]></age>
+ <firstname><![CDATA[Zushid]]></firstname>
+ <lastname><![CDATA[Vrukyeri]]></lastname>
+ <login><![CDATA[vasya]]></login>
+
<pass><![CDATA[1000:CJcOXllfzJK/CC3xWdVT6PrgW0y0FtGNhwKQPVREn6d6pBDqxtI973Yj6d2VUkpP+i2Z2I9IVvDZjOi+DSaaslmaXUV5mM89eLEqy631vcsgHVWmzsAphtdpuTUkri07hE6KKGROLkmfFtD+K0v+gLyQFA0H2M11DKF9suLc5W4=:xdqnah+D81hn7IRReRdMzA0H37mfIyTM+itARUQWKCHAAzM2dgjaA8E4YKV6+NO+p1q9gWGRbNtHRMnXXGfWhY8D5pE3P7mvSxiy0UbYXcICzl1ZT8q1hg+vNDJBMIuAx9/FHd640847yYpPM2VymMOT1rXJW3T9NXR2qibSwPKmKajy6eIzf9dRPvnLDFGOEddpfUAydPIbRjwsVxH/XzZbYR9BJ6S+7/RlK1bIdEWVjb8QWEB1VAO/LMH0gB7nNsAtjhvAZ+uOWPIYyCPBX6wmi4keb4RyOE
[...]
+ <regdate class="java.util.Date"><![CDATA[1502426202011]]></regdate>
+ <title_id><![CDATA[1]]></title_id>
+ <pictureuri><![CDATA[profile.jpg]]></pictureuri>
+ <deleted><![CDATA[false]]></deleted>
+ <language_id><![CDATA[1]]></language_id>
+ <address>
+ <country><![CDATA[UZ]]></country>
+ <mail><![CDATA[miuw.su@local]]></mail>
+ </address>
+ <organisations
class="org.apache.openjpa.util.java$util$ArrayList$proxy">
+ <user_organisation>
+ <organisation_id><![CDATA[1]]></organisation_id>
+ <moderator><![CDATA[true]]></moderator>
+ </user_organisation>
+ <user_organisation>
+ <organisation_id><![CDATA[2]]></organisation_id>
+ <moderator><![CDATA[false]]></moderator>
+ </user_organisation>
+ </organisations>
+ <timeZoneId><![CDATA[Europe/Berlin]]></timeZoneId>
+ <forceTimeZoneCheck><![CDATA[false]]></forceTimeZoneCheck>
+ <sendSMS>false</sendSMS>
+ <showContactData><![CDATA[false]]></showContactData>
+
<showContactDataToContacts><![CDATA[false]]></showContactDataToContacts>
+ <type><![CDATA[user]]></type>
+ <rights class="org.apache.openjpa.util.java$util$HashSet$proxy">
+ <right><![CDATA[Login]]></right>
+ <right><![CDATA[Admin]]></right>
+ <right><![CDATA[Dashboard]]></right>
+ <right><![CDATA[Room]]></right>
+ <right><![CDATA[Soap]]></right>
+ </rights>
+ </user>
+ <user>
+ <user_id><![CDATA[2]]></user_id>
+ <firstname><![CDATA[Ea]]></firstname>
+ <lastname><![CDATA[Stonejumper ]]></lastname>
+ <login><![CDATA[1_rururca.pogolun@local]]></login>
+ <deleted><![CDATA[false]]></deleted>
+ <language_id><![CDATA[9]]></language_id>
+ <address>
+ <mail><![CDATA[rururca.pogolun@local]]></mail>
+ </address>
+ <organisations
class="org.apache.openjpa.util.java$util$ArrayList$proxy"/>
+ <timeZoneId><![CDATA[Europe/Berlin]]></timeZoneId>
+ <forceTimeZoneCheck><![CDATA[false]]></forceTimeZoneCheck>
+ <sendSMS>false</sendSMS>
+ <showContactData><![CDATA[false]]></showContactData>
+
<showContactDataToContacts><![CDATA[false]]></showContactDataToContacts>
+ <type><![CDATA[contact]]></type>
+ <ownerId><![CDATA[1]]></ownerId>
+ <rights class="org.apache.openjpa.util.java$util$HashSet$proxy"/>
+ </user>
+ <user>
+ <user_id><![CDATA[3]]></user_id>
+ <age class="java.util.Date"><![CDATA[1502426609713]]></age>
+ <firstname><![CDATA[James]]></firstname>
+ <lastname><![CDATA[Bond]]></lastname>
+ <login><![CDATA[bond]]></login>
+
<pass><![CDATA[1000:7VMKJ6J57B78JWmuVk1ouc5nMdizSeXM0yL8gKjZCRdtzt9RS58btnJpW0kjnqqXSU1EmS4UItIiunAlVjMPK854GuPBdOasu74Zh0xDbrGCgLrk1jT4fY59lxJUEhlVKILq1vxVgG4qBzLxZqMR9hjG7xO/dD1nz2upnsfWbbI=:WZT5zU5c+TiWDBVfR/dIQE3N/GmIY1e/2NUsxYPHwoa0FKHO0rPJr1XNdEh2laGVaBnAmLVTPqQNy6WcGY1LrWXr56VMyWLGKBX9cyBxnlv3glZMS6WFutRH4sik+JslMhsOoDDitcQNtbrepsRGp14hdI8dDT4djHjXAdrjLY0AB+yNSjEoRpM47CWLglYaupygcy34TW/n1qpuCigYNrN9PJx6c5kTuSiW+Dx/xWwbXrUYs0tivzkbmBPBwZcp3mbOZaPNHexrf+VmA5scJASo+76WtMWjD6
[...]
+ <regdate class="java.util.Date"><![CDATA[1502426683302]]></regdate>
+ <title_id><![CDATA[1]]></title_id>
+ <pictureuri><![CDATA[profile.jpg]]></pictureuri>
+ <deleted><![CDATA[false]]></deleted>
+ <language_id><![CDATA[1]]></language_id>
+ <address>
+ <country><![CDATA[GB]]></country>
+ <mail><![CDATA[James.bond@local]]></mail>
+ </address>
+ <organisations
class="org.apache.openjpa.util.java$util$ArrayList$proxy">
+ <user_organisation>
+ <organisation_id><![CDATA[2]]></organisation_id>
+ <moderator><![CDATA[true]]></moderator>
+ </user_organisation>
+ </organisations>
+ <timeZoneId><![CDATA[Etc/GMT0]]></timeZoneId>
+ <forceTimeZoneCheck><![CDATA[false]]></forceTimeZoneCheck>
+ <sendSMS>false</sendSMS>
+ <showContactData><![CDATA[false]]></showContactData>
+
<showContactDataToContacts><![CDATA[false]]></showContactDataToContacts>
+ <type><![CDATA[user]]></type>
+ <rights class="org.apache.openjpa.util.java$util$HashSet$proxy">
+ <right><![CDATA[Login]]></right>
+ <right><![CDATA[Dashboard]]></right>
+ <right><![CDATA[Room]]></right>
+ </rights>
+ </user>
+ </users>
+</root>