diff options
| author | aclement <aclement> | 2009-02-04 20:30:36 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2009-02-04 20:30:36 +0000 |
| commit | 55dacf6126a9ffa4b67b40da90d1200525bce779 (patch) | |
| tree | f4191a0918cdb738e7bffdce15a83f2cf1a38515 | |
| parent | f8ab145f9ba1edea907db7a78a7c3ff25cd28e4d (diff) | |
| download | aspectj-55dacf6126a9ffa4b67b40da90d1200525bce779.tar.gz aspectj-55dacf6126a9ffa4b67b40da90d1200525bce779.zip | |
257277: Incorrect generated Source Signature for FieldDeclarations
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java index 5fca46ebf..a25c6f91d 100644 --- a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java @@ -327,17 +327,47 @@ public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase { runTest("ensure getSourceSignature correct with static field"); IHierarchy top = AsmManager.lastActiveStructureModel.getHierarchy(); IProgramElement ipe = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.FIELD, "MY_COMPARATOR"); - String expected = "static final Comparator MY_COMPARATOR;\n"; + String expected = "static final Comparator MY_COMPARATOR = null;\n"; + assertEquals("expected source signature to be " + expected + " but found " + ipe.getSourceSignature(), expected, ipe + .getSourceSignature()); + + ipe = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.FIELD, "aString"); + expected = "static final String aString = \"Constant String\";\n"; + assertEquals("expected source signature to be " + expected + " but found " + ipe.getSourceSignature(), expected, ipe + .getSourceSignature()); + + ipe = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.FIELD, "bString"); + expected = "static final String bString = aString;\n"; + assertEquals("expected source signature to be " + expected + " but found " + ipe.getSourceSignature(), expected, ipe + .getSourceSignature()); + + ipe = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.FIELD, "cString"); + expected = "static final String cString = (aString + bString);\n"; + assertEquals("expected source signature to be " + expected + " but found " + ipe.getSourceSignature(), expected, ipe + .getSourceSignature()); + + ipe = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.FIELD, "dString"); + expected = "static final String dString = ((aString + \" and \") + bString);\n"; + assertEquals("expected source signature to be " + expected + " but found " + ipe.getSourceSignature(), expected, ipe + .getSourceSignature()); + + ipe = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.FIELD, "eString"); + expected = "static final String eString = \"Hello World\";\n"; assertEquals("expected source signature to be " + expected + " but found " + ipe.getSourceSignature(), expected, ipe .getSourceSignature()); ipe = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.FIELD, "aList"); - expected = "public List<String> aList;\n"; + expected = "public List<String> aList = null;\n"; assertEquals("expected source signature to be " + expected + " but found " + ipe.getSourceSignature(), expected, ipe .getSourceSignature()); ipe = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.FIELD, "bList"); - expected = "public List<String> bList;\n"; + expected = "public List<String> bList = null;\n"; + assertEquals("expected source signature to be " + expected + " but found " + ipe.getSourceSignature(), expected, ipe + .getSourceSignature()); + + ipe = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.FIELD, "cList"); + expected = "public List<String> cList = null;\n"; assertEquals("expected source signature to be " + expected + " but found " + ipe.getSourceSignature(), expected, ipe .getSourceSignature()); } |