Browse Source

small refactoring

pull/8394/head
Seraphym-Tuhai 3 years ago
parent
commit
1347ef7dcd
  1. 17
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/AbstractRuleChainTest.java
  2. 3
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/CreateRuleChainImportTest.java
  3. 2
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/CreateRuleChainTest.java
  4. 2
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/DeleteRuleChainTest.java
  5. 2
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/DeleteSeveralRuleChainsTest.java
  6. 2
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/MakeRuleChainRootTest.java
  7. 2
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/OpenRuleChainTest.java
  8. 4
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/RuleChainEditMenuTest.java
  9. 2
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/SearchRuleChainTest.java
  10. 4
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/SortByNameTest.java
  11. 2
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/SortByTimeTest.java
  12. 2
      msa/black-box-tests/src/test/resources/all.xml
  13. 2
      msa/black-box-tests/src/test/resources/smokesRuleChain.xml
  14. 2
      msa/black-box-tests/src/test/resources/uiTests.xml

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

@ -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 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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.Feature;
@ -93,7 +93,6 @@ public class CreateRuleChainImportTest extends AbstractRuleChainTest {
ruleChainsPage.importBrowseFileBtn().click();
WebElement doneBtn = openRuleChainPage.doneBtn();
doneBtn.click();
openRuleChainPage.doneBtn().click();
sideBarMenuView.ruleChainsBtn().click();
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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.Feature;

4
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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.Feature;
@ -119,4 +119,4 @@ public class RuleChainEditMenuTest extends AbstractRuleChainTest {
.as("Debug mode is enable").isTrue();
}
}
}
}

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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.Feature;

4
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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.Epic;
@ -110,4 +110,4 @@ public class SortByNameTest extends AbstractRuleChainTest {
assertThat(secondRuleChain).as("Second from the end rule chain with number in name").isEqualTo(ruleChainNumber);
assertThat(thirdRuleChain).as("Third rule from the end chain with number in name").isEqualTo(ruleChain);
}
}
}

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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.Feature;

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

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

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

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

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

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

Loading…
Cancel
Save