Merge pull request #18 from RUB-NDS/delegate-modification

Delegate modification

Author: ic0ns

src/main/java/de/rub/nds/modifiablevariable/VariableModification.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerAddModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerExplicitValueModification;
+import de.rub.nds.modifiablevariable.biginteger.BigIntegerInteractiveModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerShiftLeftModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerShiftRightModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerSubtractModification;
@@ -46,7 +47,7 @@
  */
 @XmlRootElement
 @XmlTransient
-@XmlSeeAlso({ AccessModificationFilter.class, BigIntegerAddModification.class,
+@XmlSeeAlso({ AccessModificationFilter.class, BigIntegerAddModification.class, BigIntegerInteractiveModification.class,
         BigIntegerExplicitValueModification.class, BigIntegerSubtractModification.class,
         BigIntegerXorModification.class, BigIntegerShiftLeftModification.class, BigIntegerShiftRightModification.class,
         IntegerAddModification.class, IntegerExplicitValueModification.class, IntegerSubtractModification.class,

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerInteractiveModification.java

@@ -0,0 +1,42 @@
+/**
+ * ModifiableVariable - A Variable Concept for Runtime Modifications
+ *
+ * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ *
+ * Licensed under Apache License 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package de.rub.nds.modifiablevariable.biginteger;
+
+import de.rub.nds.modifiablevariable.VariableModification;
+import java.math.BigInteger;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author Janis Fliegenschmidt - janis.fliegenschmidt@rub.de
+ */
+@XmlRootElement
+@XmlType(propOrder = { "modificationFilter", "postModification" })
+public class BigIntegerInteractiveModification extends VariableModification<BigInteger> {
+
+    private InteractiveBigIntegerModification modification;
+
+    protected BigIntegerInteractiveModification() {
+        this.modification = BigIntegerModificationFactory.getStandardInteractiveModification();
+    }
+
+    protected BigIntegerInteractiveModification(InteractiveBigIntegerModification modification) {
+        this.modification = modification;
+    }
+
+    @Override
+    protected BigInteger modifyImplementationHook(final BigInteger input) {
+        return this.modification.modify(input);
+    }
+
+    public interface InteractiveBigIntegerModification {
+
+        BigInteger modify(BigInteger oldVal);
+    }
+}

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerModificationFactory.java

@@ -20,6 +20,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
+import java.util.Scanner;
 
 /**
  * @author
@@ -88,6 +89,36 @@ public static VariableModification<BigInteger> explicitValueFromFile(int value)
         return modifications.get(pos);
     }
 
+    /*
+     * Interactive modification
+     */
+    private static BigIntegerInteractiveModification.InteractiveBigIntegerModification standardInteractiveModification = new BigIntegerInteractiveModification.InteractiveBigIntegerModification() {
+        private BigInteger value;
+
+        @Override
+        public BigInteger modify(BigInteger oldVal) {
+            if (value == null) {
+                System.out.println("Enter new value for BigInt: ");
+                value = new Scanner(System.in).nextBigInteger();
+            }
+            return value;
+
+        }
+    };
+
+    public static void setStandardInteractiveModification(
+            BigIntegerInteractiveModification.InteractiveBigIntegerModification modification) {
+        standardInteractiveModification = modification;
+    }
+
+    protected static BigIntegerInteractiveModification.InteractiveBigIntegerModification getStandardInteractiveModification() {
+        return standardInteractiveModification;
+    }
+
+    public static VariableModification<BigInteger> interactive() {
+        return new BigIntegerInteractiveModification();
+    }
+
     public static synchronized List<VariableModification<BigInteger>> modificationsFromFile() {
         try {
             if (modificationsFromFile == null) {

src/test/java/de/rub/nds/modifiablevariable/serialization/BigIntegerSerializationTest.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerAddModification;
+import de.rub.nds.modifiablevariable.biginteger.BigIntegerInteractiveModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerModificationFactory;
 import de.rub.nds.modifiablevariable.biginteger.ModifiableBigInteger;
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
@@ -61,10 +62,17 @@ public void setUp() throws JAXBException {
 
         writer = new StringWriter();
         context = JAXBContext.newInstance(ModifiableBigInteger.class, BigIntegerAddModification.class,
-                ByteArrayModificationFactory.class);
+                ByteArrayModificationFactory.class, BigIntegerInteractiveModification.class);
         m = context.createMarshaller();
         m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         um = context.createUnmarshaller();
+
+        BigIntegerModificationFactory
+                .setStandardInteractiveModification(new BigIntegerInteractiveModification.InteractiveBigIntegerModification() {
+                    public BigInteger modify(BigInteger oldVal) {
+                        return new BigInteger("12");
+                    }
+                });
     }
 
     @Test
@@ -102,7 +110,24 @@ public void testSerializeDeserializeWithDoubleModification() throws Exception {
         result = mv.getValue();
         assertEquals(expectedResult, result);
         assertNotSame(expectedResult, result);
+    }
+
+    @Test
+    public void testSerializationWithInteractiveMod() throws Exception {
+        VariableModification<BigInteger> mod = BigIntegerModificationFactory.interactive();
+        start.setModification(mod);
+        m.marshal(start, writer);
+
+        String xmlString = writer.toString();
+        LOGGER.debug(xmlString);
 
+        um = context.createUnmarshaller();
+        ModifiableBigInteger mv = (ModifiableBigInteger) um.unmarshal(new StringReader(xmlString));
+
+        expectedResult = new BigInteger("12");
+        result = mv.getValue();
+        assertEquals(expectedResult, result);
+        assertNotSame(expectedResult, result);
     }
 
     @Test