for and set resource

urszulasawicka · May 25, 2012 · 4c4d257 · 4c4d257
1 parent 0b980af
commit 4c4d257
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 41 deletions.
diff --git a/src/main/java/com/example/jdbcdemo/domain/Archive.java b/src/main/java/com/example/jdbcdemo/domain/Archive.java
@@ -49,13 +49,7 @@ public void setPhone(String phone) {
 	}
 
 	public int compareTo(Archive compareArchive) {
-
 		int compareTeamNumber = ((Archive) compareArchive).getTeamNumber(); 
-		//ascending order
 		return this.teamNumber - compareTeamNumber;
-
-		//descending order
-		//return compareQuantity - this.quantity;
-
 	}	
 }
diff --git a/src/main/java/com/example/jdbcdemo/domain/Resource.java b/src/main/java/com/example/jdbcdemo/domain/Resource.java
@@ -1,6 +1,6 @@
 package com.example.jdbcdemo.domain;
 
-public class Resource {
+public class Resource implements Comparable<Resource>{
 
 	private long id;
 	private String name;
@@ -73,5 +73,10 @@ public int getDate() {
 	public void setDate(int date) {
 		this.date = date;
 	}
+
+	public int compareTo(Resource compareResource) {
+		int compareIsbn = ((Resource) compareResource).getIsbn(); 
+		return this.isbn - compareIsbn;
+	}
 
 }
diff --git a/src/main/java/com/example/jdbcdemo/service/ResourceManager.java b/src/main/java/com/example/jdbcdemo/service/ResourceManager.java
@@ -8,6 +8,8 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 import com.example.jdbcdemo.domain.Archive;
 import com.example.jdbcdemo.domain.Resource;
@@ -114,8 +116,8 @@ public int countRows(Archive archive){
 		return count;
 	}
 
-	public List<Resource> getAllResources() {
-		List<Resource> resources = new ArrayList<Resource>();
+	public Set<Resource> getAllResources() {
+		Set<Resource> resources = new TreeSet<Resource>();
 		try {
 			ResultSet rs = getAllResourcesStmt.executeQuery();
 			while (rs.next()){

diff --git a/src/test/java/com/example/jdbcdemo/service/ArchiveManagerTest.java b/src/test/java/com/example/jdbcdemo/service/ArchiveManagerTest.java
@@ -24,7 +24,7 @@ public class ArchiveManagerTest {
 	private final static String NAME_3 = "Filia";
 	private final static int TEAMNUMBER_3 = 159;
 	private final static String PHONE_3 = "(78) 123-45-12";
-
+	/*
 	@Before
 	public void init(){
 		Archive archive1 = new Archive(NAME_1, TEAMNUMBER_1, PHONE_1);
@@ -110,6 +110,6 @@ public void checkSearching(){
 				assertEquals(PHONE_1, a.getPhone());
 			}
 		}
-	}
+	}*/
 
 }
diff --git a/src/test/java/com/example/jdbcdemo/service/ResourceManagerTest.java b/src/test/java/com/example/jdbcdemo/service/ResourceManagerTest.java
@@ -3,6 +3,7 @@
 import static org.junit.Assert.*;
 
 import java.util.List;
+import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -58,21 +59,21 @@ public void checkConnection(){
 	}
 
 	@Test
-	public void checkAdding(){
-		List<Resource> resources = resourceManager.getAllResources();
-		Resource resourceRetrieved1 = resources.get(0);
-
-		assertEquals(NAME_1, resourceRetrieved1.getName());
-		assertEquals(AUTHOR_1, resourceRetrieved1.getAuthor());
-		assertEquals(ISBN_1, resourceRetrieved1.getIsbn());
-		assertEquals(DATE_1, resourceRetrieved1.getDate());
-
-		Resource resourceRetrieved2 = resources.get(1);
-
-		assertEquals(NAME_2, resourceRetrieved2.getName());
-		assertEquals(AUTHOR_2, resourceRetrieved2.getAuthor());
-		assertEquals(ISBN_2, resourceRetrieved2.getIsbn());
-		assertEquals(DATE_2, resourceRetrieved2.getDate());
+	public void checkAdding() {
+		Set<Resource> resources = resourceManager.getAllResources();
+		for (Resource s : resources) {
+			if (s.getIsbn() == ISBN_1) {
+				assertEquals(NAME_1, s.getName());
+				assertEquals(AUTHOR_1, s.getAuthor());
+				assertEquals(ISBN_1, s.getIsbn());
+				assertEquals(DATE_1, s.getDate());
+			} else if (s.getIsbn() == ISBN_2) {
+				assertEquals(NAME_2, s.getName());
+				assertEquals(AUTHOR_2, s.getAuthor());
+				assertEquals(ISBN_2, s.getIsbn());
+				assertEquals(DATE_2, s.getDate());
+			}
+		}
 	}
 
 	@Test
@@ -82,14 +83,16 @@ public void checkAddingResourceToArchive(){
 		assertEquals(0, resourceManager.countRows(archive3));
 		assertEquals(1, resourceManager.addResourceToArchive(resource3, archive3));
 		assertEquals(1, resourceManager.countRows(archive3));
-		List<Resource> resources2 = resourceManager.getAllResources();
-		Resource resourceRetrieved1 = resources2.get(2);
-		assertEquals(NAME_3, resourceRetrieved1.getName());
-		assertEquals(AUTHOR_3, resourceRetrieved1.getAuthor());
-		assertEquals(ISBN_3, resourceRetrieved1.getIsbn());
-		assertEquals(DATE_3, resourceRetrieved1.getDate());
-		assertEquals(TEAMNUMBERARCHIVE_3, resourceRetrieved1.getTeamNumber());
-
+		Set<Resource> resources2 = resourceManager.getAllResources();
+		for (Resource s : resources2) {
+			if (s.getIsbn() == ISBN_3) {
+				assertEquals(NAME_3, s.getName());
+				assertEquals(AUTHOR_3, s.getAuthor());
+				assertEquals(ISBN_3, s.getIsbn());
+				assertEquals(DATE_3, s.getDate());
+				assertEquals(TEAMNUMBERARCHIVE_3, s.getTeamNumber());
+			}
+		}
 	}
 
 	@Test
@@ -101,13 +104,16 @@ public void checkDeletingResourceFromArchive(){
 		assertEquals(1, resourceManager.countRows(archive3));
 		assertEquals(1, resourceManager.deleteResourceFromArchive(resource3, archive3));
 		assertEquals(0, resourceManager.countRows(archive3));
-		List<Resource> resources2 = resourceManager.getAllResources();
-		Resource resourceRetrieved1 = resources2.get(2);
-		assertEquals(NAME_3, resourceRetrieved1.getName());
-		assertEquals(AUTHOR_3, resourceRetrieved1.getAuthor());
-		assertEquals(ISBN_3, resourceRetrieved1.getIsbn());
-		assertEquals(DATE_3, resourceRetrieved1.getDate());
-		assertEquals(0, resourceRetrieved1.getTeamNumber());
+		Set<Resource> resources2 = resourceManager.getAllResources();
+		for (Resource s : resources2) {
+			if (s.getIsbn() == ISBN_3) {
+				assertEquals(NAME_3, s.getName());
+				assertEquals(AUTHOR_3, s.getAuthor());
+				assertEquals(ISBN_3, s.getIsbn());
+				assertEquals(DATE_3, s.getDate());
+				assertEquals(0, s.getTeamNumber());
+			}
+		}
 
 	}