disable rule chain test, add package in test suits
This commit is contained in:
		
							parent
							
								
									cfdab32466
								
							
						
					
					
						commit
						6aa48a91ff
					
				@ -1,30 +0,0 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
#
 | 
			
		||||
# Copyright © 2016-2022 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.
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
set -e # Any subsequent commands which fail will cause the shell script to exit immediately
 | 
			
		||||
CHROME_PATH=/tmp/google-chrome
 | 
			
		||||
 | 
			
		||||
echo "Installing google-chrome to the $CHROME_PATH"
 | 
			
		||||
 | 
			
		||||
rm -rf $CHROME_PATH
 | 
			
		||||
mkdir -p $CHROME_PATH
 | 
			
		||||
wget --no-verbose -P $CHROME_PATH https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
 | 
			
		||||
dpkg-deb -xv $CHROME_PATH/google-chrome-stable_current_amd64.deb /tmp/google-chrome/
 | 
			
		||||
rm $CHROME_PATH/google-chrome-stable_current_amd64.deb
 | 
			
		||||
 | 
			
		||||
echo "Use google-binary as ChromeOptions options = new ChromeOptions(); options.setBinary(\"${CHROME_PATH}/opt/google/chrome/chrome\");"
 | 
			
		||||
@ -34,7 +34,7 @@
 | 
			
		||||
    <properties>
 | 
			
		||||
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 | 
			
		||||
        <main.dir>${basedir}/../..</main.dir>
 | 
			
		||||
        <suite>blackBox</suite>
 | 
			
		||||
        <suite>connectivity</suite>
 | 
			
		||||
    </properties>
 | 
			
		||||
 | 
			
		||||
    <dependencies>
 | 
			
		||||
@ -194,7 +194,7 @@
 | 
			
		||||
                <artifactId>maven-surefire-plugin</artifactId>
 | 
			
		||||
                <configuration>
 | 
			
		||||
                    <suiteXmlFiles>
 | 
			
		||||
                        <suiteXmlFile>src/test/resources/all.xml</suiteXmlFile>
 | 
			
		||||
                        <suiteXmlFile>src/test/resources/${suite}.xml</suiteXmlFile>
 | 
			
		||||
                    </suiteXmlFiles>
 | 
			
		||||
                    <skipTests>${blackBoxTests.skip}</skipTests>
 | 
			
		||||
                </configuration>
 | 
			
		||||
 | 
			
		||||
@ -71,7 +71,7 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest {
 | 
			
		||||
        Assert.assertTrue(ruleChainsPage.entity(ruleChainName).isDisplayed());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test(priority = 10, groups = "smoke")
 | 
			
		||||
    @Test(priority = 10, groups = "smoke", enabled = false)
 | 
			
		||||
    @Description
 | 
			
		||||
    public void createRuleChainWithDescription() {
 | 
			
		||||
        ruleChainName = ENTITY_NAME;
 | 
			
		||||
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
<?xml version="1.0" encoding="ISO-8859-1"?>
 | 
			
		||||
<!--
 | 
			
		||||
 | 
			
		||||
    Copyright © 2016-2022 The Thingsboard Authors
 | 
			
		||||
    Copyright © 2016-2022 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.
 | 
			
		||||
@ -19,8 +19,17 @@
 | 
			
		||||
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 | 
			
		||||
 | 
			
		||||
<suite name="All tests">
 | 
			
		||||
    <suite-files>
 | 
			
		||||
        <suite-file path="blackBox.xml"/>
 | 
			
		||||
        <suite-file path="uiTests.xml"/>
 | 
			
		||||
    </suite-files>
 | 
			
		||||
    <listeners>
 | 
			
		||||
        <listener class-name="org.thingsboard.server.msa.ui.listeners.RetryTestListener"/>
 | 
			
		||||
    </listeners>
 | 
			
		||||
    <test name="blackbox">
 | 
			
		||||
        <packages>
 | 
			
		||||
            <package name="org.thingsboard.server.msa.connectivity"/>
 | 
			
		||||
        </packages>
 | 
			
		||||
    </test>
 | 
			
		||||
    <test name="ui">
 | 
			
		||||
        <packages>
 | 
			
		||||
            <package name="org.thingsboard.server.msa.ui.tests"/>
 | 
			
		||||
        </packages>
 | 
			
		||||
    </test>
 | 
			
		||||
</suite>
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
<?xml version="1.0" encoding="ISO-8859-1"?>
 | 
			
		||||
<!--
 | 
			
		||||
 | 
			
		||||
    Copyright © 2016-2022 The Thingsboard Authors
 | 
			
		||||
    Copyright © 2016-2022 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.
 | 
			
		||||
@ -19,130 +19,12 @@
 | 
			
		||||
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 | 
			
		||||
 | 
			
		||||
<suite name="Customer Smoke Tests">
 | 
			
		||||
 | 
			
		||||
    <listeners>
 | 
			
		||||
        <listener class-name="org.thingsboard.server.msa.ui.listeners.RetryTestListener"/>
 | 
			
		||||
    </listeners>
 | 
			
		||||
 | 
			
		||||
    <test name="Create customer smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.CreateCustomerTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    <test name="ui">
 | 
			
		||||
        <packages>
 | 
			
		||||
            <package name="org.thingsboard.server.msa.ui.tests.customerSmoke"/>
 | 
			
		||||
        </packages>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Delete customer smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.DeleteCustomerTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Delete several customers smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.DeleteSeveralCustomerTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Edit menu customer smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.CustomerEditMenuTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Manage customer users smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.ManageCustomersUsersTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Manage customer assets smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.ManageCustomersAssetsTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Manage customer devices smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.ManageCustomersDevicesTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Manage customer dashboards smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.ManageCustomersDashboardsTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Manage customer edges smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.ManageCustomersEdgesTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Sort by name">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.SortByNameTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Search customer">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.customerSmoke.SearchCustomerTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
</suite>
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
<?xml version="1.0" encoding="ISO-8859-1"?>
 | 
			
		||||
<!--
 | 
			
		||||
 | 
			
		||||
    Copyright © 2016-2022 The Thingsboard Authors
 | 
			
		||||
    Copyright © 2016-2022 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.
 | 
			
		||||
@ -19,120 +19,12 @@
 | 
			
		||||
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 | 
			
		||||
 | 
			
		||||
<suite name="Rule Chain Smoke Tests">
 | 
			
		||||
 | 
			
		||||
    <listeners>
 | 
			
		||||
        <listener class-name="org.thingsboard.server.msa.ui.listeners.RetryTestListener"/>
 | 
			
		||||
    </listeners>
 | 
			
		||||
 | 
			
		||||
    <test name="Create rule chains">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke.CreateRuleChainTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    <test name="ui">
 | 
			
		||||
        <packages>
 | 
			
		||||
            <package name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke"/>
 | 
			
		||||
        </packages>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Create rule chains import">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke.CreateRuleChainImportTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Delete rule chains">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke.DeleteRuleChainTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Delete several rule chain smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke.DeleteSeveralRuleChainsTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Make root">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke.MakeRuleChainRootTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Open rule chain smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke.OpenRuleChainTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Edit menu rule chain smoke">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke.RuleChainEditMenuTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Search rule chain">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke.SearchRuleChainTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Sort rule chain by name">
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke.SortByNameTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
    <test name="Sort rule chain by time">
 | 
			
		||||
        <parameter name="browser" value="chrome"/>
 | 
			
		||||
        <groups>
 | 
			
		||||
            <run>
 | 
			
		||||
                <exclude name="broken"/>
 | 
			
		||||
            </run>
 | 
			
		||||
        </groups>
 | 
			
		||||
        <classes>
 | 
			
		||||
            <class name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke.SortByTimeTest"/>
 | 
			
		||||
        </classes>
 | 
			
		||||
    </test>
 | 
			
		||||
 | 
			
		||||
</suite>
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
<?xml version="1.0" encoding="ISO-8859-1"?>
 | 
			
		||||
<!--
 | 
			
		||||
 | 
			
		||||
    Copyright © 2016-2022 The Thingsboard Authors
 | 
			
		||||
    Copyright © 2016-2022 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.
 | 
			
		||||
@ -19,8 +19,17 @@
 | 
			
		||||
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 | 
			
		||||
 | 
			
		||||
<suite name="UI smoke tests">
 | 
			
		||||
    <suite-files>
 | 
			
		||||
        <suite-file path="smokesRuleChain.xml"/>
 | 
			
		||||
        <suite-file path="smokesCustomer.xml"/>
 | 
			
		||||
    </suite-files>
 | 
			
		||||
    <listeners>
 | 
			
		||||
        <listener class-name="org.thingsboard.server.msa.ui.listeners.RetryTestListener"/>
 | 
			
		||||
    </listeners>
 | 
			
		||||
    <test name="Smoke rule chains tests">
 | 
			
		||||
        <packages>
 | 
			
		||||
            <package name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke"/>
 | 
			
		||||
        </packages>
 | 
			
		||||
    </test>
 | 
			
		||||
    <test name="Smoke customers tests">
 | 
			
		||||
        <packages>
 | 
			
		||||
            <package name="org.thingsboard.server.msa.ui.tests.customerSmoke"/>
 | 
			
		||||
        </packages>
 | 
			
		||||
    </test>
 | 
			
		||||
</suite>
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user