Test licenses in CoreAboutDialogModel.

src/com/dmdirc/ui/core/about/CoreAboutDialogModel.java

@@ -148,7 +148,9 @@ public class CoreAboutDialogModel implements AboutDialogModel {
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(path)) {
             stream.forEach(p -> {
                 try {
-                    componentLicences.add(Licence.create(p.getFileName().toString(),
+                    final String filename = p.getFileName().toString();
+                    final String[] parts = filename.split(" - ");
+                    componentLicences.add(Licence.create(parts[0], parts[1],
                             Joiner.on('\n').join(Files.readAllLines(p))));
                 } catch (IOException ex) {
                     LOGGER.warn("Error reading licence", ex);

src/com/dmdirc/ui/core/about/Licence.java

@@ -30,11 +30,12 @@ import com.google.auto.value.AutoValue;
 @AutoValue
 public abstract class Licence {
 
+    public abstract String getComponent();
     public abstract String getName();
     public abstract String getBody();
 
-    public static Licence create(final String name, final String body) {
-        return new AutoValue_Licence(name, body);
+    public static Licence create(final String component, final String name, final String body) {
+        return new AutoValue_Licence(component, name, body);
     }
 
 }

test-res/com/dmdirc/licences/dmdirc - license4

@@ -0,0 +1 @@
+License4-Body

test-res/com/dmdirc/ui/core/about/license1/component1 - license1

@@ -0,0 +1 @@
+License1-Body

test-res/com/dmdirc/ui/core/about/license1/component2 - license2

@@ -0,0 +1 @@
+License2-Body

test-res/com/dmdirc/ui/core/about/license2/component3 - license3

@@ -0,0 +1 @@
+License3-Body

test/com/dmdirc/ui/core/about/CoreAboutDialogModelTest.java

@@ -24,10 +24,16 @@ package com.dmdirc.ui.core.about;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.util.ClientInfo;
+import com.dmdirc.util.io.FileUtils;
+
+import com.google.common.collect.Lists;
 
 import java.nio.file.Path;
+import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,14 +53,29 @@ public class CoreAboutDialogModelTest {
     @Mock private Path path;
     @Mock private DMDircMBassador eventBus;
     @Mock private PluginManager pluginManager;
+    @Mock private PluginMetaData pluginMetaData1;
+    @Mock private PluginMetaData pluginMetaData2;
+    @Mock private PluginInfo pluginInfo1;
+    @Mock private PluginInfo pluginInfo2;
+    private Path pluginPath1;
+    private Path pluginPath2;
     private CoreAboutDialogModel instance;
 
     @Before
     public void setUp() throws Exception {
+        pluginPath1 = FileUtils.getPathForResource(getClass().getResource("license1"));
+        pluginPath2 = FileUtils.getPathForResource(getClass().getResource("license2"));
         when(clientInfo.getVersionInformation()).thenReturn("DMDirc Version");
         when(clientInfo.getOperatingSystemInformation()).thenReturn("OS Version");
         when(clientInfo.getJavaInformation()).thenReturn("Java Version");
         when(globalConfig.getOption("identity", "modealiasversion")).thenReturn("ModeAlias Version");
+        when(pluginManager.getPluginInfos()).thenReturn(Lists.newArrayList(pluginInfo1, pluginInfo2));
+        when(pluginInfo1.getPath("/META-INF/licenses/")).thenReturn(pluginPath1);
+        when(pluginInfo2.getPath("/META-INF/licenses/")).thenReturn(pluginPath2);
+        when(pluginInfo1.getMetaData()).thenReturn(pluginMetaData1);
+        when(pluginInfo2.getMetaData()).thenReturn(pluginMetaData2);
+        when(pluginMetaData1.getFriendlyName()).thenReturn("Plugin1");
+        when(pluginMetaData2.getFriendlyName()).thenReturn("Plugin2");
         instance = new CoreAboutDialogModel(globalConfig, path, clientInfo, eventBus, pluginManager);
         instance.load();
     }
@@ -88,6 +109,25 @@ public class CoreAboutDialogModelTest {
 
     @Test
     public void testGetLicensedComponents() throws Exception {
-        // TODO: Add a virtual file system, mock plugin manager test licences
+        final List<LicensedComponent> licensedComponents = instance.getLicensedComponents();
+        assertEquals(3, licensedComponents.size());
+        assertEquals("DMDirc", licensedComponents.get(0).getName());
+        assertEquals("Plugin1", licensedComponents.get(1).getName());
+        assertEquals("Plugin2", licensedComponents.get(2).getName());
+        assertEquals(1, licensedComponents.get(0).getLicences().size());
+        assertEquals("dmdirc", licensedComponents.get(0).getLicences().get(0).getComponent());
+        assertEquals("license4", licensedComponents.get(0).getLicences().get(0).getName());
+        assertEquals("License4-Body", licensedComponents.get(0).getLicences().get(0).getBody());
+        assertEquals(2, licensedComponents.get(1).getLicences().size());
+        assertEquals("component1", licensedComponents.get(1).getLicences().get(0).getComponent());
+        assertEquals("license1", licensedComponents.get(1).getLicences().get(0).getName());
+        assertEquals("License1-Body", licensedComponents.get(1).getLicences().get(0).getBody());
+        assertEquals("component2", licensedComponents.get(1).getLicences().get(1).getComponent());
+        assertEquals("license2", licensedComponents.get(1).getLicences().get(1).getName());
+        assertEquals("License2-Body", licensedComponents.get(1).getLicences().get(1).getBody());
+        assertEquals(1, licensedComponents.get(2).getLicences().size());
+        assertEquals("component3", licensedComponents.get(2).getLicences().get(0).getComponent());
+        assertEquals("license3", licensedComponents.get(2).getLicences().get(0).getName());
+        assertEquals("License3-Body", licensedComponents.get(2).getLicences().get(0).getBody());
     }
 }

test/com/dmdirc/ui/core/about/LicenceTest.java

@@ -30,9 +30,11 @@ public class LicenceTest {
 
     @Test
     public void testLicence() throws Exception {
+        final String component = "component";
         final String name = "name";
         final String body = "body";
-        final Licence licence = Licence.create(name, body);
+        final Licence licence = Licence.create(component, name, body);
+        assertEquals(component, licence.getComponent());
         assertEquals(name, licence.getName());
         assertEquals(body, licence.getBody());
     }