jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1818946 - /jmeter/trunk/test/src/org/apache/jmeter/gui/util/MenuFactorySpec.groovy
Date Thu, 21 Dec 2017 15:54:18 GMT
Author: pmouawad
Date: Thu Dec 21 15:54:17 2017
New Revision: 1818946

URL: http://svn.apache.org/viewvc?rev=1818946&view=rev
Log:
Bug 61919 - UX : Reorder Menus
Update tests
Contributed by Graham Russell
This closes #363

Bugzilla Id: 61919

Modified:
    jmeter/trunk/test/src/org/apache/jmeter/gui/util/MenuFactorySpec.groovy

Modified: jmeter/trunk/test/src/org/apache/jmeter/gui/util/MenuFactorySpec.groovy
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/gui/util/MenuFactorySpec.groovy?rev=1818946&r1=1818945&r2=1818946&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/gui/util/MenuFactorySpec.groovy (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/gui/util/MenuFactorySpec.groovy Thu Dec 21 15:54:17
2017
@@ -1,16 +1,34 @@
-package org.apache.jmeter.gui.util
+/*
+ * 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.gui.util
 
-import org.apache.jmeter.junit.categories.NeedGuiTests
 import org.apache.jmeter.junit.spock.JMeterSpec
-import org.junit.experimental.categories.Category
 
-@Category(NeedGuiTests.class)
 class MenuFactorySpec extends JMeterSpec {
 
     def "ensure each menu has something in it"() {
         expect:
-            MenuFactory.menuMap.size() == 11
-            MenuFactory.menuMap.values().stream().noneMatch({ it.isEmpty() })
-            !MenuFactory.elementsToSkip.isEmpty()
+            MenuFactory.menuMap.size() == 12
+            MenuFactory.menuMap.every {!it.value.isEmpty()}
     }
-}
+
+    def "default add menu has expected item count"() {
+        expect:
+            MenuFactory.createDefaultAddMenu().itemCount == 6 + 3 // items + seperators
+    }
+}
\ No newline at end of file



Mime
View raw message