From b802d653aaa900204b067e4a51957fea678d594a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Thu, 27 Mar 2008 21:29:25 +0000
Subject: [PATCH] moved domain type instances to Domain1Instances

---
 .../query/grammar/hql/Domain1Instances.java   | 66 +++++++++++++++++++
 .../query/grammar/hql/HqlParserTest.java      | 57 +---------------
 2 files changed, 67 insertions(+), 56 deletions(-)
 create mode 100644 querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java

diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java
new file mode 100644
index 000000000..de11b0496
--- /dev/null
+++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java
@@ -0,0 +1,66 @@
+package com.mysema.query.grammar.hql;
+
+import static com.mysema.query.Domain1.*;
+
+/**
+ * Domain1Instances provides
+ *
+ * @author tiwe
+ * @version $Id$
+ */
+public interface Domain1Instances {
+    
+    Account account = new Account("account");
+    
+    Animal an = new Animal("an");
+    
+    AuditLog log = new AuditLog("log");
+    
+    Bar bar = new Bar("bar");
+    
+    Calendar calendar = new Calendar("calendar");
+    
+    Cat cat = new Cat("cat");
+    Cat fatcat = new Cat("fatcat");
+    Cat kittens = new Cat("kittens");
+    Cat kitten = new Cat("kitten");
+    Cat kit = new Cat("kit");
+    Cat mate = new Cat("mate");
+    Cat mother = new Cat("mother");
+    Cat offspr = new Cat("offspr");
+    Cat qat = new Cat("qat");
+    Cat rival = new Cat("rival");
+    
+    doofus d = new doofus("d");
+    
+    Customer cust = new Customer("cust");
+    
+    Foo foo = new Foo("foo");
+    
+    Formula form = new Formula("form");
+    
+    Item item = new Item("item");
+    
+    Name name = new Name("name");
+    
+    Named m = new Named("m");
+    Named n = new Named("n");
+    
+    NameList list = new NameList("list");
+    
+    Order ord = new Order("ord");
+    
+    Payment payment = new Payment("payment");
+    
+    Parameter param = new Parameter("param");
+    
+    Person person = new Person("person");    
+    Person p = new Person("p");
+    
+    Player player = new Player("player");
+    
+    Product prod = new Product("prod");
+    
+    Store store = new Store("store");
+
+}
diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java
index ce5f748be..86dc4845f 100644
--- a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java
+++ b/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java
@@ -14,7 +14,6 @@ import antlr.RecognitionException;
 import antlr.TokenStreamException;
 import antlr.collections.AST;
 
-import com.mysema.query.Domain1;
 import com.mysema.query.Domain1Dtos;
 import com.mysema.query.grammar.HqlGrammar;
 import com.mysema.query.grammar.HqlQueryBase;
@@ -30,61 +29,7 @@ import com.mysema.query.grammar.hql.HqlDomain.Payment;
  * @author tiwe
  * @version $Id$
  */
-public class HqlParserTest extends HqlQueryBase<HqlParserTest>{
-    
-    private Domain1.Account account = new Domain1.Account("account");
-    
-    private Domain1.Animal an = new Domain1.Animal("an");
-    
-    private Domain1.AuditLog log = new Domain1.AuditLog("log");
-    
-    private Domain1.Bar bar = new Domain1.Bar("bar");
-    
-    private Domain1.Calendar calendar = new Domain1.Calendar("calendar");
-    
-    private Domain1.Cat cat = new Domain1.Cat("cat");
-    private Domain1.Cat fatcat = new Domain1.Cat("fatcat");
-    private Domain1.Cat kittens = new Domain1.Cat("kittens");
-    private Domain1.Cat kitten = new Domain1.Cat("kitten");
-    private Domain1.Cat kit = new Domain1.Cat("kit");
-    private Domain1.Cat mate = new Domain1.Cat("mate");
-    private Domain1.Cat mother = new Domain1.Cat("mother");
-    private Domain1.Cat offspr = new Domain1.Cat("offspr");
-    private Domain1.Cat qat = new Domain1.Cat("qat");
-    private Domain1.Cat rival = new Domain1.Cat("rival");
-    
-    private Domain1.doofus d = new Domain1.doofus("d");
-    
-    private Domain1.Customer cust = new Domain1.Customer("cust");
-    
-    private Domain1.Foo foo = new Domain1.Foo("foo");
-    
-    private Domain1.Formula form = new Domain1.Formula("form");
-    
-    private Domain1.Item item = new Domain1.Item("item");
-    
-    private Domain1.Name name = new Domain1.Name("name");
-    
-    private Domain1.Named m = new Domain1.Named("m");
-    private Domain1.Named n = new Domain1.Named("n");
-    
-    private Domain1.NameList list = new Domain1.NameList("list");
-    
-    private Domain1.Order ord = new Domain1.Order("ord");
-    
-    private Domain1.Payment payment = new Domain1.Payment("payment");
-    
-    private Domain1.Parameter param = new Domain1.Parameter("param");
-    
-    private Domain1.Person person = new Domain1.Person("person");    
-    private Domain1.Person p = new Domain1.Person("p");
-    
-    private Domain1.Player player = new Domain1.Player("player");
-    
-    private Domain1.Product prod = new Domain1.Product("prod");
-    
-    private Domain1.Store store = new Domain1.Store("store");
-        
+public class HqlParserTest extends HqlQueryBase<HqlParserTest> implements Domain1Instances{
     
     /**
      * Section 9.2 - from *