Merge pull request wildfly-extras#71 from mchoma/elytron

Use predefined provider loaders for testing.
olukas · Mar 6, 2017 · fbb1449 · fbb1449
2 parents 38da0e6 + 89b741c
commit fbb1449
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/...extras/creaper/commands/elytron/http/AddProviderHttpServerMechanismFactoryOnlineTest.java b/...extras/creaper/commands/elytron/http/AddProviderHttpServerMechanismFactoryOnlineTest.java
@@ -5,7 +5,6 @@
 
 import org.jboss.arquillian.junit.Arquillian;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.wildfly.extras.creaper.commands.elytron.AbstractElytronOnlineTest;
@@ -24,8 +23,8 @@ public class AddProviderHttpServerMechanismFactoryOnlineTest extends AbstractEly
     private static final Address TEST_SERVER_MECHANISM_FACTORY_ADDRESS2 = SUBSYSTEM_ADDRESS
             .and("provider-http-server-mechanism-factory", TEST_SERVER_MECHANISM_FACTORY_NAME2);
 
-    private static final String PROVIDER_LOADER_NAME = "someProviderLoader";
-    private static final String PROVIDER_LOADER_NAME2 = "someProviderLoader2";
+    private static final String PROVIDER_LOADER_NAME = "elytron";
+    private static final String PROVIDER_LOADER_NAME2 = "combined-providers";
 
     @After
     public void cleanup() throws Exception {
@@ -66,7 +65,6 @@ public void addTwoProviderHttpServerMechanismFactories() throws Exception {
     }
 
     @Test
-    @Ignore("missing command for adding provider-loader")
     public void addFullProviderHttpServerMechanismFactory() throws Exception {
         AddProviderHttpServerMechanismFactory addProviderHttpServerMechanismFactory
                 = new AddProviderHttpServerMechanismFactory.Builder(TEST_SERVER_MECHANISM_FACTORY_NAME)
@@ -83,7 +81,6 @@ public void addFullProviderHttpServerMechanismFactory() throws Exception {
     }
 
     @Test(expected = CommandFailedException.class)
-    @Ignore("missing command for adding provider-loader")
     public void addExistProviderHttpServerMechanismFactoryNotAllowed() throws Exception {
         AddProviderHttpServerMechanismFactory addProviderHttpServerMechanismFactory
                 = new AddProviderHttpServerMechanismFactory.Builder(TEST_SERVER_MECHANISM_FACTORY_NAME)
@@ -103,7 +100,6 @@ public void addExistProviderHttpServerMechanismFactoryNotAllowed() throws Except
     }
 
     @Test
-    @Ignore("missing command for adding provider-loader")
     public void addExistProviderHttpServerMechanismFactoryAllowed() throws Exception {
         AddProviderHttpServerMechanismFactory addProviderHttpServerMechanismFactory
                 = new AddProviderHttpServerMechanismFactory.Builder(TEST_SERVER_MECHANISM_FACTORY_NAME)

diff --git a/.../wildfly/extras/creaper/commands/elytron/sasl/AddProviderSaslServerFactoryOnlineTest.java b/.../wildfly/extras/creaper/commands/elytron/sasl/AddProviderSaslServerFactoryOnlineTest.java
@@ -5,7 +5,6 @@
 
 import org.jboss.arquillian.junit.Arquillian;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.wildfly.extras.creaper.commands.elytron.AbstractElytronOnlineTest;
@@ -22,8 +21,8 @@ public class AddProviderSaslServerFactoryOnlineTest extends AbstractElytronOnlin
     private static final Address TEST_SERVER_FACTORY_ADDRESS2 = SUBSYSTEM_ADDRESS
             .and("provider-sasl-server-factory", TEST_SERVER_FACTORY_NAME2);
 
-    private static final String PROVIDER_LOADER_NAME = "someProviderLoader";
-    private static final String PROVIDER_LOADER_NAME2 = "someProviderLoader2";
+    private static final String PROVIDER_LOADER_NAME = "elytron";
+    private static final String PROVIDER_LOADER_NAME2 = "combined-providers";
 
     @After
     public void cleanup() throws Exception {
@@ -61,7 +60,6 @@ public void addTwoProviderSaslServerFactories() throws Exception {
     }
 
     @Test
-    @Ignore("missing command for adding provider-loader")
     public void addFullProviderSaslServerFactory() throws Exception {
         AddProviderSaslServerFactory addProviderSaslServerFactory
                 = new AddProviderSaslServerFactory.Builder(TEST_SERVER_FACTORY_NAME)
@@ -77,7 +75,6 @@ public void addFullProviderSaslServerFactory() throws Exception {
     }
 
     @Test(expected = CommandFailedException.class)
-    @Ignore("missing command for adding provider-loader")
     public void addExistProviderSaslServerFactoryNotAllowed() throws Exception {
         AddProviderSaslServerFactory addProviderSaslServerFactory
                 = new AddProviderSaslServerFactory.Builder(TEST_SERVER_FACTORY_NAME)
@@ -96,7 +93,6 @@ public void addExistProviderSaslServerFactoryNotAllowed() throws Exception {
     }
 
     @Test
-    @Ignore("missing command for adding provider-loader")
     public void addExistProviderSaslServerFactoryAllowed() throws Exception {
         AddProviderSaslServerFactory addProviderSaslServerFactory
                 = new AddProviderSaslServerFactory.Builder(TEST_SERVER_FACTORY_NAME)