[BUILD] Move EclipseTestThread into client.util package

saros-project · Oct 17, 2019 · c664286 · c664286
1 parent 151c74f
commit c664286
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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