one more attempt to fix broken tests. rel #6

src/java/main/br/ufpe/cin/groundhog/Commit.java

@@ -6,6 +6,7 @@
 /**
  * Represents a Commit object in Groundhog
  * @author Rodrigo Alves
+ * @since 0.0.1
  */
 public class Commit implements GitHubEntity {
 	@SerializedName("sha")
@@ -30,15 +31,8 @@ public class Commit implements GitHubEntity {
 
 	private int deletionsCount;
 
-	public Commit() {	
-	}
-
-	public Commit(String sha) {
-		this.sha = sha;
-	}
-
 	public Commit(String sha, Project project) {
-		this(sha);
+		this.sha = sha;
 		this.project = project;
 	}
 

src/java/main/br/ufpe/cin/groundhog/GroundhogException.java

@@ -1,9 +1,11 @@
 package br.ufpe.cin.groundhog;
 
 /**
- * The base {@link Exception} type for Groundhog. All Groundhog exceptions must extend this class.
+ * The base {@link Exception} type for Groundhog. All Groundhog exceptions must
+ * extend this class.
+ * 
  * @author fjsj, gustavopinto, Rodrigo Alves
- *
+ * @since 0.0.1
  */
 public class GroundhogException extends RuntimeException {
 	private static final long serialVersionUID = -3563928567447310893L;

src/java/main/br/ufpe/cin/groundhog/Language.java

@@ -1,12 +1,14 @@
 package br.ufpe.cin.groundhog;
 
 /**
- * Represents languages - an important set of components of a {@link Project} - in Groundhog.
- * This class is only important/meaningful in the context of Projects. As a representation of 
- * the programming language composition of such objects.
+ * Represents languages - an important set of components of a {@link Project} -
+ * in Groundhog. This class is only important/meaningful in the context of
+ * Projects. As a representation of the programming language composition of such
+ * objects.
  * 
  * @author Rodrigo Alves
- *
+ * @since 0.0.1
+ * 
  */
 public class Language implements Comparable<Language> {
 	private String name;
@@ -52,5 +54,7 @@ public int compareTo(Language o) {
 		return 0;
 	}
 
-
+	public String toString() {
+		return name;
+	}
 }

src/java/main/br/ufpe/cin/groundhog/License.java

@@ -2,6 +2,8 @@
 
 /**
  * Represents the license used in the project
+ * @author ghlp
+ * @since 0.0.1
  */
 public class License {
 

src/java/main/br/ufpe/cin/groundhog/search/SearchGitHub.java

@@ -13,6 +13,7 @@
 import br.ufpe.cin.groundhog.Project;
 import br.ufpe.cin.groundhog.SCM;
 import br.ufpe.cin.groundhog.User;
+import br.ufpe.cin.groundhog.http.HttpException;
 import br.ufpe.cin.groundhog.http.Requests;
 
 import com.google.common.collect.Lists;
@@ -106,46 +107,12 @@ public List<Project> getProjectsWithMoreThanOneLanguage(int page, int limit) thr
 
 			return projects;
 
-		} catch (GroundhogException | IOException e) {
-			e.printStackTrace();
-			throw new SearchException(e);
-		}
-	}
-	/**
-	 * Obtains from the GitHub API a string indicating how many projects have more than one language
-	 * @param page indicates the desired page
-	 * @param limit is the total of projects that are going to me returned 
-	 * @throws SearchException
-	 */
-	public String getProjectsWithMoreThanOneLanguageString(int page, int limit) throws SearchException {
-		try {
-
-			String result = "";
-
-			List<Project> projects = new ArrayList<Project>();
-			List<Project> rawData = getAllProjects(page, limit);
-
-			for (Project project : rawData) {
-				List<Language> languages = fetchProjectLanguages(project);
-
-				if(languages.size() > 1){
-					projects.add(project);
-				}
-			}
-
-			float percent = ((Float.intBitsToFloat(projects.size())/Float.intBitsToFloat(rawData.size()))*100);
-
-			result = "There are " + rawData.size() + " projects in github \n" +
-					"There are " + projects.size() +" projects with more than one language \n" +
-					"This is " + percent + "% of the total";
-
-			return result;
-
-		} catch (GroundhogException | IOException e) {
+		} catch (GroundhogException e) {
 			e.printStackTrace();
 			throw new SearchException(e);
 		}
 	}
+
 	/**
 	 * Obtains from the GitHub API the set of projects
 	 * @param Start indicates the desired page
@@ -256,10 +223,16 @@ public List<Project> getProjects(String term, String username, int page)
 	 * @param project a {@link Project} object to have its languages fetched
 	 * @throws IOException
 	 */
-	public List<Language> fetchProjectLanguages(Project project) throws IOException {
+	public List<Language> fetchProjectLanguages(Project project) {
 
 		String searchUrl = String.format("%s/repos/%s/%s/languages", REPO_API, project.getUser().getLogin(), project.getName());
-		String json = requests.get(searchUrl).replace("{", "").replace("}", "");
+		String json = null;
+		try {
+			json = requests.get(searchUrl).replace("{", "").replace("}", "");
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new HttpException("Unable to download json file. Is it the correct path?" + searchUrl, e);
+		}
 
 		List<Language> languages = new ArrayList<>();
 		if(!json.equalsIgnoreCase("{}")){

src/java/test/br/ufpe/cin/groundhog/AllAnswers.java

@@ -0,0 +1,15 @@
+package br.ufpe.cin.groundhog;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+import br.ufpe.cin.groundhog.answers.ToGetProjectsWithMoreThanOneLanguage;
+import br.ufpe.cin.groundhog.answers.ToGetTopMostUsedLanguages;
+
+@RunWith(Suite.class)
+@SuiteClasses({ ToGetProjectsWithMoreThanOneLanguage.class,
+		ToGetTopMostUsedLanguages.class })
+public class AllAnswers {
+
+}

src/java/test/br/ufpe/cin/groundhog/AllTests.java

@@ -7,6 +7,8 @@
 import br.ufpe.cin.groundhog.codehistory.GitCodeHistoryTest;
 import br.ufpe.cin.groundhog.codehistory.SFCodeHistoryTest;
 import br.ufpe.cin.groundhog.crawler.CrawlGitHubTest;
+import br.ufpe.cin.groundhog.crawler.CrawlGoogleCodeTest;
+import br.ufpe.cin.groundhog.crawler.CrawlSourceForgeTest;
 import br.ufpe.cin.groundhog.main.OptionsTest;
 import br.ufpe.cin.groundhog.search.SearchGitHubTest;
 import br.ufpe.cin.groundhog.search.SearchGoogleCodeTest;
@@ -15,9 +17,10 @@
 
 @RunWith(Suite.class)
 @SuiteClasses({ GitCodeHistoryTest.class, SFCodeHistoryTest.class,
-		CrawlGitHubTest.class, SearchGitHubTest.class, OptionsTest.class,
+		CrawlGitHubTest.class, CrawlGoogleCodeTest.class,
+		CrawlSourceForgeTest.class, OptionsTest.class,
 		SearchGoogleCodeTest.class, SearchSourceForgeTest.class,
-		FileUtilTest.class })
+		SearchGitHubTest.class, FileUtilTest.class })
 public class AllTests {
 
 }

src/java/test/br/ufpe/cin/groundhog/answers/ToGetProjectsWithMoreThanOneLanguage.java

@@ -0,0 +1,50 @@
+package br.ufpe.cin.groundhog.answers;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+import br.ufpe.cin.groundhog.Language;
+import br.ufpe.cin.groundhog.Project;
+import br.ufpe.cin.groundhog.http.HttpModule;
+import br.ufpe.cin.groundhog.search.SearchGitHub;
+import br.ufpe.cin.groundhog.search.SearchModule;
+
+public class ToGetProjectsWithMoreThanOneLanguage {
+
+	private SearchGitHub searchGitHub;
+
+	@Before
+	public void init() {
+		Injector injector = Guice.createInjector(new SearchModule(), new HttpModule());
+		searchGitHub = injector.getInstance(SearchGitHub.class);
+	}
+
+	@Test
+	public void testProjectsWIthMoreThanOneLanguage() throws IOException{
+		List<Project> rawData = searchGitHub.getAllProjects(1, 8);
+
+		List<Project> projects = new ArrayList<Project>();
+		for (Project project : rawData) {
+			List<Language> languages = searchGitHub.fetchProjectLanguages(project);
+
+			if(languages.size() > 1){
+				projects.add(project);
+			}
+		}
+
+		float percent = ((Float.intBitsToFloat(projects.size())/Float.intBitsToFloat(rawData.size()))*100);
+
+		String result = "There are " + rawData.size() + " projects in github \n" +
+				"There are " + projects.size() +" projects with more than one language \n" +
+				"This is " + percent + "% of the total";
+
+		System.out.println(result);
+	}
+}

src/java/test/br/ufpe/cin/groundhog/answers/ToGetTopMostUsedLanguages.java

@@ -8,6 +8,7 @@
 
 import br.ufpe.cin.groundhog.Language;
 import br.ufpe.cin.groundhog.Project;
+import br.ufpe.cin.groundhog.http.HttpModule;
 import br.ufpe.cin.groundhog.search.SearchGitHub;
 import br.ufpe.cin.groundhog.search.SearchModule;
 
@@ -19,7 +20,7 @@ public class ToGetTopMostUsedLanguages {
 
 	@Before
 	public void setup() {
-		Injector injector = Guice.createInjector(new SearchModule());
+		Injector injector = Guice.createInjector(new SearchModule(), new HttpModule());
 		searchGitHub = injector.getInstance(SearchGitHub.class);
 	}
 

src/java/test/br/ufpe/cin/groundhog/codehistory/GitCodeHistoryTest.java

@@ -1,7 +1,6 @@
 package br.ufpe.cin.groundhog.codehistory;
 
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.util.Date;
@@ -22,10 +21,11 @@ public void setup(){
 		calendar = new GregorianCalendar(2012, 5, 23).getTime();
 	}
 
-	@Test(expected=AssertionError.class)
+	@Test
 	public void main() throws Exception {
-		assertTrue(file.exists());
-		File result = codeHistory.checkoutToDate("javacv", file, calendar);
-		assertNotNull(result);
+		if(file.exists()){
+			File result = codeHistory.checkoutToDate("javacv", file, calendar);
+			assertNotNull(result);
+		}
 	}
 }

src/java/test/br/ufpe/cin/groundhog/crawler/CrawlGitHubTest.java

@@ -1,57 +1,41 @@
 package br.ufpe.cin.groundhog.crawler;
 
 import java.io.File;
-import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import br.ufpe.cin.groundhog.Project;
-import br.ufpe.cin.groundhog.http.HttpModule;
+import br.ufpe.cin.groundhog.SCM;
 import br.ufpe.cin.groundhog.scmclient.GitClient;
 import br.ufpe.cin.groundhog.scmclient.ScmModule;
-import br.ufpe.cin.groundhog.search.SearchGitHub;
-import br.ufpe.cin.groundhog.search.SearchModule;
 
+import com.google.common.collect.Lists;
 import com.google.common.io.Files;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
 public class CrawlGitHubTest {
 
-	private SearchGitHub searchGitHub;
 	private GitClient gitClient; 
 
 	@Before
 	public void setup() {
-		Injector injector = Guice.createInjector(new SearchModule(), new ScmModule(), new HttpModule());
-		searchGitHub = injector.getInstance(SearchGitHub.class);
+		Injector injector = Guice.createInjector(new ScmModule());
 		gitClient = injector.getInstance(GitClient.class);
 	}
 
 	@Test
-	public void testCrawlGithub() {
-		long time = System.nanoTime();
-
-		try {
-
-			Project playframework = searchGitHub.getProjects("playframework", 1,-1).get(0);
-			List<Project> projects = Arrays.asList(playframework);
-			CrawlGitHub crawl = new CrawlGitHub(gitClient, Files.createTempDir());
-			List<Future<File>> fs = crawl.downloadProjects(projects);
-			for (Future<File> f : fs) {
-				File file = f.get();
-				Assert.assertNotNull(file);
-			}
-
-			System.out.printf("Elapsed: %.2f",
-					(System.nanoTime() - time) / 1000000000.0);
-
-		} catch (Exception e) {
-			Assert.fail();
+	public void testCrawlGithub() throws InterruptedException, ExecutionException {
+		CrawlGitHub crawl = new CrawlGitHub(gitClient, Files.createTempDir());
+		List<Future<File>> fs = crawl.downloadProjects(Lists.newArrayList(new Project("modules.playframework.org", "", SCM.GIT, "[email protected]:playframework/modules.playframework.org.git")));
+		for (Future<File> f : fs) {
+			File file = f.get();
+			Assert.assertNotNull(file);
 		}
 	}
 }

src/java/test/br/ufpe/cin/groundhog/crawler/CrawlGoogleCodeTest.java

@@ -10,33 +10,28 @@
 import org.junit.Test;
 
 import br.ufpe.cin.groundhog.Project;
-import br.ufpe.cin.groundhog.http.HttpModule;
+import br.ufpe.cin.groundhog.SCM;
 import br.ufpe.cin.groundhog.scmclient.GitClient;
 import br.ufpe.cin.groundhog.scmclient.ScmModule;
-import br.ufpe.cin.groundhog.search.SearchGoogleCode;
-import br.ufpe.cin.groundhog.search.SearchModule;
 
 import com.google.common.io.Files;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
 public class CrawlGoogleCodeTest {
 
-	private SearchGoogleCode searchGoogleCode;
 	private GitClient gitClient;
 
 	@Before
 	public void setup() {
-		Injector injector = Guice.createInjector(new SearchModule(), new ScmModule(), new HttpModule());
-		searchGoogleCode = injector.getInstance(SearchGoogleCode.class);
+		Injector injector = Guice.createInjector(new ScmModule());
 		gitClient = injector.getInstance(GitClient.class);
 	}
 
 	@Test
 	public void testCrawlGithub() {
 		try {
-			Project project = searchGoogleCode.getProjects("java", 1,-1).get(0);
-
+			Project project = new Project("fake", "fake", "https://code.google.com/p/googletransitdatafeed/source/browse/", SCM.SVN, "http://googletransitdatafeed.googlecode.com/svn/trunk/");
 			CrawlGoogleCode crawl = new CrawlGoogleCode(gitClient, Files.createTempDir());
 
 			List<Future<File>> fs = crawl.downloadProjects(Arrays.asList(project));