Repository: juddi Updated Branches: refs/heads/master 1f9ad6b8f -> b09a6fb77
JUDDI-978 adding missing checks for load testing, reducing the quantity of entities created during the load test to decrease build times. Some tck code cleanup Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/b09a6fb7 Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/b09a6fb7 Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/b09a6fb7 Branch: refs/heads/master Commit: b09a6fb7785a9c02675847577c3cc37a2a9cb84c Parents: 1f9ad6b Author: Alex O'Ree <[email protected]> Authored: Sat Oct 7 10:46:20 2017 -0400 Committer: Alex O'Ree <[email protected]> Committed: Sat Oct 7 10:46:20 2017 -0400 ---------------------------------------------------------------------- .../impl/API_040_BusinessServiceLoadTest.java | 2 + .../org/apache/juddi/v3/tck/TckPublisher.java | 58 +++++--------------- uddi-tck-base/src/main/resources/tck.properties | 2 +- 3 files changed, 16 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/b09a6fb7/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceLoadTest.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceLoadTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceLoadTest.java index 15aef45..7c95fcb 100644 --- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceLoadTest.java +++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceLoadTest.java @@ -32,6 +32,7 @@ import org.apache.juddi.v3.tck.TckSecurity; import org.apache.juddi.v3.tck.TckTModel; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -102,6 +103,7 @@ public class API_040_BusinessServiceLoadTest { //@Ignore public void find20Businesses() throws DispositionReportFaultMessage, ConfigurationException { //disable TModelBag filtering + Assume.assumeTrue(TckPublisher.isLoadTest()); try { //logger.info("Disabling findBusiness tModelBag filtering...."); //AppConfig.getConfiguration().setProperty(Property.JUDDI_ENABLE_FIND_BUSINESS_TMODEL_BAG_FILTERING, false); http://git-wip-us.apache.org/repos/asf/juddi/blob/b09a6fb7/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java ---------------------------------------------------------------------- diff --git a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java index 8259d6d..da6e4f1 100644 --- a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java +++ b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java @@ -58,12 +58,13 @@ public class TckPublisher { } tckProperties.load(inputSteam); } catch (IOException ioe) { - ioe.printStackTrace(); + logger.warn(ioe); } finally { if (inputSteam != null) { try { inputSteam.close(); } catch (Exception ex) { + logger.debug(ex); } } } @@ -135,82 +136,52 @@ public class TckPublisher { public static boolean isUDDIAuthMode() { String x = tckProperties.getProperty("auth_mode"); - if (x != null && x.equalsIgnoreCase("uddi")) { - return true; - } - return false; + return "uddi".equalsIgnoreCase(x); } public static boolean isReplicationEnabled() { String x = tckProperties.getProperty("replication.enabled"); - if (x != null && x.equalsIgnoreCase("true")) { - return true; - } - return false; + return "true".equalsIgnoreCase(x); } public static boolean isInquiryRestEnabled() { String x = tckProperties.getProperty("rest.enabled"); - if (x != null && x.equalsIgnoreCase("true")) { - return true; - } - return false; + return "true".equalsIgnoreCase(x); } public static boolean isValueSetAPIEnabled() { String x = tckProperties.getProperty("vsv.enabled"); - if (x != null && x.equalsIgnoreCase("true")) { - return true; - } - return false; + return "true".equalsIgnoreCase(x); } public static boolean isSubscriptionEnabled() { String x = tckProperties.getProperty("sub.enabled"); - if (x != null && x.equalsIgnoreCase("true")) { - return true; - } - return false; + return "true".equalsIgnoreCase(x); } public static boolean isCustodyTransferEnabled() { String x = tckProperties.getProperty("transfer.enabled"); - if (x != null && x.equalsIgnoreCase("true")) { - return true; - } - return false; + return "true".equalsIgnoreCase(x); } public static boolean isJUDDI() { String x = tckProperties.getProperty("isJuddi"); - if (x.equalsIgnoreCase("true")) { - return true; - } - return false; + return "true".equalsIgnoreCase(x); } public static boolean isRMI() { String x = tckProperties.getProperty("rmi.enabled"); - if (x.equalsIgnoreCase("true")) { - return true; - } - return false; + return "true".equalsIgnoreCase(x); } public static boolean isLoadTest() { String x = tckProperties.getProperty("loadtest.enable"); - if (x.equalsIgnoreCase("true")) { - return true; - } - return false; + return "true".equalsIgnoreCase(x); } public static boolean isBPEL() { String x = tckProperties.getProperty("bpel.enable"); - if (x.equalsIgnoreCase("true")) { - return true; - } - return false; + return "true".equalsIgnoreCase(x); } public static int getMaxLoadServices() { @@ -250,9 +221,6 @@ public class TckPublisher { public static boolean isSMTPEnabled() { String x = tckProperties.getProperty("smtp.notify.enabled"); - if (x.equalsIgnoreCase("true")) { - return true; - } - return false; + return "true".equalsIgnoreCase(x); } } http://git-wip-us.apache.org/repos/asf/juddi/blob/b09a6fb7/uddi-tck-base/src/main/resources/tck.properties ---------------------------------------------------------------------- diff --git a/uddi-tck-base/src/main/resources/tck.properties b/uddi-tck-base/src/main/resources/tck.properties index 137c349..9a8cf1b 100644 --- a/uddi-tck-base/src/main/resources/tck.properties +++ b/uddi-tck-base/src/main/resources/tck.properties @@ -79,7 +79,7 @@ bpel.enabled=true #load tests loadtest.enable=false -loadtest.maxbusinesses=1100 +loadtest.maxbusinesses=100 # digital signature tests --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
