OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

quick-junit: Commit


Commit MetaInfo

Revision207 (tree)
Time2009-04-23 06:52:20
Authorkompiro

Log Message

TestContextの作成にクラスを対応させました。

Change Summary

Incremental Difference

--- trunk/junit.extensions.eclipse.quick.javadoc.ui/src/junit/extensions/eclipse/quick/javadoc/ui/handlers/CreateSeeTagHandler.java (revision 206)
+++ trunk/junit.extensions.eclipse.quick.javadoc.ui/src/junit/extensions/eclipse/quick/javadoc/ui/handlers/CreateSeeTagHandler.java (nonexistent)
@@ -1,37 +0,0 @@
1-package junit.extensions.eclipse.quick.javadoc.ui.handlers;
2-
3-import junit.extensions.eclipse.quick.javadoc.ui.JavaDocUIActivator;
4-
5-import org.eclipse.core.commands.ExecutionEvent;
6-import org.eclipse.core.commands.ExecutionException;
7-import org.eclipse.jdt.core.IJavaElement;
8-import org.eclipse.jdt.core.IMember;
9-import org.eclipse.jdt.core.IMethod;
10-import org.eclipse.jdt.core.IType;
11-import org.eclipse.jdt.core.JavaModelException;
12-import org.eclipse.jface.dialogs.MessageDialog;
13-import org.eclipse.jface.text.IDocument;
14-
15-public class CreateSeeTagHandler extends AbstractJavaDocHandler {
16-
17- public CreateSeeTagHandler() {
18- }
19-
20- public Object doExecute(ExecutionEvent event) throws ExecutionException {
21- try {
22- IJavaElement elementOnCursor = getElementOfCurrentCursor();
23- IJavaElement elementOfJavaEditor = getElementOfJavaEditor();
24- if(elementOfJavaEditor instanceof IMethod || elementOfJavaEditor instanceof IType){
25- IMember member = (IMember) elementOfJavaEditor;
26- }
27-// MessageDialog.openInformation(
28-// getWorkbenchWindow().getShell(),
29-// "Quick JUnit JavaDoc UI Plug-in",
30-// "element:" + elementOnCursor);
31- } catch (JavaModelException e) {
32- JavaDocUIActivator.getDefault().handleSystemError(e, this);
33- }
34- return null;
35- }
36-
37-}
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
--- trunk/junit.extensions.eclipse.quick.javadoc.ui/src/junit/extensions/eclipse/quick/javadoc/ui/handlers/CreateTestContextTagHandler.java (revision 206)
+++ trunk/junit.extensions.eclipse.quick.javadoc.ui/src/junit/extensions/eclipse/quick/javadoc/ui/handlers/CreateTestContextTagHandler.java (revision 207)
@@ -1,6 +1,7 @@
11 package junit.extensions.eclipse.quick.javadoc.ui.handlers;
22
33 import junit.extensions.eclipse.quick.javadoc.TestContextTagCreator;
4+import junit.extensions.eclipse.quick.javadoc.ui.JavaDocUIActivator;
45
56 import org.eclipse.core.commands.ExecutionEvent;
67 import org.eclipse.core.commands.ExecutionException;
@@ -17,11 +18,16 @@
1718 TestContextTagCreator creater = new TestContextTagCreator();
1819 IJavaElement element = getElementOfCurrentCursor();
1920 String clazz = "";
20- if(element != null){
21+ if(element instanceof IMember){
22+ IMember member = (IMember) element;
23+ IType type = member.getDeclaringType();
24+ clazz = type.getFullyQualifiedName();
25+ }else if(element != null){
2126 clazz = element.getPrimaryElement().getElementName();
2227 }
2328 creater.addTag(compilationUnit.findPrimaryType(), clazz);
24- } catch (JavaModelException e) {
29+ } catch (Exception e) {
30+ JavaDocUIActivator.getDefault().handleSystemError(e, this);
2531 }
2632 return null;
2733 }
--- trunk/junit.extensions.eclipse.quick.javadoc.ui/src/junit/extensions/eclipse/quick/javadoc/ui/handlers/OpenTestingContextHandler.java (revision 206)
+++ trunk/junit.extensions.eclipse.quick.javadoc.ui/src/junit/extensions/eclipse/quick/javadoc/ui/handlers/OpenTestingContextHandler.java (revision 207)
@@ -62,10 +62,6 @@
6262 public OpenTestingContextHandler() {
6363 }
6464
65- /**
66- * @see SearchJavaClassFromDocTagVisitor
67- * @see Test
68- */
6965 public Object doExecute(ExecutionEvent event) throws ExecutionException {
7066 SearchJavaClassRequestor requestor = new SearchJavaClassRequestor();
7167 try {
--- trunk/junit.extensions.eclipse.quick.javadoc.ui/src/junit/extensions/eclipse/quick/javadoc/ui/JavaDocUIActivator.java (revision 206)
+++ trunk/junit.extensions.eclipse.quick.javadoc.ui/src/junit/extensions/eclipse/quick/javadoc/ui/JavaDocUIActivator.java (revision 207)
@@ -82,7 +82,7 @@
8282 public void handleSystemError(Exception e, Object caller) {
8383 IStatus status = createSystemErrorStatus(e, caller);
8484 getLog().log(status);
85- ErrorDialog.openError((Shell) null, "QuickJUnit JavaDoc Extension", "", status); //$NON-NLS-1$ //$NON-NLS-2$
85+ ErrorDialog.openError((Shell) null, "QuickJUnit JavaDoc UI Extension", "", status); //$NON-NLS-1$ //$NON-NLS-2$
8686 }
8787
8888 public void logSystemError(Exception e, Object caller) {
--- trunk/junit.extensions.eclipse.quick.javadoc.test/src/junit/extensions/eclipse/quick/javadoc/TestContextTagCreaterTest.java (revision 206)
+++ trunk/junit.extensions.eclipse.quick.javadoc.test/src/junit/extensions/eclipse/quick/javadoc/TestContextTagCreaterTest.java (revision 207)
@@ -41,6 +41,15 @@
4141 assertTrue(source.contains(TEST_CONTEXT_ANNOTATION));
4242 assertStringCount(1,TEST_CONTEXT_ANNOTATION,source);
4343 }
44+
45+ @Test
46+ public void createTestContextTagFQCNClassName() throws Exception {
47+ creator.addTag(type,"test.Test");
48+ String source = type.getSource();
49+ assertTrue(source.contains(TEST_CONTEXT_ANNOTATION));
50+ assertStringCount(1,TEST_CONTEXT_ANNOTATION,source);
51+ }
52+
4453
4554 @Test
4655 public void assertIllegalCases() throws Exception{
--- trunk/junit.extensions.eclipse.quick.javadoc/src/junit/extensions/eclipse/quick/javadoc/TestContextTagCreator.java (revision 206)
+++ trunk/junit.extensions.eclipse.quick.javadoc/src/junit/extensions/eclipse/quick/javadoc/TestContextTagCreator.java (revision 207)
@@ -72,8 +72,8 @@
7272 if(clazz == null || clazz.equals("")){
7373 return tag;
7474 }
75- SimpleName newSimpleName = ast.newSimpleName(clazz);
76- tag.fragments().add(newSimpleName);
75+ Name newName = ast.newName(clazz);
76+ tag.fragments().add(newName);
7777 return tag;
7878 }
7979
Show on old repository browser