Author: sebb
Date: Sat May 7 12:11:36 2016
New Revision: 1742704
URL: http://svn.apache.org/viewvc?rev=1742704&view=rev
Log:
Add tests for properties files
Added:
jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java (with props)
Added: jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java?rev=1742704&view=auto
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java (added)
+++ jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java Sat May 7
12:11:36 2016
@@ -0,0 +1,64 @@
+/*
+ * 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 java.io.File;
+import java.io.FileInputStream;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import org.apache.jmeter.junit.JMeterTestCaseJUnit3;
+import org.apache.jmeter.util.JMeterUtils;
+
+public class TestPropertiesFiles extends JMeterTestCaseJUnit3 {
+
+
+ public void testUserProperties() throws Exception {
+ Properties props = loadProps(new File(JMeterUtils.getJMeterBinDir(), "user.properties"));
+ assertTrue("user.properties should not contain any enabled properties", props.isEmpty());
+ }
+
+ // The keys in jmeter.properties and reportgenerator.properties should be distinct
+ public void testDefaultProperties() throws Exception {
+ Properties jmeter = loadProps(new File(JMeterUtils.getJMeterBinDir(), "jmeter.properties"));
+ Properties report = loadProps(new File(JMeterUtils.getJMeterBinDir(), "reportgenerator.properties"));
+ {
+ Enumeration<?> names = jmeter.propertyNames();
+ while(names.hasMoreElements()) {
+ final Object key = names.nextElement();
+ assertFalse("reportgenerator should not contain the jmeter key " + key, report.containsKey(key));
+ }
+ }
+ {
+ Enumeration<?> names = report.propertyNames();
+ while(names.hasMoreElements()) {
+ final Object key = names.nextElement();
+ assertFalse("jmeter should not contain the reportgenerator key " + key, jmeter.containsKey(key));
+ }
+ }
+ }
+
+ private static Properties loadProps(File file) throws Exception{
+ Properties props = new Properties();
+ try (FileInputStream inStream = new FileInputStream(file)){
+ props.load(inStream);
+ }
+ return props;
+ }
+}
Propchange: jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java
------------------------------------------------------------------------------
svn:eol-style = native
|