From 8d6cf269cc268656c18d9b3de746938746ebc835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kelvin=20Gla=C3=9F?= Date: Mon, 14 Oct 2019 15:21:11 +0200 Subject: [PATCH 1/3] [BUILD] Update to gradle 5.6.2 The new version fixes the duplicate classpath entries in the .classpath file --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 +++--- gradlew.bat | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59b5f89288..7c4388a921 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0ab5d..83f2acfdc3 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # 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 +# https://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, @@ -125,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/gradlew.bat b/gradlew.bat index 9991c50326..9618d8d960 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS, From 5c3ca7eaf22ac554b6e61d41c9b57f85927fd65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kelvin=20Gla=C3=9F?= Date: Thu, 17 Oct 2019 13:50:33 +0200 Subject: [PATCH 2/3] [BUILD] Move EclipseTestThread into stf project --- .../test => stf/src/saros/stf/client}/util/EclipseTestThread.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {eclipse/test/junit/saros/test => stf/src/saros/stf/client}/util/EclipseTestThread.java (100%) diff --git a/eclipse/test/junit/saros/test/util/EclipseTestThread.java b/stf/src/saros/stf/client/util/EclipseTestThread.java similarity index 100% rename from eclipse/test/junit/saros/test/util/EclipseTestThread.java rename to stf/src/saros/stf/client/util/EclipseTestThread.java From 79b766490c22e7ba6c0108292df51686ea0ce0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kelvin=20Gla=C3=9F?= Date: Thu, 17 Oct 2019 13:50:52 +0200 Subject: [PATCH 3/3] [BUILD] Move EclipseTestThread into client.util package --- .../test/saros/stf/test/consistency/AddMultipleFilesTest.java | 2 +- .../stf/test/consistency/EditDuringInvitationStressTest.java | 2 +- .../saros/stf/test/consistency/EditDuringInvitationTest.java | 2 +- .../stf/test/consistency/EditDuringNonHostAddsProjectTest.java | 2 +- .../stf/test/consistency/EditDuringNonHostInvitationTest.java | 2 +- .../saros/stf/test/consistency/RecoveryWhileTypingTest.java | 2 +- .../test/editing/ConcurrentEditingInsert100CharactersTest.java | 2 +- .../saros/stf/test/editing/ConcurrentEditingWith3UsersTest.java | 2 +- .../test/saros/stf/test/editing/EditDifferentFilesTest.java | 2 +- stf/src/saros/stf/client/StfTestCase.java | 2 +- stf/src/saros/stf/client/util/EclipseTestThread.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stf.test/test/saros/stf/test/consistency/AddMultipleFilesTest.java b/stf.test/test/saros/stf/test/consistency/AddMultipleFilesTest.java index a0430e8c58..be0d3baba9 100644 --- a/stf.test/test/saros/stf/test/consistency/AddMultipleFilesTest.java +++ b/stf.test/test/saros/stf/test/consistency/AddMultipleFilesTest.java @@ -7,8 +7,8 @@ import org.junit.BeforeClass; import org.junit.Test; import saros.stf.client.StfTestCase; +import saros.stf.client.util.EclipseTestThread; import saros.stf.client.util.Util; -import saros.test.util.EclipseTestThread; public class AddMultipleFilesTest extends StfTestCase { diff --git a/stf.test/test/saros/stf/test/consistency/EditDuringInvitationStressTest.java b/stf.test/test/saros/stf/test/consistency/EditDuringInvitationStressTest.java index e2eca6b715..67fb65901c 100644 --- a/stf.test/test/saros/stf/test/consistency/EditDuringInvitationStressTest.java +++ b/stf.test/test/saros/stf/test/consistency/EditDuringInvitationStressTest.java @@ -13,10 +13,10 @@ import org.junit.Test; import saros.stf.client.StfTestCase; import saros.stf.client.tester.SarosTester; +import saros.stf.client.util.EclipseTestThread; import saros.stf.client.util.Util; import saros.stf.shared.Constants.TypeOfCreateProject; import saros.stf.test.stf.Constants; -import saros.test.util.EclipseTestThread; public class EditDuringInvitationStressTest extends StfTestCase { diff --git a/stf.test/test/saros/stf/test/consistency/EditDuringInvitationTest.java b/stf.test/test/saros/stf/test/consistency/EditDuringInvitationTest.java index 0ba1497047..57891a5a9e 100644 --- a/stf.test/test/saros/stf/test/consistency/EditDuringInvitationTest.java +++ b/stf.test/test/saros/stf/test/consistency/EditDuringInvitationTest.java @@ -12,9 +12,9 @@ import org.junit.Test; import saros.stf.annotation.TestLink; import saros.stf.client.StfTestCase; +import saros.stf.client.util.EclipseTestThread; import saros.stf.client.util.Util; import saros.stf.test.stf.Constants; -import saros.test.util.EclipseTestThread; @TestLink(id = "Saros-36_edit_during_invitation") public class EditDuringInvitationTest extends StfTestCase { diff --git a/stf.test/test/saros/stf/test/consistency/EditDuringNonHostAddsProjectTest.java b/stf.test/test/saros/stf/test/consistency/EditDuringNonHostAddsProjectTest.java index 10a7eca4d8..cba7b96d39 100644 --- a/stf.test/test/saros/stf/test/consistency/EditDuringNonHostAddsProjectTest.java +++ b/stf.test/test/saros/stf/test/consistency/EditDuringNonHostAddsProjectTest.java @@ -8,8 +8,8 @@ import org.junit.BeforeClass; import org.junit.Test; import saros.stf.client.StfTestCase; +import saros.stf.client.util.EclipseTestThread; import saros.stf.client.util.Util; -import saros.test.util.EclipseTestThread; public class EditDuringNonHostAddsProjectTest extends StfTestCase { diff --git a/stf.test/test/saros/stf/test/consistency/EditDuringNonHostInvitationTest.java b/stf.test/test/saros/stf/test/consistency/EditDuringNonHostInvitationTest.java index 08daa0308e..9ea2b94b1d 100644 --- a/stf.test/test/saros/stf/test/consistency/EditDuringNonHostInvitationTest.java +++ b/stf.test/test/saros/stf/test/consistency/EditDuringNonHostInvitationTest.java @@ -12,9 +12,9 @@ import org.junit.Ignore; import org.junit.Test; import saros.stf.client.StfTestCase; +import saros.stf.client.util.EclipseTestThread; import saros.stf.client.util.Util; import saros.stf.test.stf.Constants; -import saros.test.util.EclipseTestThread; public class EditDuringNonHostInvitationTest extends StfTestCase { diff --git a/stf.test/test/saros/stf/test/consistency/RecoveryWhileTypingTest.java b/stf.test/test/saros/stf/test/consistency/RecoveryWhileTypingTest.java index 079455cc00..da6ffbbe3b 100644 --- a/stf.test/test/saros/stf/test/consistency/RecoveryWhileTypingTest.java +++ b/stf.test/test/saros/stf/test/consistency/RecoveryWhileTypingTest.java @@ -8,8 +8,8 @@ import org.junit.Test; import saros.stf.annotation.TestLink; import saros.stf.client.StfTestCase; +import saros.stf.client.util.EclipseTestThread; import saros.stf.client.util.Util; -import saros.test.util.EclipseTestThread; @TestLink(id = "Saros-7_consistency_watchdog_and_stop_manager") public class RecoveryWhileTypingTest extends StfTestCase { diff --git a/stf.test/test/saros/stf/test/editing/ConcurrentEditingInsert100CharactersTest.java b/stf.test/test/saros/stf/test/editing/ConcurrentEditingInsert100CharactersTest.java index cfd1eb35d7..1315d7db9e 100644 --- a/stf.test/test/saros/stf/test/editing/ConcurrentEditingInsert100CharactersTest.java +++ b/stf.test/test/saros/stf/test/editing/ConcurrentEditingInsert100CharactersTest.java @@ -9,9 +9,9 @@ import org.junit.Test; import saros.stf.client.StfTestCase; import saros.stf.client.tester.AbstractTester; +import saros.stf.client.util.EclipseTestThread; import saros.stf.client.util.Util; import saros.stf.shared.Constants.TypeOfCreateProject; -import saros.test.util.EclipseTestThread; public class ConcurrentEditingInsert100CharactersTest extends StfTestCase { diff --git a/stf.test/test/saros/stf/test/editing/ConcurrentEditingWith3UsersTest.java b/stf.test/test/saros/stf/test/editing/ConcurrentEditingWith3UsersTest.java index 26d4fdc25b..2acb01b160 100644 --- a/stf.test/test/saros/stf/test/editing/ConcurrentEditingWith3UsersTest.java +++ b/stf.test/test/saros/stf/test/editing/ConcurrentEditingWith3UsersTest.java @@ -10,8 +10,8 @@ import org.junit.BeforeClass; import org.junit.Test; import saros.stf.client.StfTestCase; +import saros.stf.client.util.EclipseTestThread; import saros.stf.client.util.Util; -import saros.test.util.EclipseTestThread; /** * This class tests the concurrent editing of three users during a session. diff --git a/stf.test/test/saros/stf/test/editing/EditDifferentFilesTest.java b/stf.test/test/saros/stf/test/editing/EditDifferentFilesTest.java index 7161dd1c43..0e8decb22b 100644 --- a/stf.test/test/saros/stf/test/editing/EditDifferentFilesTest.java +++ b/stf.test/test/saros/stf/test/editing/EditDifferentFilesTest.java @@ -7,9 +7,9 @@ import org.junit.BeforeClass; import org.junit.Test; import saros.stf.client.StfTestCase; +import saros.stf.client.util.EclipseTestThread; import saros.stf.client.util.Util; import saros.stf.shared.Constants.TypeOfCreateProject; -import saros.test.util.EclipseTestThread; public class EditDifferentFilesTest extends StfTestCase { diff --git a/stf/src/saros/stf/client/StfTestCase.java b/stf/src/saros/stf/client/StfTestCase.java index 9ee6d584cc..68f5f6cd6e 100644 --- a/stf/src/saros/stf/client/StfTestCase.java +++ b/stf/src/saros/stf/client/StfTestCase.java @@ -21,9 +21,9 @@ import org.junit.runners.model.FrameworkMethod; import saros.net.xmpp.JID; import saros.stf.client.tester.AbstractTester; +import saros.stf.client.util.EclipseTestThread; import saros.stf.client.util.Util; import saros.stf.server.rmi.remotebot.IRemoteWorkbenchBot; -import saros.test.util.EclipseTestThread; public abstract class StfTestCase { diff --git a/stf/src/saros/stf/client/util/EclipseTestThread.java b/stf/src/saros/stf/client/util/EclipseTestThread.java index 0c2af5299c..e8aa9767cc 100644 --- a/stf/src/saros/stf/client/util/EclipseTestThread.java +++ b/stf/src/saros/stf/client/util/EclipseTestThread.java @@ -1,4 +1,4 @@ -package saros.test.util; +package saros.stf.client.util; /** * A Thread which runs the give Runnable. After the thread finished, you might call verify to ensure