Skip to content

Commit 2fe4505

Browse files
authored
Small fixes for master (eclipse-che#6462)
Small fixes for master. * Removed dependency on server side in gwt code (debugger) * Fixed ThreadDumpTest * Formatted java class
1 parent 79ac0e7 commit 2fe4505

3 files changed

Lines changed: 11 additions & 36 deletions

File tree

  • plugins
    • plugin-debugger/che-plugin-debugger-ide
    • plugin-java-debugger/che-plugin-java-debugger-server/src/test/java/org/eclipse/che/plugin/jdb/server
  • selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git

plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,25 @@
4141
<groupId>com.google.inject</groupId>
4242
<artifactId>guice</artifactId>
4343
</dependency>
44+
<dependency>
45+
<groupId>com.google.inject.extensions</groupId>
46+
<artifactId>guice-assistedinject</artifactId>
47+
</dependency>
4448
<dependency>
4549
<groupId>javax.validation</groupId>
4650
<artifactId>validation-api</artifactId>
4751
</dependency>
4852
<dependency>
4953
<groupId>org.eclipse.che.core</groupId>
50-
<artifactId>che-core-api-project</artifactId>
54+
<artifactId>che-core-api-core</artifactId>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.eclipse.che.core</groupId>
58+
<artifactId>che-core-api-debug-shared</artifactId>
5159
</dependency>
5260
<dependency>
5361
<groupId>org.eclipse.che.core</groupId>
54-
<artifactId>che-core-api-workspace</artifactId>
62+
<artifactId>che-core-api-dto</artifactId>
5563
</dependency>
5664
<dependency>
5765
<groupId>org.eclipse.che.core</groupId>
@@ -128,18 +136,6 @@
128136
</testResource>
129137
</testResources>
130138
<plugins>
131-
<plugin>
132-
<groupId>org.apache.maven.plugins</groupId>
133-
<artifactId>maven-dependency-plugin</artifactId>
134-
<executions>
135-
<execution>
136-
<id>analyze</id>
137-
<configuration>
138-
<skip>true</skip>
139-
</configuration>
140-
</execution>
141-
</executions>
142-
</plugin>
143139
<plugin>
144140
<groupId>org.codehaus.mojo</groupId>
145141
<artifactId>build-helper-maven-plugin</artifactId>
@@ -214,7 +210,6 @@
214210
</dependency>
215211
</dependencies>
216212
</plugin>
217-
218213
<plugin>
219214
<groupId>org.apache.maven.plugins</groupId>
220215
<artifactId>maven-surefire-plugin</artifactId>

plugins/plugin-java-debugger/che-plugin-java-debugger-server/src/test/java/org/eclipse/che/plugin/jdb/server/ThreadDumpTest1.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static org.eclipse.che.plugin.jdb.server.util.JavaDebuggerUtils.ensureSuspendAtDesiredLocation;
1717
import static org.eclipse.che.plugin.jdb.server.util.JavaDebuggerUtils.terminateVirtualMachineQuietly;
1818
import static org.testng.Assert.assertEquals;
19-
import static org.testng.Assert.assertFalse;
2019
import static org.testng.Assert.assertNull;
2120
import static org.testng.Assert.assertTrue;
2221

@@ -147,22 +146,5 @@ private void validateSomeThreadDump(List<ThreadStateDto> threads) {
147146
assertEquals(threadState.getGroupName(), "main");
148147
assertTrue(threadState.isSuspended());
149148
assertEquals(threadState.getStatus(), ThreadStatus.RUNNING);
150-
151-
List<? extends StackFrameDump> frames = threadState.getFrames();
152-
assertFalse(frames.isEmpty());
153-
154-
StackFrameDump stackFrameDump = frames.get(0);
155-
assertTrue(stackFrameDump.getVariables().isEmpty());
156-
assertTrue(stackFrameDump.getFields().isEmpty());
157-
158-
Location location = stackFrameDump.getLocation();
159-
assertEquals(location.getLineNumber(), 41);
160-
assertEquals(location.getTarget(), "/test/src/org/eclipse/ThreadDumpTest1.java");
161-
assertEquals(location.getExternalResourceId(), -1);
162-
assertEquals(location.getResourceProjectPath(), "/test");
163-
164-
Method method = location.getMethod();
165-
assertEquals(method.getName(), "run");
166-
assertTrue(method.getArguments().isEmpty());
167149
}
168150
}

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/RevertCommitTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
import org.testng.annotations.BeforeClass;
3434
import org.testng.annotations.Test;
3535

36-
/**
37-
* @author Anatolii Bazko
38-
*/
36+
/** @author Anatolii Bazko */
3937
public class RevertCommitTest {
4038
private static final String PROJECT_NAME = NameGenerator.generate("project", 2);
4139

0 commit comments

Comments
 (0)