[ENTESB-4090] Fixing fuse integration (Fuse hack breaks kie-remote-cl…

…ient usage in Fuse code)

drools-compiler/src/test/java/org/drools/compiler/CommonTestMethodBase.java

@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -62,8 +62,18 @@
 public class CommonTestMethodBase extends Assert {
 	public static RuleEngineOption phreak = RuleEngineOption.PHREAK;
 
+	protected KieSession createKieSession(KieBase kbase) {
+		return kbase.newKieSession();
+	}
+
+	protected KieSession createKieSession(KieBase kbase, KieSessionOption option) {
+		KieSessionConfiguration ksconf = KnowledgeBaseFactory.newKnowledgeSessionConfiguration();
+		ksconf.setOption(option);
+		return kbase.newKieSession(ksconf, null);
+	}
+
 	protected StatefulKnowledgeSession createKnowledgeSession(KnowledgeBase kbase) {
-		return kbase.newStatefulKnowledgeSession();
+	    return kbase.newStatefulKnowledgeSession();
 	}
 
 	protected StatefulKnowledgeSession createKnowledgeSession(KnowledgeBase kbase, KieSessionOption option) {
@@ -267,7 +277,7 @@ protected InternalAgenda getInternalAgenda(StatefulKnowledgeSession session) {
 		return (InternalAgenda) session.getAgenda();
 	}
 
-	public static byte[] createJar(KieServices ks, 
+	public static byte[] createJar(KieServices ks,
 			                       ReleaseId releaseId,
 			                       String... drls) {
 		KieFileSystem kfs = ks.newKieFileSystem().generateAndWritePomXML(
@@ -278,7 +288,7 @@ public static byte[] createJar(KieServices ks,
 			}
 		}
 		KieBuilder kb = ks.newKieBuilder(kfs).buildAll();
-		assertFalse( kb.getResults().getMessages(org.kie.api.builder.Message.Level.ERROR).toString(), 
+		assertFalse( kb.getResults().getMessages(org.kie.api.builder.Message.Level.ERROR).toString(),
 		        kb.getResults().hasMessages(org.kie.api.builder.Message.Level.ERROR) );
 		InternalKieModule kieModule = (InternalKieModule) ks.getRepository()
 				.getKieModule(releaseId);

drools-compiler/src/test/java/org/drools/compiler/Person.java

@@ -26,7 +26,11 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
 @Traitable
+@XmlAccessorType(XmlAccessType.FIELD)
 public class Person
         implements
         Serializable,
@@ -50,13 +54,13 @@ public class Person
 
     private Address address;
     private Pet pet;
-    
+
     private List<Address> addresses = new ArrayList<Address>();
     private Map<Object, Address> namedAddresses = new HashMap<Object, Address>(0);
-    
+
 
     public Object object;
-    
+
     public Object notInEqualTestObject;
 
     public Person() {
@@ -91,10 +95,10 @@ public Option<Address> getAddressOption() {
     public List<Address> getAddresses() {
         return addresses;
     }
-    
+
     public List getAddressesNoGenerics() {
         return addresses;
-    }    
+    }
 
     public void setAddresses(List<Address> addresses) {
         this.addresses = addresses;
@@ -353,6 +357,6 @@ public Object getObject() {
 
     public void setObject(Object object) {
         this.object = object;
-    }    
+    }
 
 }

drools-compiler/src/test/java/org/drools/compiler/beliefsystem/abductive/AbductionTest.java

@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -17,13 +17,15 @@
 
 import org.drools.compiler.CommonTestMethodBase;
 import org.drools.core.BeliefSystemType;
+import org.drools.core.QueryResultsImpl;
 import org.drools.core.SessionConfiguration;
 import org.drools.core.beliefsystem.BeliefSet;
 import org.drools.core.beliefsystem.abductive.Abducible;
 import org.drools.core.beliefsystem.defeasible.Defeasible;
 import org.drools.core.common.EqualityKey;
 import org.drools.core.common.InternalFactHandle;
 import org.drools.core.factmodel.traits.Thing;
+import org.drools.core.runtime.rule.impl.FlatQueryResults;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.kie.api.KieBase;
@@ -918,9 +920,9 @@ public void testQueryAPIs() {
         assertNotNull( q1 );
         assertNotNull( q2 );
 
-        QueryResults q10res = session.getQueryResults( "foo", "foo" );
-        QueryResults q11res = session.getQueryResults( "foo", "foo", Variable.v );
-        QueryResults q20res = session.getQueryResults( "bar", "foo", Variable.v );
+        QueryResults q10res = new FlatQueryResults((QueryResultsImpl) session.getQueryResults( "foo", "foo" ));
+        QueryResults q11res = new FlatQueryResults((QueryResultsImpl) session.getQueryResults( "foo", "foo", Variable.v ));
+        QueryResults q20res = new FlatQueryResults((QueryResultsImpl) session.getQueryResults( "bar", "foo", Variable.v ));
 
         assertEquals( 1, q10res.size() );
         assertEquals( 1, q11res.size() );

drools-compiler/src/test/java/org/drools/compiler/integrationtests/AccumulateTest.java

@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -2977,10 +2977,6 @@ public void testNoLoopAccumulate() {
         assertEquals( 2, counter.get() );
     }
 
-    private KieSession createKieSession( KieBase kbase ) {
-        return kbase.newKieSession();
-    }
-
     private KieSession getKieSessionFromResources( String... classPathResources ) {
         KieBase kbase = loadKnowledgeBase( null, null, classPathResources );
         return kbase.newKieSession();