зеркало из https://github.com/Azure/YCSB.git
[cassandra2] switch to maven profile to skip tests under jdk7.
This commit is contained in:
Родитель
1aa8c33bd4
Коммит
b5c38b29a2
|
@ -31,6 +31,11 @@ LICENSE file.
|
|||
<name>Cassandra 2.1+ DB Binding</name>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
<!-- Skip tests by default. will be activated by jdk8 profile -->
|
||||
<skipTests>true</skipTests>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<!-- CQL driver -->
|
||||
<dependency>
|
||||
|
@ -58,4 +63,19 @@ LICENSE file.
|
|||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<profiles>
|
||||
<!-- Cassandra 2.2+ requires JDK8 to run, so none of our tests
|
||||
will work unless we're using jdk8.
|
||||
-->
|
||||
<profile>
|
||||
<id>jdk8-tests</id>
|
||||
<activation>
|
||||
<jdk>1.8</jdk>
|
||||
</activation>
|
||||
<properties>
|
||||
<skipTests>false</skipTests>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
@ -41,7 +41,6 @@ import com.yahoo.ycsb.workloads.CoreWorkload;
|
|||
import org.cassandraunit.CassandraCQLUnit;
|
||||
import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
|
||||
import org.junit.After;
|
||||
import org.junit.Assume;
|
||||
import org.junit.Before;
|
||||
import org.junit.ClassRule;
|
||||
import org.junit.Test;
|
||||
|
@ -68,10 +67,6 @@ public class CassandraCQLClientTest {
|
|||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
// check that this is Java 8+
|
||||
int javaVersion = Integer.parseInt(System.getProperty("java.version").split("\\.")[1]);
|
||||
Assume.assumeTrue(javaVersion >= 8);
|
||||
|
||||
session = cassandraUnit.getSession();
|
||||
|
||||
Properties p = new Properties();
|
||||
|
|
Загрузка…
Ссылка в новой задаче