Added more tests and sample data for ipGroups

michbarsinai · michbarsinai · commit 128915be28e1 · 2016-09-19T18:57:49.000-07:00
diff --git a/scripts/api/data/ipGroup-localhost.json b/scripts/api/data/ipGroup-localhost.json
@@ -1,5 +1,5 @@
 {
   "alias":"localhost",
   "name":"Localhost connections",
-  "addresses": [ "0:0:0:0:0:0:0:1", "127.0.0.1" ]
+  "addresses": [ "::1", "127.0.0.1" ]
 }
diff --git a/scripts/api/data/ipGroup-single-IPv4.json b/scripts/api/data/ipGroup-single-IPv4.json
@@ -0,0 +1,5 @@
+{
+  "alias":"singleIPv4",
+  "name":"Single IPv4",
+  "addresses" : ["128.0.0.7"]
+}
diff --git a/scripts/api/data/ipGroup-single-IPv6.json b/scripts/api/data/ipGroup-single-IPv6.json
@@ -0,0 +1,5 @@
+{
+  "alias":"singleIPv6",
+  "name":"Single IPv6",
+  "addresses" : ["aa:bb:cc:dd:ee:ff::1"]
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonParserTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonParserTest.java
@@ -14,12 +14,13 @@
 import edu.harvard.iq.dataverse.DatasetFieldValue;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseTheme;
 import edu.harvard.iq.dataverse.DataverseTheme.Alignment;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroup;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroupProvider;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddressRange;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import java.io.IOException;
 import java.io.InputStream;
@@ -455,6 +456,66 @@ public void testIpGroupRoundTrip() {
         
     }
     
+    @Test
+    public void testIpGroupRoundTrip_singleIpv4Address() {
+        
+        IpGroup original = new IpGroup();
+        original.setDescription("Ip group description");
+        original.setDisplayName("Test-ip-group");
+        original.setId(42l);
+        original.setPersistedGroupAlias("test-ip-group");
+        original.setProvider( new IpGroupProvider(null) );
+        
+        original.add( IpAddressRange.make(IpAddress.valueOf("1.1.1.1"), IpAddress.valueOf("1.1.1.1")) );
+        
+        JsonObject serialized = JsonPrinter.json(original).build();
+        
+        System.out.println( serialized.toString() );
+        
+        IpGroup parsed = new JsonParser().parseIpGroup(serialized);
+        
+        assertEquals( original, parsed );
+        assertTrue( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("1.1.1.1")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("1.1.1.2")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("1.1.2.1")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("1.1.1.0")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("1.1.1.250")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("1.2.1.1")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("2.1.1.1")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("fe80::22c9:d0ff:fe48:ce61")) ));
+        
+    }
+    
+    @Test
+    public void testIpGroupRoundTrip_singleIpv6Address() {
+        
+        IpGroup original = new IpGroup();
+        original.setDescription("Ip group description");
+        original.setDisplayName("Test-ip-group");
+        original.setId(42l);
+        original.setPersistedGroupAlias("test-ip-group");
+        original.setProvider( new IpGroupProvider(null) );
+        
+        original.add( IpAddressRange.make(IpAddress.valueOf("fe80::22c9:d0ff:fe48:ce61"),
+                                          IpAddress.valueOf("fe80::22c9:d0ff:fe48:ce61")) );
+        
+        JsonObject serialized = JsonPrinter.json(original).build();
+        
+        System.out.println( serialized.toString() );
+        
+        IpGroup parsed = new JsonParser().parseIpGroup(serialized);
+        
+        assertEquals( original, parsed );
+        assertTrue( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("fe80::22c9:d0ff:fe48:ce61")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("fe80::22c9:d0ff:fe48:ce60")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("fe80::22c9:d0ff:fe48:ce62")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("fe80::22c9:d0ff:fe47:ce61")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("fe80::22c9:d0af:fe48:ce61")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("fe79::22c9:d0ff:fe48:ce61")) ));
+        assertFalse( parsed.contains( new DataverseRequest(GuestUser.get(), IpAddress.valueOf("2.1.1.1")) ));
+        
+    }
+    
     JsonObject json( String s ) {
         return Json.createReader( new StringReader(s) ).readObject();
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"alias":"localhost",`
`3`	`3`	`"name":"Localhost connections",`
`4`		`- "addresses": [ "0:0:0:0:0:0:0:1", "127.0.0.1" ]`
	`4`	`+ "addresses": [ "::1", "127.0.0.1" ]`
`5`	`5`	`}`