aboutsummaryrefslogtreecommitdiffstats
path: root/test/manual/cedet/tests/testjavacomp.java
diff options
context:
space:
mode:
authorEric Ludlam2019-10-27 20:51:54 -0400
committerStefan Monnier2019-10-31 19:04:12 -0400
commitf69e2aa104209090d5487a7382473ec38b43e9c7 (patch)
treeb63a2c91aab10dfdfafc83531750377c69f2a212 /test/manual/cedet/tests/testjavacomp.java
parent31ed03020c458daabdd8feac741e276a1b7f723b (diff)
downloademacs-f69e2aa104209090d5487a7382473ec38b43e9c7.tar.gz
emacs-f69e2aa104209090d5487a7382473ec38b43e9c7.zip
* test/manual/cedet/tests/test*: More updates from upstream
* test/manual/cedet/tests/testjavacomp.java, test/manual/cedet/tests/testnsp.cpp, test/manual/cedet/tests/testsppcomplete.c, test/manual/cedet/tests/testtypedefs.cpp, test/manual/cedet/tests/testvarnames.c: Merge content from CEDET on SF with extended test points for use with test/lisp/cedet/semantic-utest-ia.el Author: Eric Ludlam <zappo@gnu.org>
Diffstat (limited to 'test/manual/cedet/tests/testjavacomp.java')
-rw-r--r--test/manual/cedet/tests/testjavacomp.java16
1 files changed, 13 insertions, 3 deletions
diff --git a/test/manual/cedet/tests/testjavacomp.java b/test/manual/cedet/tests/testjavacomp.java
index 1102e518918..d2f20f6f0c0 100644
--- a/test/manual/cedet/tests/testjavacomp.java
+++ b/test/manual/cedet/tests/testjavacomp.java
@@ -24,6 +24,10 @@ package tests.testjavacomp;
24class secondClass { 24class secondClass {
25 private void scFuncOne() { } 25 private void scFuncOne() { }
26 public void scFuncOne() { } 26 public void scFuncOne() { }
27
28 int package_protected_field;
29 public int public_protected_field;
30 private int private_protected_field;
27} 31}
28 32
29 33
@@ -52,15 +56,21 @@ public class testjavacomp {
52 56
53 secondClass SC; 57 secondClass SC;
54 58
55 SC.//-3- 59 SC.s//-3-
56 // #3# ( "scFuncOne" ) 60 // #3# ( "scFuncOne" )
57 ; 61 ;
58 62
63 // @TODO - to make this test complete, we need an import
64 // with a package protected field that is excluded
65 // from the completion list.
66 SC.p//-4-
67 // #4# ( "package_protected_field" "public_protected_field" )
68
59 nestedClass NC; 69 nestedClass NC;
60 70
61 // @todo - need to fix this? I don't know if this is legal java. 71 // @todo - need to fix this? I don't know if this is legal java.
62 NC.// - 4- 72 NC.// - 5-
63 // #4# ( "ncFuncOne" ) 73 // #5# ( "ncFuncOne" )
64 ; 74 ;
65 } 75 }
66 76