提交 777f7aea 编写于 作者: M Mathias Peters

renamed some tests and added missing plugin configrations

上级 d44963c3
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>pact</artifactId>
<groupId>eu.stratosphere</groupId>
<version>0.1</version>
</parent>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-runtime</artifactId>
<version>0.1</version>
<name>pact-runtime</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>nephele-server</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-common</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
<reporting>
<plugins>
</plugins>
</reporting>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
<excludes>
<exclude>**/TestData.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>pact</artifactId>
<groupId>eu.stratosphere</groupId>
<version>0.1</version>
</parent>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-runtime</artifactId>
<version>0.1</version>
<name>pact-runtime</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>nephele-server</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>pact-common</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
<reporting>
<plugins>
</plugins>
</reporting>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
<excludes>
<exclude>**/TestData.java</exclude>
</excludes>
<forkMode>once</forkMode>
<argLine>-Xms512m -Xmx1024m</argLine>
<systemPropertyVariables>
<log.level>WARN</log.level>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.7</version>
<configuration>
<excludes>
<exclude>**/TestData.java</exclude>
</excludes>
<forkMode>once</forkMode>
<argLine>-Xms512m -Xmx1024m</argLine>
<systemPropertyVariables>
<log.level>WARN</log.level>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</project>
......@@ -51,8 +51,8 @@ import eu.stratosphere.pact.runtime.test.util.TestData.Generator.ValueMode;
/**
* @author Fabian Hueske
*/
public class TestCombiningUnilateralSortMerger {
private static final Log LOG = LogFactory.getLog(TestCombiningUnilateralSortMerger.class);
public class CombiningUnilateralSortMergerIT {
private static final Log LOG = LogFactory.getLog(CombiningUnilateralSortMergerIT.class);
private static final long SEED = 649180756312423613L;
......@@ -83,7 +83,9 @@ public class TestCombiningUnilateralSortMerger {
Logger pkgLogger = rootLogger.getLoggerRepository().getLogger(
CombiningUnilateralSortMerger.class.getPackage().getName());
pkqLevel = pkgLogger.getLevel();
pkgLogger.setLevel(Level.DEBUG);
String levelString = System.getProperty("log.level");
Level level = Level.toLevel(levelString);
pkgLogger.setLevel(level);
ioManager = new IOManager();
}
......
......@@ -50,7 +50,7 @@ import eu.stratosphere.pact.runtime.test.util.TestData.Generator.ValueMode;
/**
* @author Erik Nijkamp
*/
public class TestSortMergeMatchIterator {
public class SortMergeMatchIteratorIT {
// total memory
public static final int MEMORY_SIZE = 1024 * 1024 * 64;
......@@ -103,7 +103,10 @@ public class TestSortMergeMatchIterator {
Logger pkgLogger = rootLogger.getLoggerRepository()
.getLogger(UnilateralSortMerger.class.getPackage().getName());
pkqLevel = pkgLogger.getLevel();
pkgLogger.setLevel(Level.DEBUG);
String levelString = System.getProperty("log.level");
Level level = Level.toLevel(levelString);
pkgLogger.setLevel(level);
ioManager = new IOManager();
}
......
......@@ -77,7 +77,10 @@ public class TestBufferSortable {
Logger pkgLogger = rootLogger.getLoggerRepository().getLogger(BufferSortable.class.getPackage().getName());
pkqLevel = pkgLogger.getLevel();
pkgLogger.setLevel(Level.DEBUG);
String levelString = System.getProperty("log.level");
Level level = Level.toLevel(levelString);
pkgLogger.setLevel(level);
}
@AfterClass
......
......@@ -45,7 +45,10 @@ public class TestMergeIterator {
Logger pkgLogger = rootLogger.getLoggerRepository().getLogger(MergeIterator.class.getPackage().getName());
pkqLevel = pkgLogger.getLevel();
pkgLogger.setLevel(Level.DEBUG);
String levelString = System.getProperty("log.level");
Level level = Level.toLevel(levelString);
pkgLogger.setLevel(level);
}
@AfterClass
......
......@@ -46,8 +46,8 @@ import eu.stratosphere.pact.runtime.test.util.TestData.Generator.ValueMode;
/**
* @author Erik Nijkamp
*/
public class TestUnilateralSortMerger {
private static final Log LOG = LogFactory.getLog(TestUnilateralSortMerger.class);
public class UnilateralSortMergerIT {
private static final Log LOG = LogFactory.getLog(UnilateralSortMergerIT.class);
private static final long SEED = 649180756312423613L;
......@@ -78,7 +78,10 @@ public class TestUnilateralSortMerger {
Logger pkgLogger = rootLogger.getLoggerRepository()
.getLogger(UnilateralSortMerger.class.getPackage().getName());
pkqLevel = pkgLogger.getLevel();
pkgLogger.setLevel(Level.DEBUG);
String levelString = System.getProperty("log.level");
Level level = Level.toLevel(levelString);
pkgLogger.setLevel(level);
ioManager = new IOManager();
}
......
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>eu.stratosphere</groupId>
<artifactId>stratosphere</artifactId>
<version>0.1</version>
<name>stratosphere</name>
<packaging>pom</packaging>
<url>http://www.stratosphere.eu</url>
<inceptionYear>2009</inceptionYear>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
......@@ -20,7 +21,7 @@
<distribution>stratosphere</distribution>
</license>
</licenses>
<developers>
<developer>
<id>warneke</id>
......@@ -32,7 +33,7 @@
<role>Lead Developer</role>
</roles>
</developer>
<developer>
<id>sewen</id>
<name>Stephan Ewen</name>
......@@ -43,7 +44,7 @@
<role>Lead Developer</role>
</roles>
</developer>
<developer>
<id>fhueske</id>
<name>Fabian Hueske</name>
......@@ -60,7 +61,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<pluginRepositories>
<pluginRepository>
<id>mc-release</id>
......@@ -82,7 +83,7 @@
<url>http://repository.apache.org/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
......@@ -91,69 +92,69 @@
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<type>jar</type>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.4.7</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.4.7</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.4.7</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.4.7</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
<dependencyManagement>
<!--
this section defines the module versions that are used if nothing
else is specified.
-->
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>0.20.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
</dependencies>
</dependencyManagement>
<!--
this section defines the module versions that are used if nothing
else is specified.
-->
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>0.20.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
</dependencies>
</dependencyManagement>
<reporting>
<plugins>
<plugin>
<!--
just define the Java version to be used for compiling and plugins
......@@ -163,31 +164,34 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
<!-- High optimization, no debugging <compilerArgument>-g:none -O</compilerArgument> -->
<!--
High optimization, no debugging <compilerArgument>-g:none
-O</compilerArgument>
-->
<compilerArgument></compilerArgument>
</configuration>
</plugin>
<plugin>
<!-- measure and report source code complexity -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>javancss-maven-plugin</artifactId>
<version>2.0</version>
</plugin>
<plugin>
<!-- analyze dependencies in source code -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
</plugin>
<!--
disabled because currently no SCM defined generates changelog
<plugin> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
<version>2.2-SNAPSHOT</version> </plugin>
-->
<plugin>
<!-- report occurrences of various todo markers in code -->
<groupId>org.codehaus.mojo</groupId>
......@@ -202,19 +206,17 @@
</tags>
</configuration>
</plugin>
<!--
todo: reenable when SCM is available
<plugin>
todo: reenable when SCM is available <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>scmchangelog-maven-plugin</artifactId>
<version>1.2</version> <configuration>
<connectionUrl>scm:svn:https://projekte.itmc.tu-dortmund.de/svn/sla4dgrid/trunk</connectionUrl>
<tagBase>https://projekte.itmc.tu-dortmund.de/svn/sla4dgrid/tags/</tagBase>
<filter>.*</filter> </configuration>
</plugin>
<filter>.*</filter> </configuration> </plugin>
-->
<plugin>
<!--
generates cross references in code so that you can click in the
......@@ -226,7 +228,7 @@
<linkJavadoc>true</linkJavadoc>
</configuration>
</plugin>
<plugin>
<!-- discovers frequent bugs in programs -->
<groupId>org.codehaus.mojo</groupId>
......@@ -239,7 +241,7 @@
<xmlOutput>true</xmlOutput>
</configuration>
</plugin>
<plugin>
<!-- maven source code analysis for frequent bugs-->
<artifactId>maven-pmd-plugin</artifactId>
......@@ -256,16 +258,14 @@
</reportSet>
</reportSets>
</plugin>
<!--
<plugin>
generation of JavaDoc
<plugin> generation of JavaDoc
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
</plugin>
<artifactId>maven-javadoc-plugin</artifactId> <version>2.5</version>
</plugin>
-->
<plugin>
<!-- style checker -->
<groupId>org.apache.maven.plugins</groupId>
......@@ -275,14 +275,19 @@
<configLocation>nephele/checkstyle.xml</configLocation>
</configuration>
</plugin>
<plugin>
<!-- execution of Unit Tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.7</version>
</plugin>
<plugin>
<!-- execution of Unit Tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-report-plugin</artifactId>
<version>2.7</version>
</plugin>
<plugin>
<!-- check coverage of tests -->
<groupId>org.codehaus.mojo</groupId>
......@@ -294,7 +299,7 @@
</formats>
</configuration>
</plugin>
<!--
Generator for QA reports, summarizes various inputs and draws
diagrams indicating improvements/deterioration <plugin>
......@@ -305,12 +310,12 @@
<report>report-movers-all</report> </reports> </reportSet>
</reportSets> </plugin>
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dashboard-maven-plugin</artifactId>
</plugin>
</plugins>
</reporting>
......@@ -329,24 +334,24 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<executions>
<execution>
<id>javadoc:aggregate-jar</id>
<goals>
<goal>aggregate-jar</goal>
</goals>
<phase>compile</phase>
<configuration>
<quiet>true</quiet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<executions>
<execution>
<id>javadoc:aggregate-jar</id>
<goals>
<goal>aggregate-jar</goal>
</goals>
<phase>compile</phase>
<configuration>
<quiet>true</quiet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
......@@ -359,74 +364,124 @@
</classpathContainers>
</configuration>
</plugin>
<!--
<plugin>
check whether license information is included in files, can be used
to insert headers as well
<plugin> check whether license information is included in files, can
be used to insert headers as well
<groupId>com.google.code.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.4.0</version>
<configuration>
<header>src/main/etc/header.txt</header>
</configuration>
</plugin>
<version>1.4.0</version> <configuration>
<header>src/main/etc/header.txt</header> </configuration> </plugin>
-->
<!--
<plugin>
plugin that tests which fraction of the source code is covered by
JUnit tests
<plugin> plugin that tests which fraction of the source code is
covered by JUnit tests <groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId> <configuration>
<instrumentation> <ignores>
<ignore>com.example.boringcode.*</ignore> </ignores> <excludes>
<exclude>com/example/dullcode/**/*.class</exclude>
<exclude>com/example/**/*Test.class</exclude> </excludes>
</instrumentation> </configuration> <version>2.4</version>
<executions> <execution> <goals> <goal>clean</goal> </goals>
</execution> </executions> </plugin>
-->
<!--
<plugin> plugin that tests whether the code style is appropriate
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<instrumentation>
<ignores>
<ignore>com.example.boringcode.*</ignore>
</ignores>
<excludes>
<exclude>com/example/dullcode/**/*.class</exclude>
<exclude>com/example/**/*Test.class</exclude>
</excludes>
</instrumentation>
</configuration>
<version>2.4</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.3</version> <dependencies> <dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>build-tools</artifactId> <version>0.1</version>
</dependency> </dependencies> </plugin>
-->
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<goals>
<goal>clean</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration>
<systemPropertyVariables>
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
</systemPropertyVariables>
</configuration>
</plugin>
-->
<!--
<plugin>
plugin that tests whether the code style is appropriate
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.3</version>
<dependencies>
<dependency>
<groupId>eu.stratosphere</groupId>
<artifactId>build-tools</artifactId>
<version>0.1</version>
</dependency>
</dependencies>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
<systemPropertyVariables>
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
</systemPropertyVariables>
<excludes>
<exclude>**/*TestBase*.class</exclude>
</excludes>
</configuration>
</plugin>
-->
</plugins>
</build>
<profiles>
<!--
Hudson by default defines a property BUILD_NUMBER which is used to
enable the profile.
-->
<profile>
<id>hudson</id>
<activation>
<property>
<name>BUILD_NUMBER</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<compilerArgument>-g</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.4</version>
<configuration>
<formats>
<format>xml</format>
</formats>
</configuration>
<executions>
<execution>
<phase>cobertura</phase>
<goals>
<goal>cobertura</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<modules>
<module>nephele</module>
<module>pact</module>
<module>build-tools</module>
<module>stratosphere-dist</module>
<module>build-tools</module>
<module>stratosphere-dist</module>
</modules>
</project>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册