Skip to content

Commit

Permalink
WELD-1059 System property based scanning tests fail in container - fi…
Browse files Browse the repository at this point in the history 
…xed, refactored, switched to JUnitAssert
  • Loading branch information
@jharting
Ron Smeral authored and jharting committed Nov 14, 2012
1 parent 3a8a750 commit 21d8bc3
Show file tree
Hide file tree
Showing 7 changed files with 148 additions and 146 deletions.
93 changes: 43 additions & 50 deletions ...org/jboss/weld/tests/metadata/scanning/ClassAvailableAndSystemPropertyActivationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.jboss.weld.tests.metadata.scanning;

import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
Expand All @@ -9,73 +10,65 @@
import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.tests.metadata.Qux;
import static org.jboss.weld.tests.metadata.scanning.SystemPropertyExtension.*;
import static org.jboss.weld.tests.metadata.scanning.Utils.createBeansXml;
import org.jboss.weld.tests.metadata.scanning.acme.Wibble;
import org.jboss.weld.tests.metadata.scanning.acme.corp.Wubble;
import org.jboss.weld.tests.metadata.scanning.jboss.Baz;
import org.junit.Ignore;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.runner.RunWith;

import static org.jboss.weld.tests.metadata.scanning.Utils.createBeansXml;

@RunWith(Arquillian.class)
@Ignore("WELD-1059")
public class ClassAvailableAndSystemPropertyActivationTest {

public static final String TEST1_PROPERTY = ClassAvailableAndSystemPropertyActivationTest.class + ".test1";
public static final String TEST1_VALUE = "meh1";
public static final String TEST2_PROPERTY = ClassAvailableAndSystemPropertyActivationTest.class + ".test2";
public static final String TEST2_VALUE = "meh2";
public static final String TEST3_PROPERTY = ClassAvailableAndSystemPropertyActivationTest.class + ".test3";

public static final Asset BEANS_XML = createBeansXml(
"<weld:scan>" +
"<weld:include name=\"" + Bar.class.getName() + "\">" +
"<weld:if-class-available name=\"" + Qux.class.getName() + "\" />" +
"<weld:if-system-property name=\"" + TEST1_PROPERTY + "\" />" +
"<weld:if-system-property name=\"" + TEST2_PROPERTY + "\" value=\"" + TEST2_VALUE + "\" />" +
"</weld:include>" +
"<weld:include name=\"" + Foo.class.getName() + "\">" +
"<weld:if-class-available name=\"com.acme.SomeMadeUpClass\" />" +
"<weld:if-system-property name=\"" + TEST3_PROPERTY + "\" />" +
"<weld:if-system-property name=\"" + TEST2_PROPERTY + "\" value=\"" + TEST2_VALUE + "\" />" +
"</weld:include>" +
"<weld:include name=\"" + Corge.class.getName() + "\">" +
"<weld:if-class-available name=\"com.acme.SomeMadeUpClass\" />" +
"<weld:if-system-property name=\"" + TEST1_PROPERTY + "\" />" +
"<weld:if-system-property name=\"" + TEST2_PROPERTY + "\" value=\"" + TEST2_VALUE + "\" />" +
"</weld:include>" +
"<weld:include name=\"" + Wibble.class.getName() + "\">" +
"<weld:if-class-available name=\"" + Qux.class.getName() + "\" />" +
"<weld:if-system-property name=\"!" + TEST3_PROPERTY + "\" />" +
"<weld:if-system-property name=\"" + TEST2_PROPERTY + "\" value=\"" + TEST2_VALUE + "\" />" +
"</weld:include>" +
"<weld:include name=\"" + Wubble.class.getName() + "\">" +
"<weld:if-class-available name=\"" + Qux.class.getName() + "\" />" +
"<weld:if-system-property name=\"" + TEST1_PROPERTY + "\" />" +
"<weld:if-system-property name=\"" + TEST2_PROPERTY + "\" value=\"!" + TEST2_VALUE + "\" />" +
"</weld:include>" +
"</weld:scan>");
"<weld:scan>"
+ "<weld:include name=\"" + Bar.class.getName() + "\">"
+ "<weld:if-class-available name=\"" + Qux.class.getName() + "\" />"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_1 + "\" />"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_2 + "\" value=\"" + SET_PROPERTY_2_VALUE + "\" />"
+ "</weld:include>"
+ "<weld:include name=\"" + Foo.class.getName() + "\">"
+ "<weld:if-class-available name=\"com.acme.SomeMadeUpClass\" />"
+ "<weld:if-system-property name=\"" + UNSET_PROPERTY_1 + "\" />"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_2 + "\" value=\"" + SET_PROPERTY_2_VALUE + "\" />"
+ "</weld:include>"
+ "<weld:include name=\"" + Corge.class.getName() + "\">"
+ "<weld:if-class-available name=\"com.acme.SomeMadeUpClass\" />"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_1 + "\" />"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_2 + "\" value=\"" + SET_PROPERTY_2_VALUE + "\" />"
+ "</weld:include>"
+ "<weld:include name=\"" + Wibble.class.getName() + "\">"
+ "<weld:if-class-available name=\"" + Qux.class.getName() + "\" />"
+ "<weld:if-system-property name=\"!" + UNSET_PROPERTY_1 + "\" />"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_2 + "\" value=\"" + SET_PROPERTY_2_VALUE + "\" />"
+ "</weld:include>"
+ "<weld:include name=\"" + Wubble.class.getName() + "\">"
+ "<weld:if-class-available name=\"" + Qux.class.getName() + "\" />"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_1 + "\" />"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_2 + "\" value=\"!" + SET_PROPERTY_2_VALUE + "\" />"
+ "</weld:include>"
+ "</weld:scan>");

@Deployment
public static Archive<?> deployment() {
System.setProperty(TEST1_PROPERTY, TEST1_VALUE);
System.setProperty(TEST2_PROPERTY, TEST2_VALUE);
return ShrinkWrap.create(JavaArchive.class).addClass(Utils.class)
return ShrinkWrap.create(JavaArchive.class)
.addClass(Utils.class)
.addClasses(Bar.class, Foo.class, Baz.class, Qux.class, Corge.class, Wibble.class, Wubble.class)
.addAsManifestResource(BEANS_XML, "beans.xml");
.addClasses(SystemPropertyExtension.class)
.addAsManifestResource(BEANS_XML, "beans.xml")
.addAsServiceProvider(Extension.class, SystemPropertyExtension.class);
}

@Test
public void test(BeanManager beanManager) {
assert beanManager.getBeans(Bar.class).size() == 1;
assert beanManager.getBeans(Corge.class).size() == 0;
assert beanManager.getBeans(Qux.class).size() == 0;
assert beanManager.getBeans(Foo.class).size() == 0;
assert beanManager.getBeans(Baz.class).size() == 0;
assert beanManager.getBeans(Wibble.class).size() == 1;
assert beanManager.getBeans(Wubble.class).size() == 0;

assertEquals(1, beanManager.getBeans(Bar.class).size());
assertEquals(0, beanManager.getBeans(Foo.class).size());
assertEquals(0, beanManager.getBeans(Corge.class).size());
assertEquals(1, beanManager.getBeans(Wibble.class).size());
assertEquals(0, beanManager.getBeans(Wubble.class).size());
assertEquals(0, beanManager.getBeans(Qux.class).size());
assertEquals(0, beanManager.getBeans(Baz.class).size());
}

}
42 changes: 20 additions & 22 deletions ...an/src/test/java/org/jboss/weld/tests/metadata/scanning/SystemPropertyActivationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.jboss.weld.tests.metadata.scanning;

import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
Expand All @@ -10,43 +11,40 @@
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.tests.metadata.Qux;
import org.jboss.weld.tests.metadata.scanning.jboss.Baz;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.assertEquals;
import static org.jboss.weld.tests.metadata.scanning.Utils.createBeansXml;
import static org.jboss.weld.tests.metadata.scanning.SystemPropertyExtension.*;

@RunWith(Arquillian.class)
@Ignore("WELD-1059")
public class SystemPropertyActivationTest {

public static final String TEST1_PROPERTY = SystemPropertyActivationTest.class + ".test1";
public static final String TEST2_PROPERTY = SystemPropertyActivationTest.class + ".test2";

public static final Asset BEANS_XML = createBeansXml(
"<weld:scan>" +
"<weld:include name=\"" + Bar.class.getName() + "\">" +
"<weld:if-system-property name=\"" + TEST1_PROPERTY + "\" />" +
"</weld:include>" +
"<weld:include name=\"" + Foo.class.getName() + "\">" +
"<weld:if-system-property name=\"" + TEST2_PROPERTY + "\" />" +
"</weld:include>" +
"</weld:scan>");
"<weld:scan>"
+ "<weld:include name=\"" + Bar.class.getName() + "\">"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_1 + "\" />"
+ "</weld:include>"
+ "<weld:include name=\"" + Foo.class.getName() + "\">"
+ "<weld:if-system-property name=\"" + UNSET_PROPERTY_1 + "\" />"
+ "</weld:include>"
+ "</weld:scan>");

@Deployment
public static Archive<?> deployment() {
System.setProperty(TEST1_PROPERTY, TEST1_PROPERTY);
return ShrinkWrap.create(JavaArchive.class).addClass(Utils.class)
return ShrinkWrap.create(JavaArchive.class)
.addClass(Utils.class)
.addClasses(Bar.class, Foo.class, Baz.class, Qux.class)
.addAsManifestResource(BEANS_XML, "beans.xml");
.addClasses(SystemPropertyExtension.class)
.addAsManifestResource(BEANS_XML, "beans.xml")
.addAsServiceProvider(Extension.class, SystemPropertyExtension.class);
}

@Test
public void test(BeanManager beanManager) {
assert beanManager.getBeans(Bar.class).size() == 1;
assert beanManager.getBeans(Qux.class).size() == 0;
assert beanManager.getBeans(Foo.class).size() == 0;
assert beanManager.getBeans(Baz.class).size() == 0;
assertEquals(1, beanManager.getBeans(Bar.class).size());
assertEquals(0, beanManager.getBeans(Qux.class).size());
assertEquals(0, beanManager.getBeans(Foo.class).size());
assertEquals(0, beanManager.getBeans(Baz.class).size());
}

}
20 changes: 20 additions & 0 deletions ...uillian/src/test/java/org/jboss/weld/tests/metadata/scanning/SystemPropertyExtension.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package org.jboss.weld.tests.metadata.scanning;

import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;

public class SystemPropertyExtension implements Extension {

public static final String SET_PROPERTY_1 = SystemPropertyExtension.class.getPackage().getName() + ".setProperty1";
public static final String SET_PROPERTY_1_VALUE = SystemPropertyExtension.class.getPackage().getName() + ".setProperty1Value";
public static final String SET_PROPERTY_2 = SystemPropertyExtension.class.getPackage().getName() + ".setProperty2";
public static final String SET_PROPERTY_2_VALUE = SystemPropertyExtension.class.getPackage().getName() + ".setProperty2Value";
public static final String SET_PROPERTY_2_OTHER_VALUE = SystemPropertyExtension.class.getPackage().getName() + ".setProperty2ValueOther";
public static final String UNSET_PROPERTY_1 = SystemPropertyExtension.class.getPackage().getName() + ".testUnsetProperty1";

public void setProperties(@Observes BeforeBeanDiscovery event) {
System.setProperty(SET_PROPERTY_1, SET_PROPERTY_1_VALUE);
System.setProperty(SET_PROPERTY_2, SET_PROPERTY_2_VALUE);
}
}
45 changes: 22 additions & 23 deletions ...est/java/org/jboss/weld/tests/metadata/scanning/SystemPropertyInvertedActivationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
package org.jboss.weld.tests.metadata.scanning;

import static org.jboss.weld.tests.metadata.scanning.SystemPropertyExtension.SET_PROPERTY_1;
import static org.jboss.weld.tests.metadata.scanning.SystemPropertyExtension.UNSET_PROPERTY_1;
import static org.jboss.weld.tests.metadata.scanning.Utils.createBeansXml;
import static org.junit.Assert.assertEquals;

import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
Expand All @@ -10,43 +16,36 @@
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.tests.metadata.Qux;
import org.jboss.weld.tests.metadata.scanning.jboss.Baz;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;

import static org.jboss.weld.tests.metadata.scanning.Utils.createBeansXml;

@RunWith(Arquillian.class)
@Ignore("WELD-1059")
public class SystemPropertyInvertedActivationTest {

public static final String TEST1_PROPERTY = SystemPropertyInvertedActivationTest.class + ".test1";
public static final String TEST2_PROPERTY = SystemPropertyInvertedActivationTest.class + ".test2";

public static final Asset BEANS_XML = createBeansXml(
"<weld:scan>" +
"<weld:include name=\"" + Bar.class.getName() + "\">" +
"<weld:if-system-property name=\"!" + TEST1_PROPERTY + "\" />" +
"</weld:include>" +
"<weld:include name=\"" + Foo.class.getName() + "\">" +
"<weld:if-system-property name=\"!" + TEST2_PROPERTY + "\" />" +
"</weld:include>" +
"</weld:scan>");
"<weld:scan>"
+ "<weld:include name=\"" + Bar.class.getName() + "\">"
+ "<weld:if-system-property name=\"!" + SET_PROPERTY_1 + "\" />"
+ "</weld:include>"
+ "<weld:include name=\"" + Foo.class.getName() + "\">"
+ "<weld:if-system-property name=\"!" + UNSET_PROPERTY_1 + "\" />"
+ "</weld:include>"
+ "</weld:scan>");

@Deployment
public static Archive<?> deployment() {
System.setProperty(TEST1_PROPERTY, TEST1_PROPERTY);
return ShrinkWrap.create(JavaArchive.class).addClass(Utils.class)
return ShrinkWrap.create(JavaArchive.class)
.addClasses(Bar.class, Foo.class, Baz.class, Qux.class)
.addAsManifestResource(BEANS_XML, "beans.xml");
.addClass(Utils.class).addClasses(SystemPropertyExtension.class)
.addAsManifestResource(BEANS_XML, "beans.xml")
.addAsServiceProvider(Extension.class, SystemPropertyExtension.class);
}

@Test
public void test(BeanManager beanManager) {
assert beanManager.getBeans(Bar.class).size() == 0;
assert beanManager.getBeans(Qux.class).size() == 0;
assert beanManager.getBeans(Foo.class).size() == 1;
assert beanManager.getBeans(Baz.class).size() == 0;
assertEquals(0, beanManager.getBeans(Bar.class).size());
assertEquals(1, beanManager.getBeans(Foo.class).size());
assertEquals(0, beanManager.getBeans(Qux.class).size());
assertEquals(0, beanManager.getBeans(Baz.class).size());
}

}
49 changes: 23 additions & 26 deletions ...c/test/java/org/jboss/weld/tests/metadata/scanning/SystemPropertyValueActivationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.jboss.weld.tests.metadata.scanning;

import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
Expand All @@ -9,47 +10,43 @@
import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.tests.metadata.Qux;
import static org.jboss.weld.tests.metadata.scanning.SystemPropertyExtension.*;
import static org.jboss.weld.tests.metadata.scanning.Utils.createBeansXml;
import org.jboss.weld.tests.metadata.scanning.jboss.Baz;
import org.junit.Ignore;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.runner.RunWith;

import static org.jboss.weld.tests.metadata.scanning.Utils.createBeansXml;

@RunWith(Arquillian.class)
@Ignore("WELD-1059")
public class SystemPropertyValueActivationTest {

public static final String TEST1_PROPERTY = SystemPropertyValueActivationTest.class + ".test1";
public static final String TEST1_VALUE = "meh1";
public static final String TEST2_PROPERTY = SystemPropertyValueActivationTest.class + ".test2";
public static final String TEST2_VALUE = "meh2";

public static final Asset BEANS_XML = createBeansXml(
"<weld:scan>" +
"<weld:include name=\"" + Bar.class.getName() + "\">" +
"<weld:if-system-property name=\"" + TEST1_PROPERTY + "\" value=\"" + TEST1_VALUE + "\" />" +
"</weld:include>" +
"<weld:include name=\"" + Foo.class.getName() + "\">" +
"<weld:if-system-property name=\"" + TEST2_PROPERTY + "\" value=\"" + TEST2_VALUE + "\" />" +
"</weld:include>" +
"</weld:scan>");
"<weld:scan>"
+ "<weld:include name=\"" + Bar.class.getName() + "\">"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_1 + "\" value=\"" + SET_PROPERTY_1_VALUE + "\" />"
+ "</weld:include>"
+ "<weld:include name=\"" + Foo.class.getName() + "\">"
+ "<weld:if-system-property name=\"" + SET_PROPERTY_2 + "\" value=\"" + SET_PROPERTY_2_OTHER_VALUE + "\" />"
+ "</weld:include>"
+ "</weld:scan>");

@Deployment
public static Archive<?> deployment() {
System.setProperty(TEST1_PROPERTY, TEST1_VALUE);
System.setProperty(TEST2_PROPERTY, TEST2_PROPERTY);
return ShrinkWrap.create(JavaArchive.class).addClass(Utils.class)
return ShrinkWrap
.create(JavaArchive.class)
.addClass(Utils.class)
.addClasses(Bar.class, Foo.class, Baz.class, Qux.class)
.addAsManifestResource(BEANS_XML, "beans.xml");
.addClass(Utils.class)
.addClasses(SystemPropertyExtension.class)
.addAsManifestResource(BEANS_XML, "beans.xml")
.addAsServiceProvider(Extension.class, SystemPropertyExtension.class);
}

@Test
public void test(BeanManager beanManager) {
assert beanManager.getBeans(Bar.class).size() == 1;
assert beanManager.getBeans(Qux.class).size() == 0;
assert beanManager.getBeans(Foo.class).size() == 0;
assert beanManager.getBeans(Baz.class).size() == 0;
assertEquals(1, beanManager.getBeans(Bar.class).size());
assertEquals(0, beanManager.getBeans(Foo.class).size());
assertEquals(0, beanManager.getBeans(Qux.class).size());
assertEquals(0, beanManager.getBeans(Baz.class).size());
}

}
Loading

0 comments on commit 21d8bc3

Please sign in to comment.