Move public API for calculating memory footprint (#92)

Author: JuliaSamartseva

play-validations/memory-footprint/src/main/java/com/google/wear/watchface/dfx/memory/ResourceMemoryEvaluator.java

@@ -22,7 +22,6 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.samsung.watchface.WatchFaceXmlValidator;
-import com.samsung.watchface.WatchFaceXmlValidator.WatchFaceFormatValidationException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.List;
@@ -116,6 +115,7 @@ static List<MemoryFootprint> evaluateMemoryFootprint(EvaluationSettings evaluati
             WatchFaceData watchFaceData =
                     WatchFaceData.fromResourcesStream(
                             inputPackage.getWatchFaceFiles(), evaluationSettings);
+
             if (!evaluationSettings.isHoneyfaceMode()) {
                 String wffVersion =
                         getWatchFaceFormatVersion(inputPackage.getManifest(), evaluationSettings);
@@ -125,42 +125,9 @@ static List<MemoryFootprint> evaluateMemoryFootprint(EvaluationSettings evaluati
             return watchFaceData.getWatchFaceDocuments().stream()
                     .map(
                             watchFaceDocument ->
-                                    evaluateWatchFaceForLayout(
-                                            watchFaceData.getResourceDetailsMap(),
+                                    WatchFaceLayoutEvaluator.evaluate(
                                             watchFaceDocument,
-                                            evaluationSettings))
-                    .collect(Collectors.toList());
-        }
-    }
-
-    /**
-     * Parses a watch face package and evaluates the memory footprint for all of its layouts.
-     *
-     * @param evaluationSettings the settings object for running the watch face evaluation.
-     * @return the list of memory footprints, one for each layout supported by the watch face.
-     * @throws WatchFaceFormatValidationException if the schema for the validation was not
-     *     available.
-     * @throws TestFailedException if the watch face memory footprint validation has failed.
-     */
-    public static List<MemoryFootprint> evaluateMemoryFootprintOrThrow(
-            EvaluationSettings evaluationSettings)
-            throws TestFailedException, WatchFaceFormatValidationException {
-        try (InputPackage inputPackage = InputPackage.open(evaluationSettings.getWatchFacePath())) {
-            WatchFaceData watchFaceData =
-                    WatchFaceData.fromResourcesStream(
-                            inputPackage.getWatchFaceFiles(), evaluationSettings);
-            if (!evaluationSettings.isHoneyfaceMode()) {
-                String wffVersion =
-                        getWatchFaceFormatVersion(inputPackage.getManifest(), evaluationSettings);
-                validateFormatOrThrow(watchFaceData, wffVersion);
-            }
-
-            return watchFaceData.getWatchFaceDocuments().stream()
-                    .map(
-                            watchFaceDocument ->
-                                    evaluateWatchFaceForLayout(
                                             watchFaceData.getResourceDetailsMap(),
-                                            watchFaceDocument,
                                             evaluationSettings))
                     .collect(Collectors.toList());
         }
@@ -199,20 +166,6 @@ private static String getWatchFaceFormatVersion(
         return cliWffVersion != null ? cliWffVersion : manifestWffVersion;
     }
 
-    private static void validateFormatOrThrow(
-            WatchFaceData watchFaceData, String watchFaceFormatVersion)
-            throws WatchFaceFormatValidationException {
-        WatchFaceXmlValidator xmlValidator = new WatchFaceXmlValidator();
-        for (Document watchFaceDocument : watchFaceData.getWatchFaceDocuments()) {
-            boolean documentHasValidSchema =
-                    xmlValidator.validateOrThrow(watchFaceDocument, watchFaceFormatVersion);
-            if (!documentHasValidSchema) {
-                throw new TestFailedException(
-                        "Watch Face has syntactic errors and cannot be parsed.");
-            }
-        }
-    }
-
     /**
      * Runs the watch face format XSD validation.
      *

play-validations/memory-footprint/src/main/java/com/google/wear/watchface/dfx/memory/WatchFaceLayoutEvaluator.java

@@ -19,11 +19,30 @@
 import static com.google.wear.watchface.dfx.memory.DrawableResourceDetails.findInMap;
 import static com.google.wear.watchface.dfx.memory.WatchFaceDocuments.findSceneNode;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.w3c.dom.Document;
 
-class WatchFaceLayoutEvaluator {
+public class WatchFaceLayoutEvaluator {
+    public static List<MemoryFootprint> evaluate(EvaluationSettings evaluationSettings) {
+        try (InputPackage inputPackage = InputPackage.open(evaluationSettings.getWatchFacePath())) {
+            WatchFaceData watchFaceData =
+                    WatchFaceData.fromResourcesStream(
+                            inputPackage.getWatchFaceFiles(), evaluationSettings);
+            AndroidManifest manifest = inputPackage.getManifest();
+            String wffVersion = manifest == null ? null : String.valueOf(manifest.getWffVersion());
+            return watchFaceData.getWatchFaceDocuments().stream()
+                    .map(
+                            watchFaceDocument ->
+                                    getMemoryFootprint(
+                                            watchFaceDocument,
+                                            watchFaceData.getResourceDetailsMap(),
+                                            evaluationSettings))
+                    .collect(Collectors.toList());
+        }
+    }
 
     static MemoryFootprint evaluate(
             Document currentLayout,