From 777f7aea2b4504b67aaf64158ad4cce751b494da Mon Sep 17 00:00:00 2001 From: Mathias Peters Date: Fri, 21 Jan 2011 18:08:21 +0100 Subject: [PATCH] renamed some tests and added missing plugin configrations --- pact/pact-runtime/pom.xml | 129 +++--- ...a => CombiningUnilateralSortMergerIT.java} | 8 +- ...tor.java => SortMergeMatchIteratorIT.java} | 7 +- .../pact/runtime/sort/TestBufferSortable.java | 5 +- .../pact/runtime/sort/TestMergeIterator.java | 5 +- ...erger.java => UnilateralSortMergerIT.java} | 9 +- pom.xml | 367 ++++++++++-------- 7 files changed, 310 insertions(+), 220 deletions(-) rename pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/{TestCombiningUnilateralSortMerger.java => CombiningUnilateralSortMergerIT.java} (98%) rename pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/{TestSortMergeMatchIterator.java => SortMergeMatchIteratorIT.java} (98%) rename pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/{TestUnilateralSortMerger.java => UnilateralSortMergerIT.java} (97%) diff --git a/pact/pact-runtime/pom.xml b/pact/pact-runtime/pom.xml index a6d5f3e2504..69da372e412 100644 --- a/pact/pact-runtime/pom.xml +++ b/pact/pact-runtime/pom.xml @@ -1,57 +1,78 @@ - - 4.0.0 - - - pact - eu.stratosphere - 0.1 - - - eu.stratosphere - pact-runtime - 0.1 - pact-runtime - - jar - - - - - eu.stratosphere - nephele-server - ${version} - - - - eu.stratosphere - pact-common - ${version} - - - - - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7 - - - **/TestData.java - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + 4.0.0 + + + pact + eu.stratosphere + 0.1 + + + eu.stratosphere + pact-runtime + 0.1 + pact-runtime + + jar + + + + + eu.stratosphere + nephele-server + ${version} + + + + eu.stratosphere + pact-common + ${version} + + + + + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.7 + + + **/TestData.java + + once + -Xms512m -Xmx1024m + + WARN + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.7 + + + **/TestData.java + + once + -Xms512m -Xmx1024m + + WARN + + + + + + + diff --git a/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestCombiningUnilateralSortMerger.java b/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/CombiningUnilateralSortMergerIT.java similarity index 98% rename from pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestCombiningUnilateralSortMerger.java rename to pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/CombiningUnilateralSortMergerIT.java index 5c1eca89ac4..deb898063d0 100644 --- a/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestCombiningUnilateralSortMerger.java +++ b/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/CombiningUnilateralSortMergerIT.java @@ -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(); } diff --git a/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestSortMergeMatchIterator.java b/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/SortMergeMatchIteratorIT.java similarity index 98% rename from pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestSortMergeMatchIterator.java rename to pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/SortMergeMatchIteratorIT.java index 9847394c08d..c6ab3bc33ee 100644 --- a/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestSortMergeMatchIterator.java +++ b/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/SortMergeMatchIteratorIT.java @@ -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(); } diff --git a/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestBufferSortable.java b/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestBufferSortable.java index 4fe78e96f20..37fa39e4493 100644 --- a/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestBufferSortable.java +++ b/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestBufferSortable.java @@ -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 diff --git a/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestMergeIterator.java b/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestMergeIterator.java index d0b6254f788..43451db149c 100644 --- a/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestMergeIterator.java +++ b/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestMergeIterator.java @@ -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 diff --git a/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestUnilateralSortMerger.java b/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/UnilateralSortMergerIT.java similarity index 97% rename from pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestUnilateralSortMerger.java rename to pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/UnilateralSortMergerIT.java index 00746766366..dcdc50724e7 100644 --- a/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/TestUnilateralSortMerger.java +++ b/pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/sort/UnilateralSortMergerIT.java @@ -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(); } diff --git a/pom.xml b/pom.xml index f1fec56965e..bb93d60702b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,18 +1,19 @@ - + 4.0.0 - + eu.stratosphere stratosphere 0.1 - + stratosphere pom http://www.stratosphere.eu 2009 - + The Apache Software License, Version 2.0 @@ -20,7 +21,7 @@ stratosphere - + warneke @@ -32,7 +33,7 @@ Lead Developer - + sewen Stephan Ewen @@ -43,7 +44,7 @@ Lead Developer - + fhueske Fabian Hueske @@ -60,7 +61,7 @@ UTF-8 UTF-8 - + mc-release @@ -82,7 +83,7 @@ http://repository.apache.org/snapshots/ - + junit @@ -91,69 +92,69 @@ jar test - + + + commons-logging + commons-logging + 1.1.1 + jar + compile + + - commons-logging - commons-logging - 1.1.1 - jar + log4j + log4j + 1.2.16 + jar compile - - - - log4j - log4j - 1.2.16 - jar + + + org.mockito + mockito-all + 1.8.5 + jar compile - - - org.mockito - mockito-all - 1.8.5 - jar - compile - - - org.powermock - powermock-module-junit4 - 1.4.7 - jar - test - - - org.powermock - powermock-api-mockito - 1.4.7 - jar - test - - - org.hamcrest - hamcrest-all - 1.1 - - + + org.powermock + powermock-module-junit4 + 1.4.7 + jar + test + + + org.powermock + powermock-api-mockito + 1.4.7 + jar + test + + + org.hamcrest + hamcrest-all + 1.1 + + + - - - - org.apache.hadoop - hadoop-core - 0.20.2 - jar - compile - - - - + + + + org.apache.hadoop + hadoop-core + 0.20.2 + jar + compile + + + + - + + - + org.codehaus.mojo javancss-maven-plugin 2.0 - + org.codehaus.mojo jdepend-maven-plugin - + - + org.codehaus.mojo @@ -202,19 +206,17 @@ - + - + org.codehaus.mojo @@ -239,7 +241,7 @@ true - + maven-pmd-plugin @@ -256,16 +258,14 @@ - + - + org.apache.maven.plugins @@ -275,14 +275,19 @@ nephele/checkstyle.xml - + org.apache.maven.plugins maven-surefire-report-plugin 2.7 - + + + org.apache.maven.plugins + maven-failsafe-report-plugin + 2.7 + org.codehaus.mojo @@ -294,7 +299,7 @@ - + - + org.codehaus.mojo dashboard-maven-plugin - + @@ -329,24 +334,24 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - javadoc:aggregate-jar - - aggregate-jar - - compile - - true - - - - - + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + javadoc:aggregate-jar + + aggregate-jar + + compile + + true + + + + + org.apache.maven.plugins maven-eclipse-plugin @@ -359,74 +364,124 @@ - + + + + maven-failsafe-plugin + 2.6 - clean + integration-test + verify + + + true + + - --> - + + + + + hudson + + + BUILD_NUMBER + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.6 + 1.6 + -g + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.4 + + + xml + + + + + cobertura + + cobertura + + + + + + + + + + nephele pact - build-tools - stratosphere-dist + build-tools + stratosphere-dist -- GitLab