From a072dbd56481a4f1a47c5e6d1df5f8282909d06d Mon Sep 17 00:00:00 2001 From: hneemann Date: Mon, 14 May 2018 22:22:54 +0200 Subject: [PATCH] try to fix the jacoco error --- .../java/de/neemann/digital/core/element/Keys.java | 11 +++++++++-- .../de/neemann/digital/lang/TestKeyConsistence.java | 9 ++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/neemann/digital/core/element/Keys.java b/src/main/java/de/neemann/digital/core/element/Keys.java index f85506215..3c317c0ee 100644 --- a/src/main/java/de/neemann/digital/core/element/Keys.java +++ b/src/main/java/de/neemann/digital/core/element/Keys.java @@ -6,11 +6,11 @@ package de.neemann.digital.core.element; import de.neemann.digital.analyse.expression.format.FormatToExpression; +import de.neemann.digital.core.IntFormat; import de.neemann.digital.core.arithmetic.BarrelShifterMode; import de.neemann.digital.core.arithmetic.LeftRightFormat; import de.neemann.digital.core.extern.Application; import de.neemann.digital.core.io.InValue; -import de.neemann.digital.core.IntFormat; import de.neemann.digital.core.memory.DataField; import de.neemann.digital.core.memory.rom.ROMManger; import de.neemann.digital.draw.graphics.Style; @@ -53,7 +53,7 @@ public final class Keys { /** * Returns the key of the given name. - * If key does not exist, nul is returned. + * If key does not exist, null is returned. * * @param name the name of the key * @return the key or null @@ -62,6 +62,13 @@ public final class Keys { return InstanceHolder.INSTANCE.get(name); } + /** + * @return all available keys + */ + public static Iterable getKeys() { + return InstanceHolder.INSTANCE.values(); + } + private Keys() { } diff --git a/src/test/java/de/neemann/digital/lang/TestKeyConsistence.java b/src/test/java/de/neemann/digital/lang/TestKeyConsistence.java index 9028ad770..59779fa7d 100644 --- a/src/test/java/de/neemann/digital/lang/TestKeyConsistence.java +++ b/src/test/java/de/neemann/digital/lang/TestKeyConsistence.java @@ -25,14 +25,9 @@ public class TestKeyConsistence extends TestCase { /** * Checks if key descriptions are complete - * - * @throws NodeException - * @throws PinException - * @throws IllegalAccessException */ - public void testConsistence() throws NodeException, PinException, IllegalAccessException { - for (Field f : Keys.class.getDeclaredFields()) { - Key key = ((Key) f.get(null)); + public void testConsistence() { + for (Key key : Keys.getKeys()) { checkKey(key.getLangKey()); checkKey(key.getLangKey() + "_tt");