Skip to content

Commit

Permalink
WFLY-1077 IIOP subsystem: Restore JdkORBSubsystemTestCase
Browse files Browse the repository at this point in the history
  • Loading branch information
tadamski committed Jan 13, 2015
1 parent 9225b9c commit cbc151c
Show file tree
Hide file tree
Showing 6 changed files with 192 additions and 18 deletions.
188 changes: 188 additions & 0 deletions jdkorb/src/test/java/org/jboss/as/jdkorb/JdkORBSubsystemTestCase.java
@@ -0,0 +1,188 @@
/*
* JBoss, Home of Professional Open Source.
* Copyright 2011, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.as.jdkorb;

import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;

import javax.xml.stream.XMLStreamException;

import java.io.IOException;
import java.util.List;

import org.jboss.as.controller.PathAddress;
import org.jboss.as.controller.PathElement;
import org.jboss.as.jdkorb.ORBExtension;
import org.jboss.as.jdkorb.ORBSubsystemParser;
import org.jboss.as.model.test.ModelTestUtils;
import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest;
import org.jboss.as.subsystem.test.AdditionalInitialization;
import org.jboss.as.subsystem.test.ControllerInitializer;
import org.jboss.as.subsystem.test.KernelServices;
import org.jboss.dmr.ModelNode;
import org.junit.Assert;
import org.junit.Test;

/**
* <ṕ>
* JdkORB subsystem tests.
* </ṕ>
*
* @author <a href="kabir.khan@jboss.com">Kabir Khan</a>
* @author <a href="sguilhen@jboss.com">Stefan Guilhen</a>
*/
public class JdkORBSubsystemTestCase extends AbstractSubsystemBaseTest {

public JdkORBSubsystemTestCase() {
super(ORBExtension.SUBSYSTEM_NAME, new ORBExtension());
}

@Override
protected String getSubsystemXml() throws IOException {
return readResource("subsystem-1.0.xml");
}

@Override
protected String getSubsystemXml(String configId) throws IOException {
return readResource(configId);
}

@Test
public void testExpressions() throws Exception {
standardSubsystemTest("expressions-1.0.xml");
}

@Test
public void testParseEmptySubsystem() throws Exception {
// parse the subsystem xml into operations.
String subsystemXml =
"<subsystem xmlns=\"" +ORBSubsystemParser.Namespace.CURRENT.getUriString() + "\">" +
"</subsystem>";
List<ModelNode> operations = super.parse(subsystemXml);

// check that we have the expected number of operations.
Assert.assertEquals(1, operations.size());

// check that each operation has the correct content.
ModelNode addSubsystem = operations.get(0);
Assert.assertEquals(ADD, addSubsystem.get(OP).asString());
PathAddress addr = PathAddress.pathAddress(addSubsystem.get(OP_ADDR));
Assert.assertEquals(1, addr.size());
PathElement element = addr.getElement(0);
Assert.assertEquals(SUBSYSTEM, element.getKey());
Assert.assertEquals(ORBExtension.SUBSYSTEM_NAME, element.getValue());
}

@Test
public void testParseSubsystemWithBadChild() throws Exception {
// try parsing a XML with an invalid element.
String subsystemXml =
"<subsystem xmlns=\"" + ORBSubsystemParser.Namespace.CURRENT.getUriString() + "\">" +
" <invalid/>" +
"</subsystem>";
try {
super.parse(subsystemXml);
Assert.fail("Should not have parsed bad child");
} catch (XMLStreamException expected) {
}

// now try parsing a valid element in an invalid position.
subsystemXml =
"<subsystem xmlns=\"urn:jboss:domain:jdkorb:1.0\">" +
" <orb name=\"JBoss\" print-version=\"off\">" +
" <poa/>" +
" </orb>" +
"</subsystem>";
try {
super.parse(subsystemXml);
Assert.fail("Should not have parsed bad child");
} catch (XMLStreamException expected) {
}

}

@Test
public void testParseSubsystemWithBadAttribute() throws Exception {
String subsystemXml =
"<subsystem xmlns=\"" + ORBSubsystemParser.Namespace.CURRENT.getUriString() + "\" bad=\"very_bad\">" +
"</subsystem>";
try {
super.parse(subsystemXml);
Assert.fail("Should not have parsed bad attribute");
} catch (XMLStreamException expected) {
}
}

@Test
public void testDescribeHandler() throws Exception {
// parse the subsystem xml and install into the first controller.
String subsystemXml =
"<subsystem xmlns=\"" + ORBSubsystemParser.Namespace.CURRENT.getUriString() + "\">" +
"</subsystem>";

AdditionalInitialization additionalInit = new AdditionalInitialization(){
@Override
protected void setupController(ControllerInitializer controllerInitializer) {
controllerInitializer.addSocketBinding("jdkorb", 3528);
controllerInitializer.addSocketBinding("jdkorb-ssl", 3529);
}
};

KernelServices servicesA = createKernelServicesBuilder(additionalInit)
.setSubsystemXml(subsystemXml)
.build();
// get the model and the describe operations from the first controller.
ModelNode modelA = servicesA.readWholeModel();
ModelNode describeOp = new ModelNode();
describeOp.get(OP).set(DESCRIBE);
describeOp.get(OP_ADDR).set(
PathAddress.pathAddress(
PathElement.pathElement(SUBSYSTEM, ORBExtension.SUBSYSTEM_NAME)).toModelNode());
List<ModelNode> operations = checkResultAndGetContents(servicesA.executeOperation(describeOp)).asList();
servicesA.shutdown();

Assert.assertEquals(1, operations.size());

// install the describe options from the first controller into a second controller.
KernelServices servicesB = createKernelServicesBuilder(additionalInit).setBootOperations(operations).build();
ModelNode modelB = servicesB.readWholeModel();
servicesB.shutdown();

// make sure the models from the two controllers are identical.
super.compare(modelA, modelB);

}

@Test
public void testSubsystemWithSecurityIdentity() throws Exception {
super.standardSubsystemTest("subsystem-1.0-security-identity.xml");
}

@Test
public void testSubsystemWithSecurityClient() throws Exception {
super.standardSubsystemTest("subsystem-1.0-security-client.xml");
}

}
14 changes: 0 additions & 14 deletions jdkorb/src/test/resources/org/jboss/as/jacorb/subsystem-1.0.xml

This file was deleted.

@@ -1,4 +1,4 @@
<subsystem xmlns="urn:jboss:domain:jacorb:1.3">
<subsystem xmlns="urn:jboss:domain:jdkorb:1.0">
<orb name="${test.exp:JBoss}" print-version="${test.exp:off}" use-imr="${test.exp:off}" use-bom="${test.exp:off}" cache-typecodes="${test.exp:off}"
cache-poa-names="${test.exp:off}" giop-minor-version ="${test.exp:2}" socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
<connection retries="${test.exp:5}" retry-interval="${test.exp:500}" client-timeout="${test.exp:0}" server-timeout="${test.exp:0}"
Expand Down
@@ -1,4 +1,4 @@
<subsystem xmlns="urn:jboss:domain:jacorb:1.3">
<subsystem xmlns="urn:jboss:domain:jdkorb:1.0">
<orb name="JBoss" print-version="off" use-imr="off" use-bom="off" cache-typecodes="off"
cache-poa-names="off" giop-minor-version ="2" socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
<connection retries="5" retry-interval="500" client-timeout="0" server-timeout="0"
Expand Down
@@ -1,4 +1,4 @@
<subsystem xmlns="urn:jboss:domain:jacorb:1.3">
<subsystem xmlns="urn:jboss:domain:jdkorb:1.0">
<orb name="JBoss" print-version="off" use-imr="off" use-bom="off" cache-typecodes="off"
cache-poa-names="off" giop-minor-version ="2" socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
<connection retries="5" retry-interval="500" client-timeout="0" server-timeout="0"
Expand Down
@@ -1,4 +1,4 @@
<subsystem xmlns="urn:jboss:domain:jacorb:1.3">
<subsystem xmlns="urn:jboss:domain:jdkorb:1.0">
<orb name="JBoss" print-version="off" use-imr="off" use-bom="off" cache-typecodes="off"
cache-poa-names="off" giop-minor-version ="2" socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
<connection retries="5" retry-interval="500" client-timeout="0" server-timeout="0"
Expand Down

0 comments on commit cbc151c

Please sign in to comment.