Pārlūkot izejas kodu

433351: first fix. inpath weaving of decp on generic interface

tags/V1_8_1
Andy Clement pirms 10 gadiem
vecāks
revīzija
3c2b8b7788

+ 6
- 0
org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java Parādīt failu

@@ -1163,6 +1163,12 @@ public class ReferenceType extends ResolvedType {
if (getDelegate() != null) {
delegate.ensureConsistent();
}
if (isRawType()) {
ReferenceType genericType = getGenericType();
if (genericType != null) {
genericType.ensureConsistent();
}
}
}

@Override

+ 10
- 0
tests/bugs181/433351/Extender.aj Parādīt failu

@@ -0,0 +1,10 @@
package test.extender;
import test.*;

public aspect Extender {

declare parents: InterfaceProj1 extends InterfaceProj2;

// declare parents: test.ClassProj1 extends ClassProj2;

}

+ 7
- 0
tests/bugs181/433351/InterfaceProj1.java Parādīt failu

@@ -0,0 +1,7 @@
package test;

public interface InterfaceProj1<T> {

public abstract int aMethod();
}

+ 7
- 0
tests/bugs181/433351/InterfaceProj2.java Parādīt failu

@@ -0,0 +1,7 @@
package test.extender;

public interface InterfaceProj2<T> {

public abstract int bMethod();
}

+ 4
- 0
tests/src/org/aspectj/systemtest/ajc181/Ajc181Tests.java Parādīt failu

@@ -22,6 +22,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
*/
public class Ajc181Tests extends org.aspectj.testing.XMLBasedAjcTestCase {

public void testJarWeaving_433351() {
runTest("jar weaving");
}
public void testParameterNamesAttribute_436531() {
runTest("parameter names attribute");
}

+ 7
- 0
tests/src/org/aspectj/systemtest/ajc181/ajc181.xml Parādīt failu

@@ -2,6 +2,13 @@

<suite>

<ajc-test dir="bugs181/433351" title="jar weaving">
<compile options="-1.5" files="InterfaceProj1.java" outjar="code.jar"/>
<compile options="-1.5 -showWeaveInfo" inpath="code.jar" files="Extender.aj InterfaceProj2.java">
<message kind="weave" text="Extending interface set for type 'test.InterfaceProj1' (InterfaceProj1.java) to include 'test.extender.InterfaceProj2' (Extender.aj)"/>
</compile>
</ajc-test>

<ajc-test dir="bugs181/436531" title="parameter names attribute">
<compile options="-1.8" files="Azpect.java" inpath="code.jar"/>
</ajc-test>

Notiek ielāde…
Atcelt
Saglabāt