Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
removed tests that have been ignored for years
- Loading branch information
Showing
3 changed files
with
566 additions
and
677 deletions.
There are no files selected for viewing
161 changes: 80 additions & 81 deletions
161
tests/src/tests/test/org/jppf/server/peer/TestMultiServerWithSSL.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,81 +1,80 @@ | ||
| /* | ||
| * JPPF. | ||
| * Copyright (C) 2005-2018 JPPF Team. | ||
| * http://www.jppf.org | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package test.org.jppf.server.peer; | ||
|
|
||
| import org.jppf.node.policy.Equal; | ||
| import org.junit.*; | ||
|
|
||
| import test.org.jppf.test.setup.*; | ||
|
|
||
| /** | ||
| * Test a multi-server topology with 2 servers, 1 node attached to each server and 1 client, | ||
| * all setup with SSL 2-way authentication. | ||
| * @author Laurent Cohen | ||
| */ | ||
| //@Ignore | ||
| public class TestMultiServerWithSSL extends AbstractNonStandardSetup { | ||
| /** | ||
| * Launches a 2 drivers with 1 node attached to each and start the client, | ||
| * all setup with 2-way SSL authentication. | ||
| * @throws Exception if a process could not be started. | ||
| */ | ||
| @BeforeClass | ||
| public static void setup() throws Exception { | ||
| final TestConfiguration config = createConfig("ssl2_p2p"); | ||
| config.driver.log4j = "classes/tests/config/ssl2_p2p/log4j-driver.template.properties"; | ||
| config.node.log4j = "classes/tests/config/ssl2_p2p/log4j-node.template.properties"; | ||
| client = BaseSetup.setup(2, 2, true, false, config); | ||
| } | ||
|
|
||
| /** | ||
| * Wait until each driver has 1 idle node. | ||
| * @throws Exception if any error occurs. | ||
| */ | ||
| @Before | ||
| public void instanceSetup() throws Exception { | ||
| awaitPeersInitialized(15_000L); | ||
| } | ||
|
|
||
| /** | ||
| * Test a simple job. | ||
| * @throws Exception if any error occurs. | ||
| */ | ||
| @Test(timeout = 10000) | ||
| public void testSimpleJob() throws Exception { | ||
| super.testSimpleJob(new Equal("jppf.ssl.server.port", 12101)); | ||
| } | ||
|
|
||
| @Override | ||
| @Test(timeout = 15000) | ||
| public void testMultipleJobs() throws Exception { | ||
| super.testMultipleJobs(); | ||
| } | ||
|
|
||
| @Override | ||
| @Test(timeout = 10000) | ||
| public void testCancelJob() throws Exception { | ||
| super.testCancelJob(); | ||
| } | ||
|
|
||
| @Override | ||
| @Test(timeout = 5000) | ||
| public void testNotSerializableExceptionFromNode() throws Exception { | ||
| super.testNotSerializableExceptionFromNode(); | ||
| } | ||
| } | ||
| /* | ||
| * JPPF. | ||
| * Copyright (C) 2005-2018 JPPF Team. | ||
| * http://www.jppf.org | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package test.org.jppf.server.peer; | ||
|
|
||
| import org.jppf.node.policy.Equal; | ||
| import org.junit.*; | ||
|
|
||
| import test.org.jppf.test.setup.*; | ||
|
|
||
| /** | ||
| * Test a multi-server topology with 2 servers, 1 node attached to each server and 1 client, | ||
| * all setup with SSL 2-way authentication. | ||
| * @author Laurent Cohen | ||
| */ | ||
| public class TestMultiServerWithSSL extends AbstractNonStandardSetup { | ||
| /** | ||
| * Launches a 2 drivers with 1 node attached to each and start the client, | ||
| * all setup with 2-way SSL authentication. | ||
| * @throws Exception if a process could not be started. | ||
| */ | ||
| @BeforeClass | ||
| public static void setup() throws Exception { | ||
| final TestConfiguration config = createConfig("ssl2_p2p"); | ||
| config.driver.log4j = "classes/tests/config/ssl2_p2p/log4j-driver.template.properties"; | ||
| config.node.log4j = "classes/tests/config/ssl2_p2p/log4j-node.template.properties"; | ||
| client = BaseSetup.setup(2, 2, true, false, config); | ||
| } | ||
|
|
||
| /** | ||
| * Wait until each driver has 1 idle node. | ||
| * @throws Exception if any error occurs. | ||
| */ | ||
| @Before | ||
| public void instanceSetup() throws Exception { | ||
| awaitPeersInitialized(15_000L); | ||
| } | ||
|
|
||
| /** | ||
| * Test a simple job. | ||
| * @throws Exception if any error occurs. | ||
| */ | ||
| @Test(timeout = 10000) | ||
| public void testSimpleJob() throws Exception { | ||
| super.testSimpleJob(new Equal("jppf.ssl.server.port", 12101)); | ||
| } | ||
|
|
||
| @Override | ||
| @Test(timeout = 15000) | ||
| public void testMultipleJobs() throws Exception { | ||
| super.testMultipleJobs(); | ||
| } | ||
|
|
||
| @Override | ||
| @Test(timeout = 10000) | ||
| public void testCancelJob() throws Exception { | ||
| super.testCancelJob(); | ||
| } | ||
|
|
||
| @Override | ||
| @Test(timeout = 5000) | ||
| public void testNotSerializableExceptionFromNode() throws Exception { | ||
| super.testNotSerializableExceptionFromNode(); | ||
| } | ||
| } |
109 changes: 54 additions & 55 deletions
109
tests/src/tests/test/org/jppf/server/peer/TestMultiServerWithSSLSetup.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,54 @@ | ||
| /* | ||
| * JPPF. | ||
| * Copyright (C) 2005-2018 JPPF Team. | ||
| * http://www.jppf.org | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package test.org.jppf.server.peer; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import test.org.jppf.test.setup.*; | ||
|
|
||
| /** | ||
| * Test a multi-server topology with 2 servers, 1 node attached to each server and 1 client, | ||
| * all setup with SSL 2-way authentication. | ||
| * @author Laurent Cohen | ||
| */ | ||
| //@Ignore | ||
| public class TestMultiServerWithSSLSetup extends AbstractNonStandardSetup { | ||
| /** | ||
| * Test timeout. | ||
| */ | ||
| private static final long TEST_TIMEOUT = 50_000L; | ||
| /** | ||
| * Test a simple job. | ||
| * @throws Exception if any error occurs. | ||
| */ | ||
| @Test(timeout = TEST_TIMEOUT) | ||
| public void testSetup() throws Exception { | ||
| final TestConfiguration cfg = createConfig("ssl2_p2p"); | ||
| cfg.driver.log4j = "classes/tests/config/ssl2_p2p/log4j-driver.template.properties"; | ||
| cfg.node.log4j = "classes/tests/config/ssl2_p2p/log4j-node.template.properties"; | ||
| print(false, false, ">>> setting up"); | ||
| TestConfigSource.setClientConfig(cfg.clientConfig); | ||
| BaseSetup.setup(2, 2, false, false, cfg); | ||
| //SSLHelper.resetConfig(); | ||
| //JPPFConfiguration.reset(); | ||
| //print(false, false, ">>> setup complete, awaiting peers initialized; configuration:%n%s", JPPFConfiguration.getProperties().asString()); | ||
| //awaitPeersInitialized(15_000L); | ||
| checkPeers(TEST_TIMEOUT, true); | ||
| print(false, false, ">>> initialization complete"); | ||
| } | ||
| } | ||
| /* | ||
| * JPPF. | ||
| * Copyright (C) 2005-2018 JPPF Team. | ||
| * http://www.jppf.org | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package test.org.jppf.server.peer; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import test.org.jppf.test.setup.*; | ||
|
|
||
| /** | ||
| * Test a multi-server topology with 2 servers, 1 node attached to each server and 1 client, | ||
| * all setup with SSL 2-way authentication. | ||
| * @author Laurent Cohen | ||
| */ | ||
| public class TestMultiServerWithSSLSetup extends AbstractNonStandardSetup { | ||
| /** | ||
| * Test timeout. | ||
| */ | ||
| private static final long TEST_TIMEOUT = 50_000L; | ||
| /** | ||
| * Test a simple job. | ||
| * @throws Exception if any error occurs. | ||
| */ | ||
| @Test(timeout = TEST_TIMEOUT) | ||
| public void testSetup() throws Exception { | ||
| final TestConfiguration cfg = createConfig("ssl2_p2p"); | ||
| cfg.driver.log4j = "classes/tests/config/ssl2_p2p/log4j-driver.template.properties"; | ||
| cfg.node.log4j = "classes/tests/config/ssl2_p2p/log4j-node.template.properties"; | ||
| print(false, false, ">>> setting up"); | ||
| TestConfigSource.setClientConfig(cfg.clientConfig); | ||
| BaseSetup.setup(2, 2, false, false, cfg); | ||
| //SSLHelper.resetConfig(); | ||
| //JPPFConfiguration.reset(); | ||
| //print(false, false, ">>> setup complete, awaiting peers initialized; configuration:%n%s", JPPFConfiguration.getProperties().asString()); | ||
| //awaitPeersInitialized(15_000L); | ||
| checkPeers(TEST_TIMEOUT, true); | ||
| print(false, false, ">>> initialization complete"); | ||
| } | ||
| } |
Oops, something went wrong.