This is an automated email from the ASF dual-hosted git repository. milamber pushed a commit to annotated tag v5_2_0_RC1 in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 0ddd6281481ace539fe4c1308d4c1758091a695e Author: Vladimir Sitnikov <[email protected]> AuthorDate: Thu Mar 7 00:21:13 2019 +0300 Fix resources.PackageTest Former-commit-id: 2f5beda25c84e11ef56876ddd43c28d1a4a44b70 --- .../resources/ResourceKeyUsageTestComponents.java | 23 +++++ .../org/apache/jmeter/resources/PackageTest.java | 84 +++------------- .../jmeter/resources/ResourceKeyUsageTest.java | 107 +++++++++++++++++++++ .../resources/ResourceKeyUsageTestFunctions.java | 23 +++++ .../jmeter/resources/ResourceKeyUsageTestFtp.java | 23 +++++ .../jmeter/resources/ResourceKeyUsageTestHttp.java | 23 +++++ .../jmeter/resources/ResourceKeyUsageTestJava.java | 23 +++++ .../jmeter/resources/ResourceKeyUsageTestJdbc.java | 23 +++++ .../jmeter/resources/ResourceKeyUsageTestJms.java | 23 +++++ .../resources/ResourceKeyUsageTestJUnit.java | 23 +++++ .../jmeter/resources/ResourceKeyUsageTestLdap.java | 23 +++++ .../jmeter/resources/ResourceKeyUsageTestMail.java | 23 +++++ .../resources/ResourceKeyUsageTestMongodb.java | 23 +++++ .../resources/ResourceKeyUsageTestNative.java | 23 +++++ .../jmeter/resources/ResourceKeyUsageTestTcp.java | 23 +++++ 15 files changed, 420 insertions(+), 70 deletions(-) diff --git a/src/components/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestComponents.java b/src/components/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestComponents.java new file mode 100644 index 0000000000..3042393491 --- /dev/null +++ b/src/components/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestComponents.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestComponents extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java b/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java index 47ddf51a91..17cc26bd67 100644 --- a/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java +++ b/src/core/src/test/java/org/apache/jmeter/resources/PackageTest.java @@ -20,7 +20,6 @@ package org.apache.jmeter.resources; import java.io.BufferedReader; import java.io.File; -import java.io.FileReader; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; @@ -38,12 +37,8 @@ import java.util.PropertyResourceBundle; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.jmeter.gui.util.JMeterMenuBar; -import org.apache.jorphan.util.JOrphanUtils; import junit.framework.Test; import junit.framework.TestCase; @@ -70,16 +65,14 @@ import junit.framework.TestSuite; */ public class PackageTest extends TestCase { - private static final String basedir = new File(System.getProperty("user.dir")).getParent(); // assumes the test starts in the bin directory - - private static final File srcFiledir = new File(basedir,"src"); + // We assume the test starts in "src/core" directory (which is true for Gradle and IDEs) + private static final File srcFiledir = new File("src/main/java"); + private static final File resourceFiledir = new File("src/main/resources"); private static final String MESSAGES = "messages"; private static PropertyResourceBundle defaultPRB; // current default language properties file - private static PropertyResourceBundle messagePRB; // messages.properties - private static final CharsetEncoder ASCII_ENCODER = Charset.forName("US-ASCII").newEncoder(); // Ensure properties files don't use special characters @@ -141,9 +134,11 @@ public class PackageTest extends TestCase { } } - if (!isPureAscii(val)) { - failures.add("Message format should be pure ASCII. Actual format is " + val); - } + // We don't need to verify ASCII as build system ensures the final properties will be in ASCII + // The proper test would be to get value of a well-known resource and validate it + //if (!isPureAscii(val)) { + // failures.add("Message format should be pure ASCII. Actual format is " + val); + //} } } } @@ -187,9 +182,6 @@ public class PackageTest extends TestCase { if (defaultPRB == null){ throw new IOException("Could not find required file: "+res); } - if (resourcePrefix.endsWith(MESSAGES)) { - messagePRB = defaultPRB; - } } else if (checkUnexpected) { // Check all the keys are in the default props file PropertyResourceBundle prb = getRAS(res); @@ -217,7 +209,7 @@ public class PackageTest extends TestCase { fail(String.join("\n", failures)); } - private static final String[] prefixList = getResources(srcFiledir); + private static final String[] prefixList = getResources(resourceFiledir); /** * Find I18N resources in classpath @@ -225,6 +217,10 @@ public class PackageTest extends TestCase { * @return list of properties files subject to I18N */ public static String[] getResources(File srcFileDir) { + if (!srcFileDir.exists() && "resources".equals(srcFileDir.getName())) { + // Allow non-existing resources directory + return new String[0]; + } Set<String> set = new TreeSet<>(); findFile(srcFileDir, set, new FilenameFilter() { @Override @@ -250,7 +246,7 @@ public class PackageTest extends TestCase { * filter that the files must satisfy to be included into * <code>set</code> */ - private static void findFile(File file, Set<String> set, + static void findFile(File file, Set<String> set, FilenameFilter filenameFilter) { File[] foundFiles = file.listFiles(filenameFilter); assertNotNull("Not a directory: "+file, foundFiles); @@ -291,7 +287,6 @@ public class PackageTest extends TestCase { // ts.addTest(new PackageTest("checkI18n", Locale.JAPANESE.toString())); // ts.addTest(new PackageTest("checkI18n", Locale.SIMPLIFIED_CHINESE.toString())); // ts.addTest(new PackageTest("checkI18n", Locale.TRADITIONAL_CHINESE.toString())); - ts.addTest(new PackageTest("checkResourceReferences", "")); return ts; } @@ -387,55 +382,4 @@ public class PackageTest extends TestCase { } return builder.toString(); } - - // Check that calls to getResString use a valid property key name - public void checkResourceReferences() { - final AtomicInteger errors = new AtomicInteger(0); - findFile(srcFiledir, null, new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - final File file = new File(dir, name); - // Look for calls to JMeterUtils.getResString() - final Pattern pat = Pattern.compile(".*getResString\\(\"([^\"]+)\"\\).*"); - if (name.endsWith(".java")) { - BufferedReader fileReader = null; - try { - fileReader = new BufferedReader(new FileReader(file)); - String s; - while ((s = fileReader.readLine()) != null) { - if (s.matches("\\s*//.*")) { // leading comment - continue; - } - Matcher m = pat.matcher(s); - if (m.matches()) { - final String key = m.group(1); - // Resource keys cannot contain spaces, and are forced to lower case - String resKey = key.replace(' ', '_'); // $NON-NLS-1$ // $NON-NLS-2$ - resKey = resKey.toLowerCase(java.util.Locale.ENGLISH); - if (!key.equals(resKey)) { - System.out.println(file+": non-standard message key: '"+key+"'"); - } - try { - messagePRB.getString(resKey); - } catch (MissingResourceException e) { - System.out.println(file+": missing message key: '"+key+"'"); - errors.incrementAndGet(); - } - } - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - JOrphanUtils.closeQuietly(fileReader); - } - - } - return file.isDirectory(); - } - }); - int errs = errors.get(); - if (errs > 0) { - fail("Detected "+errs+" missing message property keys"); - } - } } diff --git a/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java b/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java new file mode 100644 index 0000000000..587265d109 --- /dev/null +++ b/src/core/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTest.java @@ -0,0 +1,107 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.MissingResourceException; +import java.util.PropertyResourceBundle; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.jorphan.util.JOrphanUtils; +import org.junit.Test; + +public class ResourceKeyUsageTest { + // We assume the test starts in "module" (e.g. src/core) directory (which is true for Gradle and IDEs) + private static final File srcFiledir = new File("src/main/java"); + + // Read resource into ResourceBundle and store in List + private PropertyResourceBundle getRAS(String res) throws Exception { + InputStream ras = this.getClass().getResourceAsStream(res); + if (ras == null) { + return null; + } + return new PropertyResourceBundle(ras); + } + + // Check that calls to getResString use a valid property key name + @Test + public void checkResourceReferences() throws Exception { + String resourceName = "/org/apache/jmeter/resources/messages.properties"; + PropertyResourceBundle messagePRB = getRAS(resourceName); + assertNotNull("Resource bundle " + resourceName + " was not found", resourceName); + List<String> failures = new ArrayList<>(); + + PackageTest.findFile(srcFiledir, null, new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + final File file = new File(dir, name); + // Look for calls to JMeterUtils.getResString() + final Pattern pat = Pattern.compile(".*getResString\\(\"([^\"]+)\"\\).*"); + if (name.endsWith(".java")) { + BufferedReader fileReader = null; + try { + fileReader = new BufferedReader(new FileReader(file)); + String s; + while ((s = fileReader.readLine()) != null) { + if (s.matches("\\s*//.*")) { // leading comment + continue; + } + Matcher m = pat.matcher(s); + if (m.matches()) { + final String key = m.group(1); + // Resource keys cannot contain spaces, and are forced to lower case + String resKey = key.replace(' ', '_'); // $NON-NLS-1$ // $NON-NLS-2$ + resKey = resKey.toLowerCase(java.util.Locale.ENGLISH); + if (!key.equals(resKey)) { + System.out.println(file+": non-standard message key: '"+key+"'"); + } + try { + messagePRB.getString(resKey); + } catch (MissingResourceException e) { + failures.add(file+": missing message key: '"+key+"'"); + } + } + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + JOrphanUtils.closeQuietly(fileReader); + } + + } + return file.isDirectory(); + } + }); + if (failures.isEmpty()) { + return; + } + fail(String.join("\n", failures)); + } +} diff --git a/src/functions/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFunctions.java b/src/functions/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFunctions.java new file mode 100644 index 0000000000..7116c9302a --- /dev/null +++ b/src/functions/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFunctions.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestFunctions extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/ftp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFtp.java b/src/protocol/ftp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFtp.java new file mode 100644 index 0000000000..63bb267175 --- /dev/null +++ b/src/protocol/ftp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestFtp.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestFtp extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestHttp.java b/src/protocol/http/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestHttp.java new file mode 100644 index 0000000000..7ca2d7a346 --- /dev/null +++ b/src/protocol/http/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestHttp.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestHttp extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/java/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJava.java b/src/protocol/java/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJava.java new file mode 100644 index 0000000000..0840dc2aa9 --- /dev/null +++ b/src/protocol/java/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJava.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestJava extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/jdbc/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJdbc.java b/src/protocol/jdbc/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJdbc.java new file mode 100644 index 0000000000..43090e1a46 --- /dev/null +++ b/src/protocol/jdbc/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJdbc.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestJdbc extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/jms/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJms.java b/src/protocol/jms/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJms.java new file mode 100644 index 0000000000..4030d59f86 --- /dev/null +++ b/src/protocol/jms/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJms.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestJms extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/junit/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJUnit.java b/src/protocol/junit/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJUnit.java new file mode 100644 index 0000000000..c6231a74a2 --- /dev/null +++ b/src/protocol/junit/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestJUnit.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestJUnit extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/ldap/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestLdap.java b/src/protocol/ldap/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestLdap.java new file mode 100644 index 0000000000..6865c6bf36 --- /dev/null +++ b/src/protocol/ldap/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestLdap.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestLdap extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/mail/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMail.java b/src/protocol/mail/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMail.java new file mode 100644 index 0000000000..3842f1fc0d --- /dev/null +++ b/src/protocol/mail/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMail.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestMail extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java b/src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java new file mode 100644 index 0000000000..ad8a634217 --- /dev/null +++ b/src/protocol/mongodb/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestMongodb.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestMongodb extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/native/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestNative.java b/src/protocol/native/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestNative.java new file mode 100644 index 0000000000..705ef0fe28 --- /dev/null +++ b/src/protocol/native/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestNative.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestNative extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +} diff --git a/src/protocol/tcp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestTcp.java b/src/protocol/tcp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestTcp.java new file mode 100644 index 0000000000..2b53d41a18 --- /dev/null +++ b/src/protocol/tcp/src/test/java/org/apache/jmeter/resources/ResourceKeyUsageTestTcp.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.jmeter.resources; + +public class ResourceKeyUsageTestTcp extends ResourceKeyUsageTest { + // Test from the base class is used, so we just validate current module +}
