Skip to content

Commit

Permalink
GG-18760 Configuration tests moved to separate module. (apache#301)
Browse files Browse the repository at this point in the history
  • Loading branch information
vsisko committed Jul 25, 2019
1 parent 0741836 commit f6e27eb
Show file tree
Hide file tree
Showing 11 changed files with 179 additions and 9 deletions.
1 change: 1 addition & 0 deletions assembly/dependencies-apache-ignite-lgpl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
<exclude>org.gridgain:ignite-web-console</exclude>
<exclude>org.gridgain:ignite-web-console-agent</exclude>
<exclude>org.gridgain:ignite-web-console-common</exclude>
<exclude>org.gridgain:ignite-web-console-configuration-tests</exclude>
<exclude>org.gridgain:ignite-web-console-mail</exclude>
<exclude>org.gridgain:ignite-web-console-server</exclude>
<exclude>org.gridgain:ignite-dev-utils</exclude>
Expand Down
1 change: 1 addition & 0 deletions assembly/dependencies-apache-ignite.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
<exclude>org.gridgain:ignite-web-console</exclude>
<exclude>org.gridgain:ignite-web-console-agent</exclude>
<exclude>org.gridgain:ignite-web-console-common</exclude>
<exclude>org.gridgain:ignite-web-console-configuration-tests</exclude>
<exclude>org.gridgain:ignite-web-console-mail</exclude>
<exclude>org.gridgain:ignite-web-console-server</exclude>
<exclude>org.gridgain:ignite-dev-utils</exclude>
Expand Down
28 changes: 21 additions & 7 deletions modules/web-console/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions modules/web-console/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
</properties>

<modules>
<module>web-console-configuration-tests</module>
<module>web-console-common</module>
<module>web-console-server</module>
<module>web-console-mail</module>
Expand Down
123 changes: 123 additions & 0 deletions modules/web-console/web-console-configuration-tests/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Copyright 2019 GridGain Systems, Inc. and Contributors.
Licensed under the GridGain Community Edition License (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license
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.
-->

<!--
POM file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.gridgain</groupId>
<artifactId>community.parent</artifactId>
<version>1</version>
<relativePath>../../../parent</relativePath>
</parent>

<artifactId>ignite-web-console-configuration-tests</artifactId>
<version>9.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>

<dependencies>
<!-- Third-party dependencies -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons.compress.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.gridgain</groupId>
<artifactId>ignite-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.gridgain</groupId>
<artifactId>ignite-aws</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.gridgain</groupId>
<artifactId>ignite-hibernate_5.1</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.gridgain</groupId>
<artifactId>ignite-urideploy</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>

<resource>
<directory>src/main/resources</directory>
</resource>
</resources>

<testResources>
<testResource>
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
<testResource>
<directory>src/main/resources</directory>
</testResource>
</testResources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ protected void prepareMetadata() {
igniteCfgProps.add("rebalanceBatchesPrefetchCount");
igniteCfgProps.add("rebalanceTimeout");
igniteCfgProps.add("rebalanceThrottle");
igniteCfgProps.add("metricExporterSpi");

Set<String> igniteCfgPropsDep = new HashSet<>();
igniteCfgPropsDep.add("gridName");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* Copyright 2019 GridGain Systems, Inc. and Contributors.
*
* Licensed under the GridGain Community Edition License (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license
*
* 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.apache.ignite.console.testsuites;

import org.apache.ignite.console.configuration.WebConsoleConfigurationSelfTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;

/**
* Ignite Web Console test suite.
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
WebConsoleConfigurationSelfTest.class
})
public class WebConsoleConfigurationTestsTestSuite {
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.apache.ignite.console.testsuites;

import org.apache.ignite.console.configuration.WebConsoleConfigurationSelfTest;
import org.apache.ignite.console.listener.NotificationEventListenerTest;
import org.apache.ignite.console.repositories.AccountsRepositoryTest;
import org.apache.ignite.console.db.TableSelfTest;
Expand All @@ -39,7 +38,6 @@
ActivitiesServiceTest.class,
AdminServiceTest.class,
NotificationEventListenerTest.class,
WebConsoleConfigurationSelfTest.class,
AccountsRepositoryTest.class,
NotificationServiceTest.class
})
Expand Down

0 comments on commit f6e27eb

Please sign in to comment.