From 0e527462aaa9eccd2e7e36adb6dfb4977705edf6 Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Tue, 15 May 2018 08:35:29 +0200
Subject: [PATCH] Enable CircularDependencyTest, add weld.properties, rename
 method.

---
 .../resolution/circular/CircularDependencyTest.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java
index 1630783386f..11007b446a3 100644
--- a/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java
+++ b/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/circular/CircularDependencyTest.java
@@ -23,14 +23,13 @@
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.BeanArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.weld.config.ConfigurationKey;
 import org.jboss.weld.test.util.Utils;
+import org.jboss.weld.tests.util.PropertiesBuilder;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-// We have to ignore this test until we have a solution to set/unset system properties for the JVM of the managed container
-@Ignore("WELD-1789")
 @RunWith(Arquillian.class)
 public class CircularDependencyTest {
 
@@ -40,11 +39,14 @@ public class CircularDependencyTest {
     @Deployment
     public static Archive<?> deploy() {
         return ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(CircularDependencyTest.class))
-                .addPackage(CircularDependencyTest.class.getPackage());
+            .addPackage(CircularDependencyTest.class.getPackage())
+            .addAsResource(PropertiesBuilder.newBuilder()
+                .set(ConfigurationKey.INJECTABLE_REFERENCE_OPTIMIZATION.get(), "true")
+                .build(), "weld.properties");
     }
 
     @Test
-    public void testCircularInjectionOnTwoSimpleDependentBeans() throws Exception {
+    public void testCircularInjectionBetweenAppScopedAndDependentBeans() throws Exception {
         foo.getName();
         Assert.assertTrue(Foo.success);
         Assert.assertTrue(Bar.success);