From a4c576d0deeb41a577ac7ce127ba2758443535e4 Mon Sep 17 00:00:00 2001 From: Piotrek Zygielo Date: Sat, 18 Jan 2025 12:29:59 +0100 Subject: [PATCH] Drop case for specific user.name --- .../admin/cli/src/admin/AdminBaseDevTest.java | 8 ++------ .../com/sun/appserv/test/AdminBaseDevTest.java | 7 ++----- .../mbeanapi/deployment/DeploymentTestsUI.java | 17 ++--------------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/AdminBaseDevTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/AdminBaseDevTest.java index 1cdf5cf169c..63340e3afed 100644 --- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/AdminBaseDevTest.java +++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/AdminBaseDevTest.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2025 Contributors to the Eclipse Foundation. All rights reserved. * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -287,12 +288,7 @@ static void printf(String fmt, Object... args) { protected final static boolean isHudson = Boolean.parseBoolean(System.getenv("HUDSON")); static { - String name = System.getProperty("user.name"); - - if (name != null && name.equals("bnevins")) { - DEBUG = true; - } - else if (isHudson) { + if (isHudson) { DEBUG = true; } else if (Boolean.parseBoolean(System.getenv("AS_DEBUG"))) { diff --git a/appserver/tests/quicklook/utils/src/com/sun/appserv/test/AdminBaseDevTest.java b/appserver/tests/quicklook/utils/src/com/sun/appserv/test/AdminBaseDevTest.java index 2b0dc82d090..1ecd201aa1c 100644 --- a/appserver/tests/quicklook/utils/src/com/sun/appserv/test/AdminBaseDevTest.java +++ b/appserver/tests/quicklook/utils/src/com/sun/appserv/test/AdminBaseDevTest.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2025 Contributors to the Eclipse Foundation. All rights reserved. * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -177,11 +178,7 @@ public static void printf(String fmt, Object... args) { protected final static boolean isHudson = Boolean.parseBoolean(System.getenv("HUDSON")); static { - String name = System.getProperty("user.name"); - - if (name != null && name.equals("bnevins")) - DEBUG = true; - else if (isHudson) + if (isHudson) DEBUG = true; else if (Boolean.parseBoolean(System.getenv("AS_DEBUG"))) DEBUG = true; diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/deployment/com/sun/enterprise/admin/mbeanapi/deployment/DeploymentTestsUI.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/deployment/com/sun/enterprise/admin/mbeanapi/deployment/DeploymentTestsUI.java index da2fadf5a98..e7f6cf3ee0c 100644 --- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/deployment/com/sun/enterprise/admin/mbeanapi/deployment/DeploymentTestsUI.java +++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/deployment/com/sun/enterprise/admin/mbeanapi/deployment/DeploymentTestsUI.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2025 Contributors to the Eclipse Foundation. All rights reserved. * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -30,12 +31,7 @@ public DeploymentTestsUI() { System.setProperty(Env.USE_TLS_SYSTEM_PROPERTY, "true"); - File f = getPersistenceFile(); - - if(f != null) - persist = new SimplePersistence(f, true); - else - persist = new SimplePersistence(this); + persist = new SimplePersistence(this); getArgs(); setPort(); getSamplesDir(); @@ -281,14 +277,5 @@ public boolean accept(File f) return name.endsWith(".ear") || name.endsWith(".jar") || name.endsWith(".rar") || name.endsWith(".war"); } } - private File getPersistenceFile() - { - String s = System.getProperty("user.name"); - - if(s != null && s.equals("bnevins")) - return new File("C:/tmp/DeploymentTestsUI.persist.properties"); - - return null; - } }