From bc42b5df48f474335725ee440a3cf086e59a2bbd Mon Sep 17 00:00:00 2001
From: Andrea Aime <andrea.aime@gmail.com>
Date: Sat, 28 Jan 2006 10:16:18 +0000
Subject: [PATCH] Refactored test data, now we have one package for each match
 type

---
 .../{ => basic}/invoice/Customer.java         |  2 +-
 .../{ => basic}/invoice/Invoice.java          |  8 ++--
 .../spinellis/basic/invoice/InvoiceItem.java  | 12 +++++
 .../{ => basic}/product/Category.java         |  2 +-
 .../{ => basic}/product/Product.java          |  4 +-
 .../{ => basic}/views/ViewAbstract.java       |  6 +--
 .../gr/spinellis/basic/views/ViewAll.java     | 11 +++++
 .../basic/views/ViewAllDetailed.java          | 16 +++++++
 .../spinellis/{ => basic}/views/ViewAtt.java  |  9 ++--
 .../{ => basic}/views/ViewChildEmpty.java     |  2 +-
 .../{ => basic}/views/ViewChildOverride.java  |  6 +--
 .../{ => basic}/views/ViewColors.java         |  7 ++-
 .../{ => basic}/views/ViewProduct.java        |  4 +-
 .../java/gr/spinellis/context/classes/A.java  | 48 +++++++++++++++++++
 .../spinellis/context/views/ViewContext.java  | 17 +++++++
 .../java/gr/spinellis/iface/classes/Face.java | 17 +++++++
 .../spinellis/iface/views/ViewInterfaces.java | 16 +++++++
 .../gr/spinellis/invoice/InvoiceItem.java     | 12 -----
 .../gr/spinellis/subclass/classes/Super.java  | 15 ++++++
 .../subclass/views/ViewSubclasses.java        | 16 +++++++
 testdata/java/gr/spinellis/views/ViewAll.java |  8 ----
 .../gr/spinellis/views/ViewAllDetailed.java   | 13 -----
 22 files changed, 195 insertions(+), 56 deletions(-)
 rename testdata/java/gr/spinellis/{ => basic}/invoice/Customer.java (55%)
 rename testdata/java/gr/spinellis/{ => basic}/invoice/Invoice.java (56%)
 create mode 100644 testdata/java/gr/spinellis/basic/invoice/InvoiceItem.java
 rename testdata/java/gr/spinellis/{ => basic}/product/Category.java (78%)
 rename testdata/java/gr/spinellis/{ => basic}/product/Product.java (64%)
 rename testdata/java/gr/spinellis/{ => basic}/views/ViewAbstract.java (52%)
 create mode 100644 testdata/java/gr/spinellis/basic/views/ViewAll.java
 create mode 100644 testdata/java/gr/spinellis/basic/views/ViewAllDetailed.java
 rename testdata/java/gr/spinellis/{ => basic}/views/ViewAtt.java (53%)
 rename testdata/java/gr/spinellis/{ => basic}/views/ViewChildEmpty.java (67%)
 rename testdata/java/gr/spinellis/{ => basic}/views/ViewChildOverride.java (53%)
 rename testdata/java/gr/spinellis/{ => basic}/views/ViewColors.java (58%)
 rename testdata/java/gr/spinellis/{ => basic}/views/ViewProduct.java (55%)
 create mode 100644 testdata/java/gr/spinellis/context/classes/A.java
 create mode 100644 testdata/java/gr/spinellis/context/views/ViewContext.java
 create mode 100644 testdata/java/gr/spinellis/iface/classes/Face.java
 create mode 100644 testdata/java/gr/spinellis/iface/views/ViewInterfaces.java
 delete mode 100644 testdata/java/gr/spinellis/invoice/InvoiceItem.java
 create mode 100644 testdata/java/gr/spinellis/subclass/classes/Super.java
 create mode 100644 testdata/java/gr/spinellis/subclass/views/ViewSubclasses.java
 delete mode 100644 testdata/java/gr/spinellis/views/ViewAll.java
 delete mode 100644 testdata/java/gr/spinellis/views/ViewAllDetailed.java

diff --git a/testdata/java/gr/spinellis/invoice/Customer.java b/testdata/java/gr/spinellis/basic/invoice/Customer.java
similarity index 55%
rename from testdata/java/gr/spinellis/invoice/Customer.java
rename to testdata/java/gr/spinellis/basic/invoice/Customer.java
index 0317cb8..b7709d4 100644
--- a/testdata/java/gr/spinellis/invoice/Customer.java
+++ b/testdata/java/gr/spinellis/basic/invoice/Customer.java
@@ -1,4 +1,4 @@
-package gr.spinellis.invoice;
+package gr.spinellis.basic.invoice;
 
 public class Customer {
     String name;
diff --git a/testdata/java/gr/spinellis/invoice/Invoice.java b/testdata/java/gr/spinellis/basic/invoice/Invoice.java
similarity index 56%
rename from testdata/java/gr/spinellis/invoice/Invoice.java
rename to testdata/java/gr/spinellis/basic/invoice/Invoice.java
index 1992bf4..c05cdf3 100644
--- a/testdata/java/gr/spinellis/invoice/Invoice.java
+++ b/testdata/java/gr/spinellis/basic/invoice/Invoice.java
@@ -1,11 +1,11 @@
-package gr.spinellis.invoice;
+package gr.spinellis.basic.invoice;
 
 import java.util.List;
-import gr.spinellis.product.*;
+import gr.spinellis.basic.product.*;
 
 /**
- * @composed 1 - * gr.spinellis.invoice.InvoiceItem
- * @assoc * - 1 gr.spinellis.invoice.Customer
+ * @composed 1 - * InvoiceItem
+ * @assoc * - 1 Customer
  */
 public class Invoice {
     public double total;
diff --git a/testdata/java/gr/spinellis/basic/invoice/InvoiceItem.java b/testdata/java/gr/spinellis/basic/invoice/InvoiceItem.java
new file mode 100644
index 0000000..d850b31
--- /dev/null
+++ b/testdata/java/gr/spinellis/basic/invoice/InvoiceItem.java
@@ -0,0 +1,12 @@
+package gr.spinellis.basic.invoice;
+
+import gr.spinellis.basic.product.*;
+
+/**
+ * @assoc * - 1 Product
+ */
+public class InvoiceItem {
+
+    public Product product;
+    public int quantity;
+}
diff --git a/testdata/java/gr/spinellis/product/Category.java b/testdata/java/gr/spinellis/basic/product/Category.java
similarity index 78%
rename from testdata/java/gr/spinellis/product/Category.java
rename to testdata/java/gr/spinellis/basic/product/Category.java
index c76fca5..d5e8ad6 100644
--- a/testdata/java/gr/spinellis/product/Category.java
+++ b/testdata/java/gr/spinellis/basic/product/Category.java
@@ -1,4 +1,4 @@
-package gr.spinellis.product;
+package gr.spinellis.basic.product;
 import java.util.*;
 
 /**
diff --git a/testdata/java/gr/spinellis/product/Product.java b/testdata/java/gr/spinellis/basic/product/Product.java
similarity index 64%
rename from testdata/java/gr/spinellis/product/Product.java
rename to testdata/java/gr/spinellis/basic/product/Product.java
index 0186898..c4adfd7 100644
--- a/testdata/java/gr/spinellis/product/Product.java
+++ b/testdata/java/gr/spinellis/basic/product/Product.java
@@ -1,7 +1,7 @@
-package gr.spinellis.product;
+package gr.spinellis.basic.product;
 
 /**
- * @assoc * - 1 gr.spinellis.product.Category
+ * @assoc * - 1 Category
  */
 public class Product {
 
diff --git a/testdata/java/gr/spinellis/views/ViewAbstract.java b/testdata/java/gr/spinellis/basic/views/ViewAbstract.java
similarity index 52%
rename from testdata/java/gr/spinellis/views/ViewAbstract.java
rename to testdata/java/gr/spinellis/basic/views/ViewAbstract.java
index d533693..00e3eae 100644
--- a/testdata/java/gr/spinellis/views/ViewAbstract.java
+++ b/testdata/java/gr/spinellis/basic/views/ViewAbstract.java
@@ -1,12 +1,12 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
  * @opt hide
  *  
- * @match class gr.spinellis.product.* 
+ * @match class gr.spinellis.basic.product.* 
  * @opt !hide
- * @match class gr.spinellis.*
+ * @match class gr.spinellis.basic.*
  * @opt nodefillcolor LemonChiffon 
  */
 public abstract class ViewAbstract {
diff --git a/testdata/java/gr/spinellis/basic/views/ViewAll.java b/testdata/java/gr/spinellis/basic/views/ViewAll.java
new file mode 100644
index 0000000..e174894
--- /dev/null
+++ b/testdata/java/gr/spinellis/basic/views/ViewAll.java
@@ -0,0 +1,11 @@
+package gr.spinellis.basic.views;
+
+/**
+ * @view
+ * @opt hide 
+ * 
+ * @match class gr.spinellis.basic.*
+ * @opt !hide
+ */
+public class ViewAll {
+}
diff --git a/testdata/java/gr/spinellis/basic/views/ViewAllDetailed.java b/testdata/java/gr/spinellis/basic/views/ViewAllDetailed.java
new file mode 100644
index 0000000..3f0e9d0
--- /dev/null
+++ b/testdata/java/gr/spinellis/basic/views/ViewAllDetailed.java
@@ -0,0 +1,16 @@
+package gr.spinellis.basic.views;
+
+/**
+ * @view
+ * @opt hide 
+ * 
+ * @match class gr.spinellis.basic.*
+ * @opt !hide
+ * 
+ * @match class gr.spinellis.basic.*
+ * @opt attributes 
+ * @opt operations 
+ * @opt types
+ */
+public class ViewAllDetailed {
+}
diff --git a/testdata/java/gr/spinellis/views/ViewAtt.java b/testdata/java/gr/spinellis/basic/views/ViewAtt.java
similarity index 53%
rename from testdata/java/gr/spinellis/views/ViewAtt.java
rename to testdata/java/gr/spinellis/basic/views/ViewAtt.java
index 407ba7b..3a800d3 100644
--- a/testdata/java/gr/spinellis/views/ViewAtt.java
+++ b/testdata/java/gr/spinellis/basic/views/ViewAtt.java
@@ -1,10 +1,11 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
- * @opt hide java.*
- * 
- * @match class gr.spinellis.*
+ * @opt hide
+ *
+ * @match class gr.spinellis.basic.*
+ * @opt !hide
  * @opt attributes 
  * @opt nodefontsize 16 
  * @opt nodefillcolor yellow
diff --git a/testdata/java/gr/spinellis/views/ViewChildEmpty.java b/testdata/java/gr/spinellis/basic/views/ViewChildEmpty.java
similarity index 67%
rename from testdata/java/gr/spinellis/views/ViewChildEmpty.java
rename to testdata/java/gr/spinellis/basic/views/ViewChildEmpty.java
index 3e51c53..3756710 100644
--- a/testdata/java/gr/spinellis/views/ViewChildEmpty.java
+++ b/testdata/java/gr/spinellis/basic/views/ViewChildEmpty.java
@@ -1,4 +1,4 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
diff --git a/testdata/java/gr/spinellis/views/ViewChildOverride.java b/testdata/java/gr/spinellis/basic/views/ViewChildOverride.java
similarity index 53%
rename from testdata/java/gr/spinellis/views/ViewChildOverride.java
rename to testdata/java/gr/spinellis/basic/views/ViewChildOverride.java
index 82fa595..8ded481 100644
--- a/testdata/java/gr/spinellis/views/ViewChildOverride.java
+++ b/testdata/java/gr/spinellis/basic/views/ViewChildOverride.java
@@ -1,12 +1,12 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
  * 
  * @opt nodefillcolor LightGray
- * @match class gr.spinellis.product.Product
+ * @match class gr.spinellis.basic.product.Product
  * @opt attributes
- * @match class gr.spinellis.product.Category
+ * @match class gr.spinellis.basic.product.Category
  * @opt nodefillcolor brown
  */
 public class ViewChildOverride extends ViewAbstract {
diff --git a/testdata/java/gr/spinellis/views/ViewColors.java b/testdata/java/gr/spinellis/basic/views/ViewColors.java
similarity index 58%
rename from testdata/java/gr/spinellis/views/ViewColors.java
rename to testdata/java/gr/spinellis/basic/views/ViewColors.java
index 58c379f..31e6a1e 100644
--- a/testdata/java/gr/spinellis/views/ViewColors.java
+++ b/testdata/java/gr/spinellis/basic/views/ViewColors.java
@@ -1,8 +1,11 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
-
+ * @opt hide
+ *
+ * @match class (gr.spinellis.basic.*|java.*)
+ * @opt !hide
  * @match class .*
  * @opt nodefillcolor gray
  * @match class gr.spinellis.*
diff --git a/testdata/java/gr/spinellis/views/ViewProduct.java b/testdata/java/gr/spinellis/basic/views/ViewProduct.java
similarity index 55%
rename from testdata/java/gr/spinellis/views/ViewProduct.java
rename to testdata/java/gr/spinellis/basic/views/ViewProduct.java
index ac4c479..d679ab9 100644
--- a/testdata/java/gr/spinellis/views/ViewProduct.java
+++ b/testdata/java/gr/spinellis/basic/views/ViewProduct.java
@@ -1,10 +1,10 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
  * @opt hide
  * 
- * @match class gr.spinellis.product.* 
+ * @match class gr.spinellis.basic.product.* 
  * @opt !hide 
  * @opt attributes
  */
diff --git a/testdata/java/gr/spinellis/context/classes/A.java b/testdata/java/gr/spinellis/context/classes/A.java
new file mode 100644
index 0000000..2e7e9e4
--- /dev/null
+++ b/testdata/java/gr/spinellis/context/classes/A.java
@@ -0,0 +1,48 @@
+package gr.spinellis.context.classes;
+
+import javax.swing.JComponent;
+
+class ABaseClass {
+    
+}
+
+public class A extends ABaseClass {
+    B b;
+    JComponent component;
+    
+    public E getChild() {};
+}
+
+class B {
+    C c;
+}
+
+/**
+ * Linked indirectly, won't be rendered
+ */
+class C {
+    
+}
+
+class D {
+    A a;
+}
+
+class E {
+    
+}
+
+class ASubclass extends A {
+    
+}
+
+class AClient {
+    public void compute(A a);
+}
+
+/**
+ * This won't be rendererd since it's not linked to the A 
+ */
+class AloneInTheDark {
+    
+}
diff --git a/testdata/java/gr/spinellis/context/views/ViewContext.java b/testdata/java/gr/spinellis/context/views/ViewContext.java
new file mode 100644
index 0000000..8f9956a
--- /dev/null
+++ b/testdata/java/gr/spinellis/context/views/ViewContext.java
@@ -0,0 +1,17 @@
+package gr.spinellis.context.views;
+
+/**
+ * @view
+ * @opt hide
+ * @opt inferrel
+ * @opt inferdep
+ *  
+ * @match context gr.spinellis.context.classes.A
+ * @opt !hide
+ * @match class gr.spinellis.context.classes.A
+ * @opt nodefillcolor lemonchiffon
+ */
+public class ViewContext {
+}
+
+
diff --git a/testdata/java/gr/spinellis/iface/classes/Face.java b/testdata/java/gr/spinellis/iface/classes/Face.java
new file mode 100644
index 0000000..9014f1a
--- /dev/null
+++ b/testdata/java/gr/spinellis/iface/classes/Face.java
@@ -0,0 +1,17 @@
+package gr.spinellis.iface.classes;
+
+import java.io.Serializable;
+
+public interface Face {}
+
+interface SubFace extends Face, Serializable {}
+
+interface SubSubFace extends SubFace {}
+
+interface Independent extends Serializable {}
+
+class DirectImplementor implements Face {}
+
+class FarImplementor implements SubSubFace {}
+
+class NonCompliant {}
\ No newline at end of file
diff --git a/testdata/java/gr/spinellis/iface/views/ViewInterfaces.java b/testdata/java/gr/spinellis/iface/views/ViewInterfaces.java
new file mode 100644
index 0000000..4e47bea
--- /dev/null
+++ b/testdata/java/gr/spinellis/iface/views/ViewInterfaces.java
@@ -0,0 +1,16 @@
+package gr.spinellis.iface.views;
+
+/**
+ * @view
+ *
+ * @match class .*
+ * @opt hide
+ * @match interface gr.spinellis.iface.classes.Face
+ * @opt !hide
+ * @match class gr.spinellis.iface.classes.Face
+ * @opt nodefillcolor lemonchiffon
+ */
+public class ViewInterfaces {
+}
+
+
diff --git a/testdata/java/gr/spinellis/invoice/InvoiceItem.java b/testdata/java/gr/spinellis/invoice/InvoiceItem.java
deleted file mode 100644
index 47664fe..0000000
--- a/testdata/java/gr/spinellis/invoice/InvoiceItem.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package gr.spinellis.invoice;
-
-import gr.spinellis.product.*;
-
-/**
- * @assoc * - 1 gr.spinellis.product.Product
- */
-public class InvoiceItem {
-
-    public Product product;
-    public int quantity;
-}
diff --git a/testdata/java/gr/spinellis/subclass/classes/Super.java b/testdata/java/gr/spinellis/subclass/classes/Super.java
new file mode 100644
index 0000000..9fee90b
--- /dev/null
+++ b/testdata/java/gr/spinellis/subclass/classes/Super.java
@@ -0,0 +1,15 @@
+package gr.spinellis.subclass.classes;
+
+import java.io.Serializable;
+
+public class Super {}
+
+class SubOne extends Super {}
+
+class SubTwo extends Super {}
+
+class SubOneOne extends SubOne {}
+
+class SubOneTwo extends SubOne {}
+
+class Alone {}
\ No newline at end of file
diff --git a/testdata/java/gr/spinellis/subclass/views/ViewSubclasses.java b/testdata/java/gr/spinellis/subclass/views/ViewSubclasses.java
new file mode 100644
index 0000000..d886db9
--- /dev/null
+++ b/testdata/java/gr/spinellis/subclass/views/ViewSubclasses.java
@@ -0,0 +1,16 @@
+package gr.spinellis.subclass.views;
+
+/**
+ * @view
+ *
+ * @match class .*
+ * @opt hide
+ * @match subclass gr.spinellis.subclass.classes.Super
+ * @opt !hide
+ * @match class gr.spinellis.subclass.classes.Super
+ * @opt nodefillcolor lemonchiffon
+ */
+public class ViewSubclasses {
+}
+
+
diff --git a/testdata/java/gr/spinellis/views/ViewAll.java b/testdata/java/gr/spinellis/views/ViewAll.java
deleted file mode 100644
index baf0618..0000000
--- a/testdata/java/gr/spinellis/views/ViewAll.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package gr.spinellis.views;
-
-/**
- * @view
- * @opt hide java.*
- */
-public class ViewAll {
-}
diff --git a/testdata/java/gr/spinellis/views/ViewAllDetailed.java b/testdata/java/gr/spinellis/views/ViewAllDetailed.java
deleted file mode 100644
index c4cfe0a..0000000
--- a/testdata/java/gr/spinellis/views/ViewAllDetailed.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package gr.spinellis.views;
-
-/**
- * @view
- * @opt hide java.*
- * 
- * @match class gr.spinellis.*
- * @opt attributes 
- * @opt operations 
- * @opt types
- */
-public class ViewAllDetailed {
-}