blocks and variants import enhancements

diylc/diylc-library/src/test/java/org/diylc/components/DefaultBlocksTest.java

@@ -0,0 +1,70 @@
+/*
+
+    DIY Layout Creator (DIYLC).
+    Copyright (c) 2009-2025 held jointly by the individual authors.
+
+    This file is part of DIYLC.
+
+    DIYLC is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    DIYLC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+package org.diylc.components;
+
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.diylc.TestConfiguration;
+import org.diylc.common.BuildingBlock;
+import org.diylc.serialization.ProjectFileManager;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Checks that {@code import-defaults/blocks.xml} loads as factory blocks, each either a full block
+ * with its {@code createdOn} or a withdrawal stub carrying only its name and {@code deletedOn}.
+ */
+public class DefaultBlocksTest {
+
+  @BeforeClass
+  public static void setUp() {
+    TestConfiguration.initialize();
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void everyFactoryBlockIsCompleteOrAStub() {
+    InputStream in = DefaultBlocksTest.class.getClassLoader()
+        .getResourceAsStream("import-defaults/blocks.xml");
+    Assert.assertNotNull("blocks.xml is not on the classpath", in);
+    List<BuildingBlock> blocks =
+        (List<BuildingBlock>) ProjectFileManager.xStreamSerializer.fromXML(in);
+
+    Assert.assertFalse(blocks.isEmpty());
+    Set<String> names = new HashSet<String>();
+    for (BuildingBlock block : blocks) {
+      Assert.assertNotNull(block.getName());
+      Assert.assertTrue("duplicate " + block.getName(), names.add(block.getName()));
+      if (block.getDeletedOn() == null) {
+        Assert.assertNotNull(block.getName(), block.getCreatedOn());
+        Assert.assertNotNull(block.getName(), block.getComponents());
+        Assert.assertFalse(block.getName(), block.getComponents().isEmpty());
+      } else {
+        Assert.assertNull(block.getName(), block.getComponents());
+      }
+    }
+  }
+}

diylc/diylc-library/src/test/java/org/diylc/components/DeletedVariantsTest.java

@@ -43,7 +43,7 @@ import org.junit.Test;
 /**
  * Checks that a factory variant marked {@code deletedOn} in {@code import-defaults/variants.xml} is
  * taken out of the user's configuration only when the last import predates the deletion, and is
- * never imported.
+ * never imported, and that the recorded import date comes from the file rather than the clock.
  */
 public class DeletedVariantsTest {
 
@@ -140,6 +140,39 @@ public class DeletedVariantsTest {
     Assert.assertTrue(remaining.stream().noneMatch(t -> t.getDeletedOn() != null));
   }
 
+  @Test
+  public void importDateIsTheLatestDateInTheFile() {
+    LocalDateTime latest = LocalDateTime.MIN;
+    for (List<Template> variants : loadVariants().values()) {
+      for (Template variant : variants) {
+        if (variant.getCreatedOn() != null && variant.getCreatedOn().isAfter(latest)) {
+          latest = variant.getCreatedOn();
+        }
+        if (variant.getDeletedOn() != null && variant.getDeletedOn().isAfter(latest)) {
+          latest = variant.getDeletedOn();
+        }
+      }
+    }
+    InMemoryConfigurationManager config =
+        configWith(new ArrayList<Template>(), LocalDateTime.MIN);
+
+    importInto(config);
+
+    Assert.assertEquals(latest,
+        config.readObject(IPlugInPort.DEFAULT_TEMPLATES_IMPORT_DATE_KEY, null));
+  }
+
+  @Test
+  public void importDateNeverMovesBackwards() {
+    LocalDateTime later = LocalDateTime.of(2999, 1, 1, 0, 0);
+    InMemoryConfigurationManager config = configWith(new ArrayList<Template>(), later);
+
+    importInto(config);
+
+    Assert.assertEquals(later,
+        config.readObject(IPlugInPort.DEFAULT_TEMPLATES_IMPORT_DATE_KEY, null));
+  }
+
   private static class InMemoryConfigurationManager implements IConfigurationManager<Object> {
 
     private final Map<String, Object> values = new HashMap<String, Object>();