Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cfa86ea

Browse files
terryyinterryyin
committed
fix the selection.
1 parent 175ad55 commit cfa86ea

File tree

12 files changed

+65
-28
lines changed

12 files changed

+65
-28
lines changed

‎SWTBotTest/src/org/cpputest/plugin/SWTBotTest/EmptyStubTest.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,26 @@ static public void waitForAWhile(){
3333
}
3434
@Test
3535
public void testCopyEmptyStubToClipboard() {
36-
String clipboardContent = copyEmptyStubOfCodeToClipboard("void fun(void);\n");
37-
assertEquals("void fun(){}", clipboardContent);
36+
String clipboardContent = copyEmptyStubOfCodeToClipboard("void fun();\n");
37+
assertEquals("void fun(){}\n", clipboardContent);
3838
}
3939
@Ignore("still under development")
4040
@Test
4141
public void testCopyEmptyStubToClipboardWithReturnType() {
4242
String clipboardContent = copyEmptyStubOfCodeToClipboard("int fun(void);\n");
4343
assertEquals("int fun(){return 0;}\n", clipboardContent);
4444
}
45+
@Ignore("still under development")
46+
@Test
47+
public void testCopyEmptyStubToClipboardWithIncompleteCode() {
48+
String clipboardContent = copyEmptyStubOfCodeToClipboard(" ");
49+
shouldSeeUnableToGenerateStubMessagebox("No function is selected.");
50+
}
4551

52+
private void shouldSeeUnableToGenerateStubMessagebox(String string) {
53+
// TODO Auto-generated method stub
54+
55+
}
4656
protected String copyEmptyStubOfCodeToClipboard(String signature) {
4757
SWTBotEclipseEditor editor = createNewCppFile("example.h", signature);
4858
editor.selectLine(0);

‎SWTBotTest/src/org/cpputest/plugin/SWTBotTest/SimpleEndToEndTest.java

-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,5 @@
66

77
public class SimpleEndToEndTest {
88

9-
@Test
10-
public void test() {
11-
}
129

1310
}

‎org.cpputest.plugin/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target

‎org.cpputest.plugin/META-INF/MANIFEST.MF

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ Require-Bundle: org.eclipse.ui,
1111
org.eclipse.cdt;bundle-version="7.0.2"
1212
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
1313
Bundle-ActivationPolicy: lazy
14-
Import-Package: org.junit.runner
14+
Import-Package: org.eclipse.jface.text,
15+
org.junit.runner

‎org.cpputest.plugin/pom.xml

+18-3
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<groupId>org.eclipse.tycho</groupId>
2323
<artifactId>tycho-surefire-plugin</artifactId>
2424
<version>${tycho.version}</version>
25-
<configuration>
25+
<configuration>
2626
<testClass>org.eclipse.equinox.p2.tests.AutomatedTests</testClass>
27-
</configuration>
28-
27+
</configuration>
28+
2929
</plugin>
3030
<plugin>
3131
<groupId>org.eclipse.tycho</groupId>
@@ -37,6 +37,21 @@
3737
</archive>
3838
</configuration>
3939
</plugin>
40+
<plugin>
41+
<groupId>org.eclipse.tycho</groupId>
42+
<artifactId>target-platform-configuration</artifactId>
43+
<configuration>
44+
<dependency-resolution>
45+
<extraRequirements>
46+
<requirement>
47+
<type>eclipse-plugin</type>
48+
<id>org.eclipse.jface.text</id>
49+
<versionRange>0.0.0</versionRange>
50+
</requirement>
51+
</extraRequirements>
52+
</dependency-resolution>
53+
</configuration>
54+
</plugin>
4055
</plugins>
4156
</build>
4257

‎org.cpputest.plugin/src/org/cpputest/plugin/general/CppUTestCodeGeneratorImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public class CppUTestCodeGeneratorImpl implements CppUTestCodeGenerator {
44

55
@Override
66
public String getEmptyStubOfCode(String string) {
7-
return "void fun(){}";
7+
return string.replaceAll(";", "{}\n");
88
}
99

1010
}

‎org.cpputest.plugin/src/org/cpputest/plugin/platform/CppUTestEclipsePlatform.java

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.cpputest.plugin.general.CppUTestPlatform;
44
import org.eclipse.jface.viewers.ISelection;
5+
import org.eclipse.jface.text.ITextSelection;
56
import org.eclipse.swt.dnd.Clipboard;
67
import org.eclipse.swt.dnd.TextTransfer;
78
import org.eclipse.swt.dnd.Transfer;
@@ -19,6 +20,9 @@ public CppUTestEclipsePlatform(IWorkbenchWindow window) {
1920
public String getSelectedText() {
2021
ISelectionService ss = workbenchWindow.getSelectionService();
2122
ISelection selection = ss.getSelection();
23+
ITextSelection txt = (ITextSelection)selection;
24+
if (txt != null)
25+
return txt.getText();
2226
return selection.toString();
2327
}
2428

‎org.cpputest.plugin/test/org/cpputest/plugin/generaltest/ActivatorTest.java

-13
This file was deleted.

‎org.cpputest.plugin/test/org/cpputest/plugin/generaltest/CppUTestActionTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.cpputest.plugin.generaltest;
22

3-
import static org.junit.Assert.*;
43
import org.cpputest.plugin.actions.*;
54
import org.cpputest.plugin.general.CppUTestCodeGeneratorActions;
65
import org.eclipse.jface.action.IAction;

‎org.cpputest.plugin/test/org/cpputest/plugin/generaltest/CppUTestCodeGeneratorTest.java

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package org.cpputest.plugin.generaltest;
2+
3+
import static org.junit.Assert.*;
4+
5+
import org.cpputest.plugin.general.CppUTestCodeGeneratorImpl;
6+
import org.junit.Ignore;
7+
import org.junit.Test;
8+
9+
public class CppUTestCodeGeneratorTest {
10+
11+
@Test
12+
public void testGenerateSimpleFunction() {
13+
CppUTestCodeGeneratorImpl cpputest = new CppUTestCodeGeneratorImpl();
14+
assertEquals("void foo(){}\n",cpputest.getEmptyStubOfCode("void foo();"));
15+
}
16+
@Test
17+
public void testGenerateWithIntReturnType() {
18+
CppUTestCodeGeneratorImpl cpputest = new CppUTestCodeGeneratorImpl();
19+
assertEquals("int foo(){return 0;}\n",cpputest.getEmptyStubOfCode("int foo();"));
20+
}
21+
@Ignore("still under development")
22+
public void testGenerateWithVoidParameter() {
23+
CppUTestCodeGeneratorImpl cpputest = new CppUTestCodeGeneratorImpl();
24+
assertEquals("void foo(){}\n",cpputest.getEmptyStubOfCode("void foo(void);"));
25+
}
26+
27+
}

‎org.cpputest.plugin/test/org/cpputest/plugin/generaltest/CppUTestEclipseCodeGeneratorTest.java

-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package org.cpputest.plugin.generaltest;
22

3-
import static org.junit.Assert.*;
4-
53
import org.cpputest.plugin.general.CppUTestCodeGenerator;
64
import org.cpputest.plugin.general.CppUTestEclipseCodeGeneratorActions;
75
import org.cpputest.plugin.general.CppUTestPlatform;
8-
import org.eclipse.jface.action.IAction;
96
import org.jmock.Expectations;
107
import org.jmock.Mockery;
118
import org.jmock.integration.junit4.JMock;

‎pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<module>org.cpputest.plugin</module>
1414
<module>org.cpputest.plugin.feature</module>
1515
<module>update-site</module>
16-
<module>org.cpputest.plugin.test</module>
1716
<module>SWTBotTest</module>
1817
</modules>
1918
<repositories>

0 commit comments

Comments
 (0)