Skip to content
Permalink
Browse files

Fix #939 (#1202)

* Contains a unit-test which checks for memoryleaks.
* Let's use JMemoryBuddy for the memory leak tests.
  • Loading branch information
FlorianKirmaier authored and abhinayagarwal committed Dec 16, 2019
1 parent d1b68da commit 989f48e063671c887d8051c2e1902835d4f0524c
@@ -32,6 +32,7 @@ subprojects {
dependencies {
testCompile 'junit:junit:[4,)'
testCompile 'org.testfx:testfx-core:4.0.10-alpha'
testCompile 'de.sandec:JMemoryBuddy:0.1.3'
testRuntime 'org.testfx:openjfx-monocle:1.8.0_20'
}

@@ -623,7 +623,7 @@ private static Node copyNode( Node node ) {
// Binding as not a good solution since it wipes out existing styleable classes
private static void bindStyle(final Styleable styleable, final Action action ) {
styleable.getStyleClass().addAll( action.getStyleClass() );
action.getStyleClass().addListener(new ListChangeListener<String>() {
ListChangeListener<String> listChangeListener = new ListChangeListener<String>() {
@Override
public void onChanged(Change<? extends String> c) {
while(c.next()) {
@@ -635,7 +635,15 @@ public void onChanged(Change<? extends String> c) {
}
}
}
});
};

if (styleable instanceof Node) {
if(((Node) styleable).getProperties().containsKey(ListChangeListener.class.getCanonicalName())) {
throw new RuntimeException("222 Can't bind node to two actions!");
}
((Node) styleable).getProperties().put(ListChangeListener.class.getCanonicalName(), listChangeListener);
}
action.getStyleClass().addListener(listChangeListener);
}

private static <T extends ButtonBase> T configure(final T btn, final Action action, final ActionTextBehavior textBehavior) {
@@ -720,6 +728,12 @@ private static void unconfigure(final ButtonBase btn) {

Action action = (Action) btn.getOnAction();

Object listChangeListener = btn.getProperties().get(ListChangeListener.class.getCanonicalName());
if (listChangeListener instanceof ListChangeListener<?>) {
btn.getProperties().remove(ListChangeListener.class.getCanonicalName());
action.getStyleClass().removeListener((ListChangeListener<? super String>) listChangeListener);
}

btn.styleProperty().unbind();
btn.textProperty().unbind();
btn.disableProperty().unbind();
@@ -0,0 +1,78 @@
/**
* Copyright (c) 2019, ControlsFX
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of ControlsFX, any associated website, nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL CONTROLSFX BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

package org.controlsfx.control.action;

import javafx.scene.control.Button;
import org.controlsfx.control.spreadsheet.JavaFXThreadingRule;
import org.junit.Rule;
import org.junit.Test;
import de.sandec.jmemorybuddy.JMemoryBuddy;

public class TestActionUtils {
@Rule
public JavaFXThreadingRule javafxRule = new JavaFXThreadingRule();

@Test
public void testConfiguringButtonTwice() {
Button button = new Button("button");
Action action = new Action("action");

ActionUtils.configureButton(action,button);
ActionUtils.unconfigureButton(button);
ActionUtils.configureButton(action,button);
ActionUtils.unconfigureButton(button);
}

@Test
public void testActionIsCollectable() {
Button button = new Button("button");

JMemoryBuddy.memoryTest((checker) -> {
Action action = new Action("action");

ActionUtils.configureButton(action,button);
ActionUtils.unconfigureButton(button);

checker.assertCollectable(action);
});
}

@Test
public void testButtonIsCollectable() {
Action action = new Action("button");

JMemoryBuddy.memoryTest((checker) -> {
Button button = new Button("Ignore");

ActionUtils.configureButton(action,button);
ActionUtils.unconfigureButton(button);

checker.assertCollectable(button);
});
}
}

0 comments on commit 989f48e

Please sign in to comment.
You can’t perform that action at this time.