[2/2] git commit: Added gitattributes
Updated Branches: refs/heads/master 18ac0e26e - 9d4f083d0 Added gitattributes Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9d4f083d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9d4f083d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9d4f083d Branch: refs/heads/master Commit: 9d4f083d0472640cccaf2ff381ada5a44720824f Parents: 7373de8 Author: Kristian Rosenvold krosenv...@apache.org Authored: Tue Jan 29 16:16:06 2013 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Tue Jan 29 16:16:06 2013 +0100 -- .gitattributes |8 1 files changed, 8 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9d4f083d/.gitattributes -- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000..3bb3b5e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +# Auto detect text files and perform LF normalization +*text=auto + +*.java text diff=java +*.html text diff=html +*.csstext +*.js text +*.sqltext
[1/2] git commit: Fixed line endings
Fixed line endings
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7373de82
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7373de82
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7373de82
Branch: refs/heads/master
Commit: 7373de82c552f17070801cfeb362acba48b828d9
Parents: 18ac0e2
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Tue Jan 29 16:15:20 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Tue Jan 29 16:15:20 2013 +0100
--
.../lazytestprovider/TestProvidingInputStream.java | 248 +++---
.../maven/plugin/surefire/SurefirePluginTest.java | 226 +++---
2 files changed, 237 insertions(+), 237 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7373de82/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
index df14d35..7304435 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
@@ -1,125 +1,125 @@
-package org.apache.maven.plugin.surefire.booterclient.lazytestprovider;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Queue;
-import java.util.concurrent.Semaphore;
-
-/**
- * An {@link InputStream} that, when read, provides test class names out of a
queue.
- * p/
- * The Stream provides only one test at a time, but only after {@link
#provideNewTest()} has been invoked.
- * p/
- * After providing each test class name, followed by a newline character, a
flush is performed on the
- * {@link FlushReceiver} provided by the {@link FlushReceiverProvider} that
can be set using
- * {@link #setFlushReceiverProvider(FlushReceiverProvider)}.
- *
- * @author Andreas Gudian
- */
-public class TestProvidingInputStream
-extends InputStream
-{
-private final QueueString testItemQueue;
-
-private byte[] currentBuffer;
-
-private int currentPos;
-
-private Semaphore semaphore = new Semaphore( 0 );
-
-private FlushReceiverProvider flushReceiverProvider;
-
-private boolean closed = false;
-
-/**
- * C'tor
- *
- * @param testItemQueue source of the tests to be read from this stream
- */
-public TestProvidingInputStream( QueueString testItemQueue )
-{
-this.testItemQueue = testItemQueue;
-}
-
-/**
- * @param flushReceiverProvider the provider for a flush receiver.
- */
-public void setFlushReceiverProvider( FlushReceiverProvider
flushReceiverProvider )
-{
-this.flushReceiverProvider = flushReceiverProvider;
-}
-
-@Override
-public synchronized int read()
-throws IOException
-{
-if ( null == currentBuffer )
-{
-if ( null != flushReceiverProvider null !=
flushReceiverProvider.getFlushReceiver() )
-{
-flushReceiverProvider.getFlushReceiver().flush();
-}
-
-semaphore.acquireUninterruptibly();
-
-if ( closed )
-{
-return -1;
-}
-
-String currentElement = testItemQueue.poll();
-if ( null != currentElement )
-{
-currentBuffer = currentElement.getBytes();
-currentPos = 0;
-}
-else
-{
-return -1;
-}
-}
-
-if ( currentPos
git commit: make test more robust by removing some assertions that depend on current system load
Updated Branches:
refs/heads/master 9d4f083d0 - ae1899c34
make test more robust by removing some assertions that depend on current system
load
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ae1899c3
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ae1899c3
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ae1899c3
Branch: refs/heads/master
Commit: ae1899c34d92c9568aae9aa8e32365a2130cf84e
Parents: 9d4f083
Author: Andreas Gudian andreas.gud...@gmail.com
Authored: Thu Jan 24 21:24:10 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Thu Feb 14 13:47:18 2013 +0100
--
.../org/apache/maven/surefire/its/ForkModeIT.java |6 --
1 files changed, 0 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ae1899c3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
index 35c53d7..5506caa 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
@@ -80,8 +80,6 @@ public class ForkModeIT
{
String[] pids = doTest( unpack( getProject()
).debugLogging().forkOncePerThread().threadCount( 2 ).addGoal(
-DsleepLength=1200 ) );
assertDifferentPids( pids, 2 );
-assertEndWith( pids, _1_1, 1);
-assertEndWith( pids, _2_2, 2);
assertFalse( pid 1 is not the same as the main process' pid,
pids[0].equals( getMyPID() ) );
}
@@ -113,8 +111,6 @@ public class ForkModeIT
{
String[] pids = doTest( unpack( getProject()
).debugLogging().forkCount( 2 ).reuseForks( false ).addGoal(
-DsleepLength=1200 ) );
assertDifferentPids( pids );
-assertEndWith( pids, _1_1, 1);
-assertEndWith( pids, _2_2, 2);
assertFalse( pid 1 is not the same as the main process' pid,
pids[0].equals( getMyPID() ) );
}
@@ -122,8 +118,6 @@ public class ForkModeIT
{
String[] pids = doTest( unpack( getProject()
).debugLogging().forkCount( 2 ).reuseForks( true ).addGoal(
-DsleepLength=1200 ) );
assertDifferentPids( pids, 2 );
-assertEndWith( pids, _1_1, 1);
-assertEndWith( pids, _2_2, 2);
assertFalse( pid 1 is not the same as the main process' pid,
pids[0].equals( getMyPID() ) );
}
svn commit: r1446282 - /maven/site/trunk/content/apt/developers/conventions/git.apt
Author: krosenvold Date: Thu Feb 14 17:51:55 2013 New Revision: 1446282 URL: http://svn.apache.org/r1446282 Log: Added info about the gitk context menu Modified: maven/site/trunk/content/apt/developers/conventions/git.apt Modified: maven/site/trunk/content/apt/developers/conventions/git.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/conventions/git.apt?rev=1446282r1=1446281r2=1446282view=diff == --- maven/site/trunk/content/apt/developers/conventions/git.apt (original) +++ maven/site/trunk/content/apt/developers/conventions/git.apt Thu Feb 14 17:51:55 2013 @@ -152,6 +152,8 @@ gitk --all to try to make some sense of it all. This is an important command to understand! (gitk may need to be installed additionally) +gitk also has a quite excellent context menu that is far more context sensitive than most people realize at first impression. Right-clicking on a commit in a github pull-request will allow you to cherry-pick straight in the gui. + If you're working on the master branch, you can do stuff like this:
git commit: Excluded test that is not 2.2.1 compatible from running with 2.2.1
Updated Branches:
refs/heads/master 0cd869cce - d7eb244b0
Excluded test that is not 2.2.1 compatible from running with 2.2.1
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d7eb244b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d7eb244b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d7eb244b
Branch: refs/heads/master
Commit: d7eb244b048249e20ef22db4fa92ac60e7fa5bfc
Parents: 0cd869c
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Thu Feb 14 21:39:22 2013 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Thu Feb 14 21:39:31 2013 +0100
--
.../maven/surefire/its/ForkModeMultiModuleIT.java | 20 ++
1 files changed, 14 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d7eb244b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
index 6d972ad..b00430e 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
@@ -19,26 +19,29 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.maven.surefire.its.fixture.HelperAssertions;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* Test forkMode in a multi module project with parallel maven builds
*
* @author Andreas Gudian
*/
+@Category( Not2xCompatible.class )
public class ForkModeMultiModuleIT
-extends SurefireIntegrationTestCase
+extends SurefireJUnit4IntegrationTestCase
{
+@Test
public void testForkCountOneNoReuse()
{
ListString pids = doTest( unpack( getProject() ).forkCount( 1
).reuseForks( false ) );
@@ -50,6 +53,8 @@ public class ForkModeMultiModuleIT
assertEquals( No other forkNumbers than 1 and 2 have been used, 6,
matchesOne + matchesTwo);
}
+
+@Test
public void testForkCountOneReuse()
{
ListString pids = doTest( unpack( getProject() ).forkCount( 1
).reuseForks( true ) );
@@ -58,6 +63,7 @@ public class ForkModeMultiModuleIT
assertEndWith( pids, _2_2, 3 );
}
+@Test
public void testForkCountTwoNoReuse()
{
ListString pids = doTest( unpack( getProject() ).forkCount( 2
).reuseForks( false ) );
@@ -73,6 +79,7 @@ public class ForkModeMultiModuleIT
assertEquals( No other forkNumbers than 1, 2, 3, or 4 have been
used, 6, matchesOne + matchesTwo + matchesThree + matchesFour );
}
+@Test
public void testForkCountTwoReuse()
{
ListString pids =
@@ -153,4 +160,5 @@ public class ForkModeMultiModuleIT
return fork-mode-multimodule;
}
+
}
[1/3] Ported all ITs to JUnit4
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
index fc49322..065ec19 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
@@ -19,14 +19,16 @@ package org.apache.maven.surefire.its.jiras;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* @author Kristian Rosenvold
*/
public class Surefire812Log4JClassLoaderIT
-extends SurefireIntegrationTestCase
+extends SurefireJUnit4IntegrationTestCase
{
+@Test
public void testJunit3ParallelBuildResultCount()
{
executeErrorFreeTest( surefire-812-log4j-classloader, 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
index 0fa1692..1bf4c8d 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its.jiras;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* SUREFIRE-818
@@ -27,8 +28,9 @@ import
org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author Kristian Rosenvold
*/
public class Surefire818NpeIgnoresTestsIT
-extends SurefireIntegrationTestCase
+extends SurefireJUnit4IntegrationTestCase
{
+@Test
public void testBuildFailingWhenErrors()
{
unpack( surefire-818-ignored-tests-on-npe
).maven().withFailure().executeTest().assertTestSuiteResults( 2, 0,
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
index 5fd6a13..b59bc6a 100644
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
@@ -19,13 +19,15 @@ package org.apache.maven.surefire.its.jiras;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
public class Surefire828EmptyGroupExprIT
-extends SurefireIntegrationTestCase
+extends SurefireJUnit4IntegrationTestCase
{
// !CategoryC
+@Test
public void testJUnitRunEmptyGroups()
{
OutputValidator validator = unpackJUnit().sysProp( profile,
emptyGroups ).executeTest();
@@ -39,6 +41,7 @@ public class Surefire828EmptyGroupExprIT
}
// CategoryA CategoryB
+@Test
public void testJUnitRunEmptyExcludeGroups()
{
OutputValidator validator = unpackJUnit().sysProp( profile,
emptyExcludedGroups ).executeTest();
@@ -54,6 +57,7 @@ public class Surefire828EmptyGroupExprIT
}
// CategoryA CategoryB
+@Test
public void testTestNGRunEmptyExcludeGroups()
{
OutputValidator validator = unpackTestNG().sysProp( profile,
emptyExcludedGroups ).executeTest();
@@ -64,6 +68,7 @@ public class Surefire828EmptyGroupExprIT
}
// !CategoryC
+@Test
public void testTestNGRunEmptyGroups()
{
svn commit: r1446404 - /maven/site/trunk/content/apt/community.apt
Author: olamy
Date: Fri Feb 15 00:00:17 2013
New Revision: 1446404
URL: http://svn.apache.org/r1446404
Log:
web irc is back
Modified:
maven/site/trunk/content/apt/community.apt
Modified: maven/site/trunk/content/apt/community.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/community.apt?rev=1446404r1=1446403r2=1446404view=diff
==
--- maven/site/trunk/content/apt/community.apt (original)
+++ maven/site/trunk/content/apt/community.apt Fri Feb 15 00:00:17 2013
@@ -81,4 +81,4 @@ The Maven Community
** IRC (Internet Relay Chat)
- Log into the #maven IRC channel on irc.codehaus.org.
+ Log into the #maven IRC channel on irc.codehaus.org or
{{{http://irc.codehaus.org}with web irc client }}
\ No newline at end of file
