Remove duplicate test util classes

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/JsonBuilder.java

@@ -0,0 +1,466 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.rest.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.eclipse.hawkbit.repository.model.DistributionSet;
+import org.eclipse.hawkbit.repository.model.DistributionSetType;
+import org.eclipse.hawkbit.repository.model.RolloutGroup.RolloutGroupConditions;
+import org.eclipse.hawkbit.repository.model.SoftwareModule;
+import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
+import org.eclipse.hawkbit.repository.model.Target;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Builder class for building certain json strings.
+ *
+ *
+ *
+ */
+public abstract class JsonBuilder {
+
+    public static String softwareModules(final List<SoftwareModule> modules) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final SoftwareModule module : modules) {
+            try {
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("type", module.getType().getKey())
+                        .put("id", Long.MAX_VALUE).put("vendor", module.getVendor())
+                        .put("version", module.getVersion()).put("createdAt", "0").put("updatedAt", "0")
+                        .put("createdBy", "fghdfkjghdfkjh").put("updatedBy", "fghdfkjghdfkjh").toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < modules.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    public static String softwareModulesCreatableFieldsOnly(final List<SoftwareModule> modules) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final SoftwareModule module : modules) {
+            try {
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("type", module.getType().getKey())
+                        .put("vendor", module.getVendor()).put("version", module.getVersion()).toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < modules.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    public static String softwareModuleUpdatableFieldsOnly(final SoftwareModule module) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append(new JSONObject().put("description", module.getDescription()).put("vendor", module.getVendor())
+                .toString());
+
+        return builder.toString();
+
+    }
+
+    public static String softwareModuleTypes(final List<SoftwareModuleType> types) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final SoftwareModuleType module : types) {
+            try {
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("id", Long.MAX_VALUE)
+                        .put("key", module.getKey()).put("maxAssignments", module.getMaxAssignments())
+                        .put("createdAt", "0").put("updatedAt", "0").put("createdBy", "fghdfkjghdfkjh")
+                        .put("updatedBy", "fghdfkjghdfkjh").toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < types.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    public static String softwareModuleTypesCreatableFieldsOnly(final List<SoftwareModuleType> types)
+            throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final SoftwareModuleType module : types) {
+            try {
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("key", module.getKey())
+                        .put("maxAssignments", module.getMaxAssignments()).toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < types.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    /**
+     * builds a json string for the feedback for the execution "proceeding".
+     *
+     * @param id
+     *            of the Action feedback refers to
+     * @return the built string
+     * @throws JSONException
+     */
+    public static String deploymentActionInProgressFeedback(final String id) throws JSONException {
+        return deploymentActionFeedback(id, "proceeding");
+    }
+
+    /**
+     * builds a certain json string for a action feedback.
+     *
+     * @param id
+     *            of the action the feedback refers to
+     * @param execution
+     *            see ExecutionStatus
+     * @return the build json string
+     * @throws JSONException
+     */
+    public static String deploymentActionFeedback(final String id, final String execution) throws JSONException {
+        return deploymentActionFeedback(id, execution, "none", RandomStringUtils.randomAscii(1000));
+
+    }
+
+    public static String deploymentActionFeedback(final String id, final String execution, final String message)
+            throws JSONException {
+        return deploymentActionFeedback(id, execution, "none", message);
+
+    }
+
+    public static String deploymentActionFeedback(final String id, final String execution, final String finished,
+            final String message) throws JSONException {
+        final List<String> messages = new ArrayList<String>();
+        messages.add(message);
+
+        return new JSONObject()
+                .put("id", id)
+                .put("time", "20140511T121314")
+                .put("status",
+                        new JSONObject()
+                                .put("execution", execution)
+                                .put("result",
+                                        new JSONObject().put("finished", finished).put("progress",
+                                                new JSONObject().put("cnt", 2).put("of", 5))).put("details", messages))
+                .toString();
+
+    }
+
+    /**
+     * @param types
+     * @return
+     */
+    public static String distributionSetTypes(final List<DistributionSetType> types) {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final DistributionSetType module : types) {
+
+            try {
+
+                final JSONArray osmTypes = new JSONArray();
+                module.getOptionalModuleTypes().forEach(smt -> osmTypes.put(new JSONObject().put("id", smt.getId())));
+
+                final JSONArray msmTypes = new JSONArray();
+                module.getMandatoryModuleTypes().forEach(smt -> msmTypes.put(new JSONObject().put("id", smt.getId())));
+
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("id", Long.MAX_VALUE)
+                        .put("key", module.getKey()).put("createdAt", "0").put("updatedAt", "0")
+                        .put("createdBy", "fghdfkjghdfkjh").put("optionalmodules", osmTypes)
+                        .put("mandatorymodules", msmTypes).put("updatedBy", "fghdfkjghdfkjh").toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < types.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+    }
+
+    public static String distributionSetTypesCreateValidFieldsOnly(final List<DistributionSetType> types) {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final DistributionSetType module : types) {
+
+            try {
+
+                final JSONArray osmTypes = new JSONArray();
+                module.getOptionalModuleTypes().forEach(smt -> osmTypes.put(new JSONObject().put("id", smt.getId())));
+
+                final JSONArray msmTypes = new JSONArray();
+                module.getMandatoryModuleTypes().forEach(smt -> msmTypes.put(new JSONObject().put("id", smt.getId())));
+
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("key", module.getKey())
+                        .put("optionalmodules", osmTypes).put("mandatorymodules", msmTypes).toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < types.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+    }
+
+    public static String distributionSets(final List<DistributionSet> sets) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final DistributionSet set : sets) {
+            try {
+                builder.append(distributionSet(set));
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < sets.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    public static String distributionSetsCreateValidFieldsOnly(final List<DistributionSet> sets) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final DistributionSet set : sets) {
+            try {
+                builder.append(distributionSetCreateValidFieldsOnly(set));
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < sets.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    public static String distributionSetCreateValidFieldsOnly(final DistributionSet set) throws JSONException {
+
+        final List<JSONObject> modules = set.getModules().stream().map(module -> {
+            try {
+                return new JSONObject().put("id", module.getId());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            return null;
+        }).collect(Collectors.toList());
+
+        return new JSONObject().put("name", set.getName()).put("description", set.getDescription())
+                .put("type", set.getType() == null ? null : set.getType().getKey()).put("version", set.getVersion())
+                .put("requiredMigrationStep", set.isRequiredMigrationStep()).put("modules", modules).toString();
+
+    }
+
+    public static String distributionSetUpdateValidFieldsOnly(final DistributionSet set) throws JSONException {
+
+        final List<JSONObject> modules = set.getModules().stream().map(module -> {
+            try {
+                return new JSONObject().put("id", module.getId());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            return null;
+        }).collect(Collectors.toList());
+
+        return new JSONObject().put("name", set.getName()).put("description", set.getDescription())
+                .put("version", set.getVersion()).toString();
+
+    }
+
+    public static String distributionSet(final DistributionSet set) throws JSONException {
+
+        final List<JSONObject> modules = set.getModules().stream().map(module -> {
+            try {
+                return new JSONObject().put("id", module.getId());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            return null;
+        }).collect(Collectors.toList());
+
+        return new JSONObject().put("name", set.getName()).put("description", set.getDescription())
+                .put("type", set.getType() == null ? null : set.getType().getKey()).put("id", Long.MAX_VALUE)
+                .put("version", set.getVersion()).put("createdAt", "0").put("updatedAt", "0")
+                .put("createdBy", "fghdfkjghdfkjh").put("updatedBy", "fghdfkjghdfkjh")
+                .put("requiredMigrationStep", set.isRequiredMigrationStep()).put("modules", modules).toString();
+
+    }
+
+    /**
+     * @param targets
+     * @return
+     */
+    public static String targets(final List<Target> targets) {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final Target target : targets) {
+            try {
+                builder.append(new JSONObject().put("controllerId", target.getControllerId())
+                        .put("description", target.getDescription()).put("name", target.getName())
+                        .put("createdAt", "0").put("updatedAt", "0").put("createdBy", "fghdfkjghdfkjh")
+                        .put("updatedBy", "fghdfkjghdfkjh").toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < targets.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+    }
+
+    public static String rollout(final String name, final String description, final int groupSize,
+            final long distributionSetId, final String targetFilterQuery, final RolloutGroupConditions conditions) {
+        final JSONObject json = new JSONObject();
+        json.put("name", name);
+        json.put("description", description);
+        json.put("amountGroups", groupSize);
+        json.put("distributionSetId", distributionSetId);
+        json.put("targetFilterQuery", targetFilterQuery);
+
+        if (conditions != null) {
+            final JSONObject successCondition = new JSONObject();
+            json.put("successCondition", successCondition);
+            successCondition.put("condition", conditions.getSuccessCondition().toString());
+            successCondition.put("expression", conditions.getSuccessConditionExp().toString());
+
+            final JSONObject successAction = new JSONObject();
+            json.put("successAction", successAction);
+            successAction.put("action", conditions.getSuccessAction().toString());
+            successAction.put("expression", conditions.getSuccessActionExp().toString());
+
+            final JSONObject errorCondition = new JSONObject();
+            json.put("errorCondition", errorCondition);
+            errorCondition.put("condition", conditions.getErrorCondition().toString());
+            errorCondition.put("expression", conditions.getErrorConditionExp().toString());
+
+            final JSONObject errorAction = new JSONObject();
+            json.put("errorAction", errorAction);
+            errorAction.put("action", conditions.getErrorAction().toString());
+            errorAction.put("expression", conditions.getErrorActionExp().toString());
+        }
+
+        return json.toString();
+    }
+
+    public static String cancelActionFeedback(final String id, final String execution) throws JSONException {
+        return cancelActionFeedback(id, execution, RandomStringUtils.randomAscii(1000));
+
+    }
+
+    public static String cancelActionFeedback(final String id, final String execution, final String message)
+            throws JSONException {
+        final List<String> messages = new ArrayList<String>();
+        messages.add(message);
+        return new JSONObject()
+                .put("id", id)
+                .put("time", "20140511T121314")
+                .put("status",
+                        new JSONObject().put("execution", execution)
+                                .put("result", new JSONObject().put("finished", "success")).put("details", messages))
+                .toString();
+
+    }
+
+    public static String configData(final String id, final Map<String, String> attributes, final String execution)
+            throws JSONException {
+        return new JSONObject()
+                .put("id", id)
+                .put("time", "20140511T121314")
+                .put("status",
+                        new JSONObject().put("execution", execution)
+                                .put("result", new JSONObject().put("finished", "success"))
+                                .put("details", new ArrayList<String>())).put("data", attributes).toString();
+
+    }
+
+}

hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/MockMvcResultPrinter.java

@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.rest.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultHandler;
+import org.springframework.test.web.servlet.result.PrintingResultHandler;
+import org.springframework.util.CollectionUtils;
+
+public abstract class MockMvcResultPrinter {
+    private static final Logger LOG = LoggerFactory.getLogger(MockMvcResultPrinter.class);
+
+    private MockMvcResultPrinter() {
+    }
+
+    /**
+     * Print {@link MvcResult} details to the "standard" output stream.
+     */
+    public static ResultHandler print() {
+        return new ConsolePrintingResultHandler();
+    }
+
+    /**
+     * An {@link PrintingResultHandler} that writes to the "standard" output
+     * stream
+     */
+    private static class ConsolePrintingResultHandler extends PrintingResultHandler {
+
+        public ConsolePrintingResultHandler() {
+            super(new ResultValuePrinter() {
+
+                @Override
+                public void printHeading(final String heading) {
+                    LOG.debug(String.format("%20s:", heading));
+                }
+
+                @Override
+                public void printValue(final String label, Object value) {
+                    if (value != null && value.getClass().isArray()) {
+                        value = CollectionUtils.arrayToList(value);
+                    }
+                    LOG.debug(String.format("%20s = %s", label, value));
+                }
+            });
+        }
+    }
+}

hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SuccessCondition.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.rest.util;
+
+/**
+ * 
+ * @author Dennis Melzer
+ *
+ * @param <T>
+ */
+public interface SuccessCondition<T> {
+
+    /**
+     * 
+     * @param result
+     * @return
+     */
+    boolean success(final T result);
+
+}

hawkbit-rest-core/src/test/resources/log4j2.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2015 Bosch Software Innovations GmbH and others.
-
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
--->
-<Configuration status="WARN" monitorInterval="30">
-    
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT" follow="true">
-            <PatternLayout pattern="[%t] [%-5level] %logger{36} - %msg%n" charset="UTF-8"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Logger name="org.eclipse.hawkbit.MockMvcResultPrinter" level="error" />
-
-        <Root level="error">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>