145963: binary entries in the model: testcode

diff --git a/tests/model/expected/pr145963_1.txt b/tests/model/expected/pr145963_1.txt
new file mode 100644 (file)
index 0000000..3a0f42f
--- /dev/null
+++ b/tests/model/expected/pr145963_1.txt
@@ -0,0 +1,45 @@
+=== MODEL STATUS REPORT ========= After a batch build
+<root>  [java source file] 
+  pkg  [package] 
+    SourceAspect.aj  [java source file] TEST_SANDBOX\SourceAspect.aj:1::0
+      import declarations  [import reference] 
+      SourceAspect  [aspect] TEST_SANDBOX\SourceAspect.aj:3::30
+        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\SourceAspect.aj:5::49
+        p()  [pointcut] TEST_SANDBOX\SourceAspect.aj:7::154
+        before(): p..  [advice] TEST_SANDBOX\SourceAspect.aj:9::187
+    BinaryAspect.class (binary)  [class] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1::0
+      import declarations  [import reference] 
+      BinaryAspect  [aspect] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1::0
+        p()  [pointcut] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:7::0
+        before(): p..  [advice] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:9::0
+        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:5::0
+  pack  [package] 
+    C.java  [java source file] TEST_SANDBOX\C.java:1::0
+      import declarations  [import reference] 
+      C  [class] TEST_SANDBOX\C.java:3::30
+        method1()  [method] TEST_SANDBOX\C.java:5::50
+          field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6::93
+=== END OF MODEL REPORT =========
+=== RELATIONSHIPS REPORT ========= After a batch build
+(targets=1) <pkg[BinaryAspect.class (binary)}BinaryAspect&before (advises) <pack{C.java[C~method1
+(targets=2) <pack{C.java[C~method1 (advised by) <pkg*SourceAspect.aj}SourceAspect&before
+(targets=2) <pack{C.java[C~method1 (advised by) <pkg[BinaryAspect.class (binary)}BinaryAspect&before
+(targets=1) <pkg*SourceAspect.aj}SourceAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+(targets=1) <pkg[BinaryAspect.class (binary)}BinaryAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+(targets=1) <pkg*SourceAspect.aj}SourceAspect&before (advises) <pack{C.java[C~method1
+(targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) <pkg*SourceAspect.aj}SourceAspect`declare warning
+(targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) <pkg[BinaryAspect.class (binary)}BinaryAspect`declare warning
+=== END OF RELATIONSHIPS REPORT ==
+=== Properties of the model and relationships map =====
+method=1
+import reference=3
+aspect=2
+code=1
+declare warning=2
+class=2
+advice=2
+pointcut=2
+RelationshipMapSize=6
+FileMapSize=2
+package=2
+java source file=3

diff --git a/tests/model/expected/pr145963_2.txt b/tests/model/expected/pr145963_2.txt
new file mode 100644 (file)
index 0000000..576724c
--- /dev/null
+++ b/tests/model/expected/pr145963_2.txt
@@ -0,0 +1,45 @@
+=== MODEL STATUS REPORT ========= After a batch build
+<root>  [java source file] 
+  pkg  [package] 
+    SourceAspect.aj  [java source file] TEST_SANDBOX\SourceAspect.aj:1::0
+      import declarations  [import reference] 
+      SourceAspect  [aspect] TEST_SANDBOX\SourceAspect.aj:3::30
+        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\SourceAspect.aj:5::49
+        p()  [pointcut] TEST_SANDBOX\SourceAspect.aj:7::154
+        before(): p..  [advice] TEST_SANDBOX\SourceAspect.aj:9::187
+    BinaryAspect.class (binary)  [class] TEST_SANDBOX!pkg\BinaryAspect.class:1::0
+      import declarations  [import reference] 
+      BinaryAspect  [aspect] TEST_SANDBOX!pkg\BinaryAspect.class:1::0
+        p()  [pointcut] TEST_SANDBOX!pkg\BinaryAspect.class:7::0
+        before(): p..  [advice] TEST_SANDBOX!pkg\BinaryAspect.class:9::0
+        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX!pkg\BinaryAspect.class:5::0
+  pack  [package] 
+    C.java  [java source file] TEST_SANDBOX\C.java:1::0
+      import declarations  [import reference] 
+      C  [class] TEST_SANDBOX\C.java:3::30
+        method1()  [method] TEST_SANDBOX\C.java:5::50
+          field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6::93
+=== END OF MODEL REPORT =========
+=== RELATIONSHIPS REPORT ========= After a batch build
+(targets=1) <pkg[BinaryAspect.class (binary)}BinaryAspect&before (advises) <pack{C.java[C~method1
+(targets=2) <pack{C.java[C~method1 (advised by) <pkg*SourceAspect.aj}SourceAspect&before
+(targets=2) <pack{C.java[C~method1 (advised by) <pkg[BinaryAspect.class (binary)}BinaryAspect&before
+(targets=1) <pkg*SourceAspect.aj}SourceAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+(targets=1) <pkg[BinaryAspect.class (binary)}BinaryAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+(targets=1) <pkg*SourceAspect.aj}SourceAspect&before (advises) <pack{C.java[C~method1
+(targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) <pkg*SourceAspect.aj}SourceAspect`declare warning
+(targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) <pkg[BinaryAspect.class (binary)}BinaryAspect`declare warning
+=== END OF RELATIONSHIPS REPORT ==
+=== Properties of the model and relationships map =====
+method=1
+import reference=3
+aspect=2
+code=1
+declare warning=2
+class=2
+advice=2
+pointcut=2
+RelationshipMapSize=6
+FileMapSize=2
+package=2
+java source file=3

diff --git a/tests/model/expected/pr145963_3.txt b/tests/model/expected/pr145963_3.txt
new file mode 100644 (file)
index 0000000..d278a4d
--- /dev/null
+++ b/tests/model/expected/pr145963_3.txt
@@ -0,0 +1,26 @@
+=== MODEL STATUS REPORT ========= After a batch build
+<root>  [java source file] 
+  C.java  [java source file] TEST_SANDBOX\C.java:1::0
+    import declarations  [import reference] 
+    C  [class] TEST_SANDBOX\C.java:3::17
+      method1()  [method] TEST_SANDBOX\C.java:5::37
+        field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6::80
+  AspectInDefaultPackage.class (binary)  [class] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:1::0
+    import declarations  [import reference] 
+    AspectInDefaultPackage  [aspect] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:1::0
+      declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:4::0
+=== END OF MODEL REPORT =========
+=== RELATIONSHIPS REPORT ========= After a batch build
+(targets=1) {C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) [AspectInDefaultPackage.class (binary)}AspectInDefaultPackage`declare warning
+(targets=1) [AspectInDefaultPackage.class (binary)}AspectInDefaultPackage`declare warning (matched by) {C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+=== END OF RELATIONSHIPS REPORT ==
+=== Properties of the model and relationships map =====
+method=1
+import reference=2
+aspect=1
+code=1
+declare warning=1
+class=2
+RelationshipMapSize=2
+FileMapSize=1
+java source file=2

diff --git a/tests/model/expected/pr145963_4.txt b/tests/model/expected/pr145963_4.txt
new file mode 100644 (file)
index 0000000..08924e1
--- /dev/null
+++ b/tests/model/expected/pr145963_4.txt
@@ -0,0 +1,28 @@
+=== MODEL STATUS REPORT ========= After a batch build
+<root>  [java source file] 
+  pack  [package] 
+    C.java  [java source file] TEST_SANDBOX\C.java:1::0
+      import declarations  [import reference] 
+      C  [class] TEST_SANDBOX\C.java:3::30
+        method1()  [method] TEST_SANDBOX\C.java:5::50
+          field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6::93
+  A.class (binary)  [class] TEST_SANDBOX\simple.jar!A.class:1::0
+    import declarations  [import reference] 
+    A  [aspect] TEST_SANDBOX\simple.jar!A.class:1::0
+      declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!A.class:4::0
+=== END OF MODEL REPORT =========
+=== RELATIONSHIPS REPORT ========= After a batch build
+(targets=1) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) [A.class (binary)}A`declare warning
+(targets=1) [A.class (binary)}A`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+=== END OF RELATIONSHIPS REPORT ==
+=== Properties of the model and relationships map =====
+method=1
+import reference=2
+aspect=1
+code=1
+declare warning=1
+class=2
+RelationshipMapSize=2
+FileMapSize=1
+package=1
+java source file=2

diff --git a/tests/model/pr145963_1/BinaryAspect.aj b/tests/model/pr145963_1/BinaryAspect.aj
new file mode 100644 (file)
index 0000000..4c4bcca
--- /dev/null
+++ b/tests/model/pr145963_1/BinaryAspect.aj
@@ -0,0 +1,12 @@
+package pkg;
+
+public aspect BinaryAspect {
+
+       declare warning : (get(* System.out) || get(* System.err)) : "There should be no printlns";
+
+       pointcut p() : execution(* *.*(..));
+       
+       before() : p() {
+       }
+               
+}

diff --git a/tests/model/pr145963_1/C.java b/tests/model/pr145963_1/C.java
new file mode 100644 (file)
index 0000000..5004392
--- /dev/null
+++ b/tests/model/pr145963_1/C.java
@@ -0,0 +1,9 @@
+package pack;
+
+public class C {
+
+       public void method1() {
+               System.out.println("blah");
+       }
+       
+}

diff --git a/tests/model/pr145963_1/README.txt b/tests/model/pr145963_1/README.txt
new file mode 100644 (file)
index 0000000..1ac8c1f
--- /dev/null
+++ b/tests/model/pr145963_1/README.txt
@@ -0,0 +1,3 @@
+To recreate the jar files:
+
+ajc BinaryAspect.aj -outjar simple.jar

diff --git a/tests/model/pr145963_1/SourceAspect.aj b/tests/model/pr145963_1/SourceAspect.aj
new file mode 100644 (file)
index 0000000..e7200e5
--- /dev/null
+++ b/tests/model/pr145963_1/SourceAspect.aj
@@ -0,0 +1,12 @@
+package pkg;
+
+public aspect SourceAspect {
+
+       declare warning : (get(* System.out) || get(* System.err)) : "There should be no printlns";
+
+       pointcut p() : execution(* *.*(..));
+       
+       before() : p() {
+       }
+               
+}

diff --git a/tests/model/pr145963_1/simple.jar b/tests/model/pr145963_1/simple.jar
new file mode 100644 (file)
index 0000000..3f06334
Binary files /dev/null and b/tests/model/pr145963_1/simple.jar differ

diff --git a/tests/model/pr145963_2/BinaryAspect.aj b/tests/model/pr145963_2/BinaryAspect.aj
new file mode 100644 (file)
index 0000000..4c4bcca
--- /dev/null
+++ b/tests/model/pr145963_2/BinaryAspect.aj
@@ -0,0 +1,12 @@
+package pkg;
+
+public aspect BinaryAspect {
+
+       declare warning : (get(* System.out) || get(* System.err)) : "There should be no printlns";
+
+       pointcut p() : execution(* *.*(..));
+       
+       before() : p() {
+       }
+               
+}

diff --git a/tests/model/pr145963_2/C.java b/tests/model/pr145963_2/C.java
new file mode 100644 (file)
index 0000000..5004392
--- /dev/null
+++ b/tests/model/pr145963_2/C.java
@@ -0,0 +1,9 @@
+package pack;
+
+public class C {
+
+       public void method1() {
+               System.out.println("blah");
+       }
+       
+}

diff --git a/tests/model/pr145963_2/README.txt b/tests/model/pr145963_2/README.txt
new file mode 100644 (file)
index 0000000..804f4fc
--- /dev/null
+++ b/tests/model/pr145963_2/README.txt
@@ -0,0 +1,3 @@
+To recreate the class files:
+
+ajc BinaryAspect.aj -d .

diff --git a/tests/model/pr145963_2/SourceAspect.aj b/tests/model/pr145963_2/SourceAspect.aj
new file mode 100644 (file)
index 0000000..e7200e5
--- /dev/null
+++ b/tests/model/pr145963_2/SourceAspect.aj
@@ -0,0 +1,12 @@
+package pkg;
+
+public aspect SourceAspect {
+
+       declare warning : (get(* System.out) || get(* System.err)) : "There should be no printlns";
+
+       pointcut p() : execution(* *.*(..));
+       
+       before() : p() {
+       }
+               
+}

diff --git a/tests/model/pr145963_2/pkg/BinaryAspect.class b/tests/model/pr145963_2/pkg/BinaryAspect.class
new file mode 100644 (file)
index 0000000..ba4ed1f
Binary files /dev/null and b/tests/model/pr145963_2/pkg/BinaryAspect.class differ

diff --git a/tests/model/pr145963_3/AspectInDefaultPackage.aj b/tests/model/pr145963_3/AspectInDefaultPackage.aj
new file mode 100644 (file)
index 0000000..319edf0
--- /dev/null
+++ b/tests/model/pr145963_3/AspectInDefaultPackage.aj
@@ -0,0 +1,6 @@
+
+public aspect AspectInDefaultPackage {
+
+       declare warning : (get(* System.out) || get(* System.err)) : "There should be no printlns";
+
+}

diff --git a/tests/model/pr145963_3/C.java b/tests/model/pr145963_3/C.java
new file mode 100644 (file)
index 0000000..ade6264
--- /dev/null
+++ b/tests/model/pr145963_3/C.java
@@ -0,0 +1,9 @@
+
+
+public class C {
+
+       public void method1() {
+               System.out.println("blah");
+       }
+       
+}

diff --git a/tests/model/pr145963_3/README.txt b/tests/model/pr145963_3/README.txt
new file mode 100644 (file)
index 0000000..ed0f156
--- /dev/null
+++ b/tests/model/pr145963_3/README.txt
@@ -0,0 +1,3 @@
+To recreate the jar files:
+
+ajc AspectInDefaultPackage.aj -outjar simple.jar

diff --git a/tests/model/pr145963_3/simple.jar b/tests/model/pr145963_3/simple.jar
new file mode 100644 (file)
index 0000000..5e5709e
Binary files /dev/null and b/tests/model/pr145963_3/simple.jar differ

diff --git a/tests/model/pr145963_4/A.java b/tests/model/pr145963_4/A.java
new file mode 100644 (file)
index 0000000..c576480
--- /dev/null
+++ b/tests/model/pr145963_4/A.java
@@ -0,0 +1,6 @@
+
+public aspect A {
+
+       declare warning : (get(* System.out) || get(* System.err)) : "There should be no printlns";
+
+}

diff --git a/tests/model/pr145963_4/C.java b/tests/model/pr145963_4/C.java
new file mode 100644 (file)
index 0000000..5004392
--- /dev/null
+++ b/tests/model/pr145963_4/C.java
@@ -0,0 +1,9 @@
+package pack;
+
+public class C {
+
+       public void method1() {
+               System.out.println("blah");
+       }
+       
+}

diff --git a/tests/model/pr145963_4/README.txt b/tests/model/pr145963_4/README.txt
new file mode 100644 (file)
index 0000000..fc826ef
--- /dev/null
+++ b/tests/model/pr145963_4/README.txt
@@ -0,0 +1,3 @@
+To recreate the jar files:
+
+ajc A.java -outjar simple.jar

diff --git a/tests/model/pr145963_4/simple.jar b/tests/model/pr145963_4/simple.jar
new file mode 100644 (file)
index 0000000..5ed6460
Binary files /dev/null and b/tests/model/pr145963_4/simple.jar differ