dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small refactoring

Browse Source
This commit is contained in:
Seraphym-Tuhai 2023-04-19 12:58:39 +03:00
parent 71ce5e762a
commit 1347ef7dcd
14 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/AbstractRuleChainTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/AbstractRuleChainTest.java
View File

@ -1,4 +1,19 @@
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; /**
* Copyright © 2016-2023 The Thingsboard Authors
*
* 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 org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Epic; import io.qameta.allure.Epic;
import org.testng.annotations.AfterMethod; import org.testng.annotations.AfterMethod;

3
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainImportTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/CreateRuleChainImportTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; package org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Description; import io.qameta.allure.Description;
import io.qameta.allure.Feature; import io.qameta.allure.Feature;
@ -93,7 +93,6 @@ public class CreateRuleChainImportTest extends AbstractRuleChainTest {
ruleChainsPage.importBrowseFileBtn().click(); ruleChainsPage.importBrowseFileBtn().click();
WebElement doneBtn = openRuleChainPage.doneBtn(); WebElement doneBtn = openRuleChainPage.doneBtn();
doneBtn.click(); doneBtn.click();
openRuleChainPage.doneBtn().click();
sideBarMenuView.ruleChainsBtn().click(); sideBarMenuView.ruleChainsBtn().click();
assertThat(ruleChainsPage.entities(ruleChainName).size() > 1). assertThat(ruleChainsPage.entities(ruleChainName).size() > 1).

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/CreateRuleChainTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; package org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Description; import io.qameta.allure.Description;
import io.qameta.allure.Feature; import io.qameta.allure.Feature;

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/DeleteRuleChainTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; package org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Description; import io.qameta.allure.Description;
import io.qameta.allure.Epic; import io.qameta.allure.Epic;

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteSeveralRuleChainsTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/DeleteSeveralRuleChainsTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; package org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Description; import io.qameta.allure.Description;
import io.qameta.allure.Feature; import io.qameta.allure.Feature;

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/MakeRuleChainRootTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/MakeRuleChainRootTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; package org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Description; import io.qameta.allure.Description;
import io.qameta.allure.Feature; import io.qameta.allure.Feature;

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/OpenRuleChainTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/OpenRuleChainTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; package org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Description; import io.qameta.allure.Description;
import io.qameta.allure.Feature; import io.qameta.allure.Feature;

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/RuleChainEditMenuTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; package org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Description; import io.qameta.allure.Description;
import io.qameta.allure.Feature; import io.qameta.allure.Feature;

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SearchRuleChainTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/SearchRuleChainTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; package org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Description; import io.qameta.allure.Description;
import io.qameta.allure.Feature; import io.qameta.allure.Feature;

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/SortByNameTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; package org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Description; import io.qameta.allure.Description;
import io.qameta.allure.Epic; import io.qameta.allure.Epic;

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByTimeTest.java → msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/SortByTimeTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke; package org.thingsboard.server.msa.ui.tests.rulechainssmoke;
import io.qameta.allure.Description; import io.qameta.allure.Description;
import io.qameta.allure.Feature; import io.qameta.allure.Feature;

2
msa/black-box-tests/src/test/resources/all.xml
View File

@ -34,7 +34,7 @@
</run> </run>
</groups> </groups>
<packages> <packages>
<package name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke"/> <package name="org.thingsboard.server.msa.ui.tests.rulechainssmoke"/>
</packages> </packages>
</test> </test>
<test name="Smoke customers tests"> <test name="Smoke customers tests">

2
msa/black-box-tests/src/test/resources/smokesRuleChain.xml
View File

@ -29,7 +29,7 @@
</run> </run>
</groups> </groups>
<packages> <packages>
<package name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke"/> <package name="org.thingsboard.server.msa.ui.tests.rulechainssmoke"/>
</packages> </packages>
</test> </test>
</suite> </suite>

2
msa/black-box-tests/src/test/resources/uiTests.xml
View File

@ -29,7 +29,7 @@
</run> </run>
</groups> </groups>
<packages> <packages>
<package name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke"/> <package name="org.thingsboard.server.msa.ui.tests.rulechainssmoke"/>
</packages> </packages>
</test> </test>
<test name="Smoke customers tests"> <test name="Smoke customers tests">