Merge branch 'master' of https://github.com/ukwa/w3act

Author: Niladree

app/controllers/APIController.java

@@ -172,6 +172,13 @@ public static Result targetUpdate(Long id) throws ActException {
 				}
 			}
 
+			// check any crawl permission
+			for( CrawlPermission cp: merged.crawlPermissions ) {
+				Logger.debug("GOT: "+cp);
+				Logger.debug("Checking: "+cp.contactPerson);
+				cp.contactPerson.save();
+			}			
+			
 			merged.runChecks();
 			merged.update();
 			String url = Play.application().configuration().getString("server_name") + Play.application().configuration().getString("application.context") + "/targets/" + merged.id;

app/uk/bl/scope/Scope.java

@@ -323,7 +323,7 @@ public static boolean isUKRegistrant( WhoisResult whoIsRes ) {
 	 * @throws WhoisException 
 	 */
 	public boolean checkWhois(String url, Target target) {
-		if( WHOIS_ENABLED == false ) {
+		if( WHOIS_ENABLED != true ) {
 			Logger.warn("WHOIS is currently disabled!");
 			return false;
 		}

test/LicenseInheritanceTest.java

@@ -103,10 +103,10 @@ public void run() {
 	                // Add some particular targets:
 					Target bl  = this.addTarget("British Library", new String[]{ "http://www.bl.uk" }, ScopeType.subdomains);
 					Target bln = this.addTarget("British Library News", new String[]{ "http://www.bl.uk/news/" }, ScopeType.subdomains);
-					Target bld = this.addTarget("British Library Datasets", new String[]{ "http://data.bl.uk/" }, null);
+					Target bld = this.addTarget("British Library Datasets", new String[]{ "http://data.bl.uk/" }, ScopeType.root);
 					Target eg  = this.addTarget("Example", new String[]{ "http://example.com/" }, ScopeType.subdomains);
-					Target egs  = this.addTarget("Example Subdomain", new String[]{ "http://subdomain.example.com/" }, null);
-					Target egss = this.addTarget("Example Subsection", new String[]{ "http://example.com/subsection/" }, null);
+					Target egs  = this.addTarget("Example Subdomain", new String[]{ "http://subdomain.example.com/" }, ScopeType.root);
+					Target egss = this.addTarget("Example Subsection", new String[]{ "http://example.com/subsection/" }, ScopeType.root);
 
 	            	/***************** Perform some basic tests ******************/
 	            	assertThat(eg.isInScopeAllOrInheritedWithoutLicense()).isFalse();
@@ -207,6 +207,8 @@ public void testWhois() throws ActException {
 			Scope.WHOIS_ENABLED = true;
 			boolean wr = Scope.INSTANCE.checkWhois(url, null);
 			assertThat(wr).isTrue();
+			// And clean up:
+			Scope.WHOIS_ENABLED = false;
 		}
 
 }

test/api/APIIntegrationTests.java

@@ -78,25 +78,6 @@ public void run() {
 
     }
 
-
-    /**
-     * Example from:
-     * 
-     * https://www.playframework.com/documentation/2.2.x/JavaFunctionalTest
-     * 
-     */
-    //@Test
-    public void runInBrowser() {
-        running(testServer(3333, fakeApplication(additionalConfigurations.asMap())), HTMLUNIT, new Callback<TestBrowser>() {
-            public void invoke(TestBrowser browser) {
-               browser.goTo("http://localhost:3333"); 
-               assertThat(browser.$("#title").getTexts().get(0)).isEqualTo("Hello Guest");
-               browser.$("a").click();
-               assertThat(browser.url()).isEqualTo("http://localhost:3333/Coco");
-               assertThat(browser.$("#title", 0).getText()).isEqualTo("Hello Coco");
-            }
-        });
-    }
 
     /*
      * Method to populate a running system with some test data.
@@ -105,7 +86,7 @@ private static Long populate(String host, String username, String password, Stri
     	String one = "{\"title\": \""+title+"\", \"field_urls\": [\""+url+"\"],\"field_scope\": \""+scope+"\",\"field_crawl_start_date\": \""+start_date+"\", \"selector\": 1, \"field_crawl_frequency\": \"MONTHLY\" }";
     	Promise<WS.Response> result = WS.url(host+"/api/targets").setAuth(username, password).setHeader("Content-Type", "application/json").post(one);
     	WS.Response response = result.get(timeout_ms);
-    	Logger.info("GOT "+response.getStatus()+" "+response.getStatusText());
+    	Logger.info("populate GOT "+response.getStatus()+" "+response.getStatusText());
     	assertThat(response.getStatus()).isEqualTo(expected);
     	String loc = response.getHeader(LOCATION);
     	Long id = Long.parseLong(loc.substring(loc.lastIndexOf('/')+1));