master

config.properties

@@ -1,6 +1,9 @@
-jdbc= jdbc:mysql://localhost:3306/snail
 
 
-username= root
-		
-password= 99719797
+#domain = http://50.30.37.180:38080/snail/
+
+#domain= http://localhost:8080/snail/
+
+domain= http://localhost:7000/Servlet/
+
+

src/test/Start.java

@@ -23,6 +23,7 @@ import test.servlet.user.post.TestUpdateUser;
 
 /**This is the started from tests*/
 public class Start {
+	
 	private static List<ServletTest> generateList()
 	{
 		List<ServletTest> tests = new ArrayList<ServletTest>();
@@ -41,10 +42,7 @@ public class Start {
 		tests.add(new TestUpdateCategory());
 		tests.add(new TestUpdateItem());
 
-
 		tests.add(new TestExistsUser());
-
-
 		tests.add(new TestCreateUser());
 		tests.add(new TestLogin());
 		tests.add(new TestUpdateUser());
@@ -70,6 +68,12 @@ public class Start {
 		{
 			System.out.println(test);
 		}
+		
+		
+		for(ServletTest test:tests)
+		{
+			System.out.println(test.getUrl());
+		}
 
 
 

src/test/resource/ExecuteGet.java

@@ -11,6 +11,7 @@ public class ExecuteGet {
 	public String get(String urlToRead) throws IOException{
 		
 		URL url;
+		
 		HttpURLConnection conn;
 		BufferedReader rd;
 		String line;

src/test/resource/ServletTest.java

@@ -1,5 +1,8 @@
 package test.resource;
 
+import java.io.FileReader;
+import java.util.Properties;
+
 import org.json.JSONArray;
 
 import javafx.util.Pair;
@@ -9,8 +12,22 @@ import javafx.util.Pair;
 
 public abstract class ServletTest {
 	
-	public String domain = "http://localhost:8080/SnailServlet/";
+	public ServletTest()
+	{
+		Properties props = new Properties();
+		try{
+			props.load(new FileReader("config.properties"));
+			domain = props.getProperty("domain");	
+		}catch(Exception e)
+		{
+			
+		}
+		
+	}
+	
+	public String domain ;
 	public String result="";
+	protected String url;
 	
 	
 	public void runTest()
@@ -69,5 +86,10 @@ public abstract class ServletTest {
 		return sb.toString();
 		
 	}
+
+	public String getUrl() {
+		// TODO Auto-generated method stub
+		return url;
+	}
 	
 }

src/test/resource/ServletTestGet.java

@@ -11,6 +11,7 @@ public abstract class ServletTestGet extends ServletTest{
 	public boolean test() throws Exception {
 		
 		String url = domain +this.buildUrl();
+		this.url = url;
 		ExecuteGet executor = new ExecuteGet();
 		String result = executor.get(url);
 		boolean firstResult =  this.analyse(result);

src/test/resource/ServletTestPost.java

@@ -10,15 +10,18 @@ import javafx.util.Pair;
 /**responsable to test the post methods*/
 public abstract class ServletTestPost extends ServletTest {
 
+	public String output;
+	
 	@Override
 	public boolean test() throws Exception {
 		ExecutePost post = new ExecutePost();
 
 
 		String url = domain +this.buildUrl();
+		this.url = url;
 		Map<String , String > parameters = this.buildParameters();
-		String result = post.execute(url, parameters);
-		return this.analyse(result);
+		output = post.execute(url, parameters);
+		return this.analyse(output);
 	}
 
 	public abstract Map<String , String> buildParameters();
@@ -43,4 +46,21 @@ public abstract class ServletTestPost extends ServletTest {
 
 	}
 
+	public Integer getId() {
+		
+		try{
+			JSONArray json = new JSONArray(output);
+			String value = json.getJSONObject(0).getString("id");
+			return new Integer(value);
+			
+		}catch(Exception e)
+		{
+			return 0;
+		}
+		
+		
+		
+	}
+	
+	
 }

src/test/servlet/event/get/TestImportDataFacebook.java

@@ -11,7 +11,7 @@ public class TestImportDataFacebook extends ServletTestGet{
 	
 		
 		return "data?method=import_data&"
-				+ "token=CAACEdEose0cBADZBVpOMdjrAoMWYdXlgvVlBgYe33vJPZAAmnmwBB4IIIiszqSbbbY0tCGy0pp50nstfLMsyoZCxyG53yN3ZBpe0k4kuPsLNZBZB5IfKwD2wSW1d8OfmX2LTZCTsOaLufFRYJLaAfPvjxTS7OERdsfpPNAnrGDoPTwoaWpSip10aZB8cuuSTs5RZA3xZAimYcLUQdHvjYMlWkK"
+				+ "token=CAACEdEose0cBAIaFqPHYmsZAQHJnWwCZBJtXAODpUlRKJhvfM5nnRHnZCpdeYvKz2UIvGldXOZAXP3a70mImv69TmlGPOLuxQrUKNNUaf0G8pb2wiNfR6kYCh0SIPZBDV1UJFMIuejoZCvmNbB1LkmviEIArFALrDE9nER1MZAazKYSAgT2ExYmEZAesuTG2lZAagss1HmJiLht8U2Khnzg70"
 				+ "&type=Facebook&quantity=14&user_id=1";
 	}
 	

src/test/servlet/event/post/TestCreateCategory.java

@@ -8,6 +8,8 @@ import test.resource.ServletTestPost;
 
 public class TestCreateCategory extends ServletTestPost {
 
+	
+	
 	@Override
 	public Map<String, String> buildParameters() {
 		// TODO Auto-generated method stub
@@ -32,5 +34,7 @@ public class TestCreateCategory extends ServletTestPost {
 		return new Pair<String, String>("name", "Radialize");
 	}
 
+
+
 	
 }

src/test/servlet/event/post/TestCreateItem.java

@@ -11,12 +11,13 @@ public class TestCreateItem  extends ServletTestPost{
 	@Override
 	public Map<String, String> buildParameters() {
 		Map <String, String> map = new HashMap<String, String>();
-		map.put("user_id", "16");
+		map.put("user_id", "3");
 		map.put("category_id", "20");
 		map.put("content", "Zueira");
 		map.put("title", "Doido");
 		map.put("start_date", "2011-04-15");
 		map.put("end_date", "2014-12-10");
+		map.put("photo", "foto.jpg");
 		
 		
 		
@@ -26,7 +27,7 @@ public class TestCreateItem  extends ServletTestPost{
 	@Override
 	public Pair<String, String> buildCheckSum() {
 		// TODO Auto-generated method stub
-		return new Pair<String, String>("categoryId", "9");
+		return new Pair<String, String>("categoryId", "20");
 	}
 
 	@Override

src/test/servlet/event/post/TestDeleteCategory.java

@@ -11,8 +11,12 @@ public class TestDeleteCategory extends ServletTestPost{
 	@Override
 	public Map<String, String> buildParameters() {
 		
+		TestCreateCategory createCategory = new  TestCreateCategory();
+		createCategory.runTest();
+		String id = new Integer(createCategory.getId()).toString();
+		
 		Map<String, String> map = new HashMap<String, String>();
-		map.put("category_id", "21");
+		map.put("category_id", id);
 		
 		return map;
 	}

src/test/servlet/user/post/TestRecoverPassword.java

@@ -0,0 +1,33 @@
+package test.servlet.user.post;
+
+import java.util.Map;
+
+
+import javafx.util.Pair;
+import test.resource.ServletTestPost;
+
+public class TestRecoverPassword extends ServletTestPost{
+
+	@Override
+	public Map<String, String> buildParameters() {
+		// TODO Auto-generated method stub
+		
+		
+		return null;
+	}
+
+	@Override
+	public Pair<String, String> buildCheckSum() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String buildUrl() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	
+	
+}