Throw exception if zipping without setting file policy

Author: cxcorp

tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/zip/StudentFileAwareZipper.java

@@ -97,6 +97,12 @@ public byte[] zip(Path rootDirectory) throws IOException {
             throw new IllegalArgumentException("Filesystem root zipping is not supported");
         }
 
+        if (filePolicy == null) {
+            log.error("Attepted to zip before setting the filePolicy");
+            throw new IllegalStateException(
+                    "The student file policy must be set before zipping files");
+        }
+
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         try (ZipArchiveOutputStream zipStream = new ZipArchiveOutputStream(buffer)) {
             zipRecursively(rootDirectory, zipStream, rootDirectory);

tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/io/zip/StudentFileAwareZipperTest.java

@@ -89,6 +89,13 @@ public void zipperThrowsExceptionWhenZippingRoot() throws IOException {
         zipper.zip(Paths.get("/").toAbsolutePath());
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void zipperThrowsExceptionWhenZippingWithoutSettingPolicy() throws IOException {
+        Path existingPath = TestUtils.getPath(StudentFileAwareUnzipperTest.class,
+                "tmcnosubmit_test_case");
+        new StudentFileAwareZipper().zip(existingPath);
+    }
+
     @Test
     public void zipperCorrectlyZipsSingleFile() throws IOException {
 
@@ -108,7 +115,7 @@ public void zipperCorrectlyZipsSingleFile() throws IOException {
     @Test
     public void zipperCorrectlyZipsFolderWithFilesAndSubFolders() throws IOException {
         // Create empty dir that is not in git
-        Path emptyDir = (TEST_DIR.resolve("dir"));
+        Path emptyDir = TEST_DIR.resolve("dir");
         if (Files.notExists(emptyDir)) {
             Files.createDirectory(emptyDir);
         }