slococo-uni
/
libsystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update tests and refactor

This commit is contained in:
Santiago Lo Coco 2024-03-10 13:27:06 +01:00
parent 20feb2d305
commit 61bef1210e
8 changed files with 185 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/edu/uastw/App.java
View File

@ -4,13 +4,15 @@ import edu.uastw.library.*;
import edu.uastw.library.decorators.DecreaseBooksCapacityDecorator; import edu.uastw.library.decorators.DecreaseBooksCapacityDecorator;
import edu.uastw.library.decorators.IncreaseBooksCapacityDecorator; import edu.uastw.library.decorators.IncreaseBooksCapacityDecorator;
import edu.uastw.library.decorators.LibraryDecorator; import edu.uastw.library.decorators.LibraryDecorator;
import edu.uastw.library.interfaces.IgnoreCoverage;
import edu.uastw.library.items.Book; import edu.uastw.library.items.Book;
import edu.uastw.library.items.ItemType; import edu.uastw.library.items.ItemType;
import edu.uastw.library.items.LibraryItem; import edu.uastw.library.interfaces.LibraryItem;
import edu.uastw.library.items.Magazine; import edu.uastw.library.items.Magazine;
import java.util.Iterator; import java.util.Iterator;
@IgnoreCoverage
public class App { public class App {
/***************** Resilience variables *****************/ /***************** Resilience variables *****************/

13
src/main/java/edu/uastw/library/Library.java
View File

@ -2,8 +2,9 @@ package edu.uastw.library;
import edu.uastw.library.exceptions.LibraryClosedException; import edu.uastw.library.exceptions.LibraryClosedException;
import edu.uastw.library.exceptions.LibraryFullException; import edu.uastw.library.exceptions.LibraryFullException;
import edu.uastw.library.interfaces.ExceptionRunnable;
import edu.uastw.library.items.ItemType; import edu.uastw.library.items.ItemType;
import edu.uastw.library.items.LibraryItem; import edu.uastw.library.interfaces.LibraryItem;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
@ -15,7 +16,7 @@ public class Library implements Iterable<LibraryItem> {
private final List<LibraryItem> libraryItems; private final List<LibraryItem> libraryItems;
private int booksCapacity = 3; private int booksCapacity = 3;
/* Resilience variables */ /**** Resilience variables ****/
private int retryAttempts; private int retryAttempts;
private double libraryOpenCondition; private double libraryOpenCondition;
private int timeMultiplier; private int timeMultiplier;
@ -24,7 +25,7 @@ public class Library implements Iterable<LibraryItem> {
private int timeout; private int timeout;
private int tokens; private int tokens;
private int interval; private int interval;
/*************************/ /******************************/
private Library() { private Library() {
libraryItems = new ArrayList<>(); libraryItems = new ArrayList<>();
@ -49,12 +50,8 @@ public class Library implements Iterable<LibraryItem> {
return false; return false;
} }
public interface MyRunnable {
void run() throws Exception;
}
// Retry method // Retry method
private void performWithRetry(MyRunnable action) throws Exception { private void performWithRetry(ExceptionRunnable action) throws Exception {
int attempt = 0; int attempt = 0;
while (attempt < retryAttempts) { while (attempt < retryAttempts) {
System.out.println("Attempt: " + attempt); System.out.println("Attempt: " + attempt);

5
src/main/java/edu/uastw/library/interfaces/ExceptionRunnable.java Normal file
View File

@ -0,0 +1,5 @@
package edu.uastw.library.interfaces;
public interface ExceptionRunnable {
void run() throws Exception;
}

4
src/main/java/edu/uastw/library/interfaces/IgnoreCoverage.java Normal file
View File

@ -0,0 +1,4 @@
package edu.uastw.library.interfaces;
public @interface IgnoreCoverage {
}

4
src/main/java/edu/uastw/library/items/LibraryItem.java → src/main/java/edu/uastw/library/interfaces/LibraryItem.java
View File

@ -1,4 +1,6 @@
package edu.uastw.library.items; package edu.uastw.library.interfaces;
import edu.uastw.library.items.ItemType;
public interface LibraryItem { public interface LibraryItem {
String getTitle(); String getTitle();

2
src/main/java/edu/uastw/library/items/Book.java
View File

@ -1,5 +1,7 @@
package edu.uastw.library.items; package edu.uastw.library.items;
import edu.uastw.library.interfaces.LibraryItem;
public class Book implements LibraryItem { public class Book implements LibraryItem {
private final String title; private final String title;
private final String author; private final String author;

2
src/main/java/edu/uastw/library/items/Magazine.java
View File

@ -1,5 +1,7 @@
package edu.uastw.library.items; package edu.uastw.library.items;
import edu.uastw.library.interfaces.LibraryItem;
public class Magazine implements LibraryItem { public class Magazine implements LibraryItem {
private final String title; private final String title;
private final String publisher; private final String publisher;

276
src/test/java/LibraryTest.java
View File

@ -1,10 +1,11 @@
import edu.uastw.library.decorators.DecreaseBooksCapacityDecorator; import edu.uastw.library.decorators.DecreaseBooksCapacityDecorator;
import edu.uastw.library.decorators.IncreaseBooksCapacityDecorator; import edu.uastw.library.decorators.IncreaseBooksCapacityDecorator;
import edu.uastw.library.decorators.LibraryDecorator; import edu.uastw.library.decorators.LibraryDecorator;
import edu.uastw.library.exceptions.LibraryFullException;
import edu.uastw.library.items.Book; import edu.uastw.library.items.Book;
import edu.uastw.library.Library; import edu.uastw.library.Library;
import edu.uastw.library.items.ItemType; import edu.uastw.library.items.ItemType;
import edu.uastw.library.items.LibraryItem; import edu.uastw.library.interfaces.LibraryItem;
import edu.uastw.library.items.Magazine; import edu.uastw.library.items.Magazine;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@ -19,15 +20,29 @@ import java.util.List;
import static org.junit.Assert.*; import static org.junit.Assert.*;
public class LibraryTest { public class LibraryTest {
private static final int LIBRARY_CAPACITY = 3;
private static final int RETRY_ATTEMPTS = 1;
private static final int LIBRARY_OPEN = -1;
private static final int TIME_MULTIPLIER = 0;
private static final int RATE_LIMIT = 1;
private static final int TIMEOUT = 5;
private static final int INTERVAL = 1;
private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream(); private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream();
private static int LIBRARY_CAPACITY = 3;
private Library library; private Library library;
@Before @Before
public void setUp() { public void setUp() {
library = Library.getInstance(); library = new Library.Builder()
.setBooksCapacity(LIBRARY_CAPACITY)
.setRetryAttempts(RETRY_ATTEMPTS)
.setLibraryOpenCondition(LIBRARY_OPEN)
.setTimeMultiplier(TIME_MULTIPLIER)
.setRateLimit(RATE_LIMIT)
.setTimeout(TIMEOUT)
.setInterval(INTERVAL)
.build();
System.setOut(new PrintStream(outputStreamCaptor)); System.setOut(new PrintStream(outputStreamCaptor));
library.setBooksCapacity(LIBRARY_CAPACITY);
} }
@After @After
@ -38,142 +53,173 @@ public class LibraryTest {
libraryItems.clear(); libraryItems.clear();
} }
// @Test @Test
// public void testAddItem() { public void testAddItem() throws Exception {
// LibraryItem book = new Book("Test Book", "Test Author"); LibraryItem book = new Book.Builder()
// try { .setTitle("Test Book")
// library.addLibraryItem(book); .setAuthor("Test Author")
// } catch (Exception e) { .build();
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
// assertTrue(library.iterator().hasNext()); library.addLibraryItem(book);
// }
// @Test assertTrue(library.iterator().hasNext());
// public void testIterator() { }
// LibraryItem book = new Book("Test Book", "Test Author");
// try {
// library.addLibraryItem(book);
// } catch (Exception e) {
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
// assertTrue(library.iterator().hasNext()); @Test
// assertEquals(book, library.iterator().next()); public void testIterator() throws Exception {
// } LibraryItem book = new Book.Builder()
.setTitle("Test Book")
.setAuthor("Test Author")
.build();
// @Test library.addLibraryItem(book);
// public void testBooksCapacity() {
// LibraryItem book1 = new Book("Book 1", "Author 1");
// LibraryItem book2 = new Book("Book 2", "Author 2");
// LibraryItem book3 = new Book("Book 3", "Author 3");
// try { assertTrue(library.iterator().hasNext());
// library.addLibraryItem(book1); assertEquals(book, library.iterator().next());
// library.addLibraryItem(book2); }
// library.addLibraryItem(book3);
// } catch (Exception e) {
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
// assertEquals(3, library.getBooksCapacity()); @Test
// } public void testBooksCapacity() throws Exception {
LibraryItem book1 = new Book.Builder()
.setTitle("Book 1")
.setAuthor("Author 1")
.build();
LibraryItem book2 = new Book.Builder()
.setTitle("Book 2")
.setAuthor("Author 2")
.build();
LibraryItem book3 = new Book.Builder()
.setTitle("Book 3")
.setAuthor("Author 3")
.build();
// @Test library.addLibraryItem(book1);
// public void testCapacityReached() { library.addLibraryItem(book2);
// LibraryItem book1 = new Book("Book 1", "Author 1"); library.addLibraryItem(book3);
// LibraryItem book2 = new Book("Book 2", "Author 2");
// LibraryItem book3 = new Book("Book 3", "Author 3");
// LibraryItem book4 = new Book("Book 4", "Author 4");
// library.addLibraryItem(book1); assertEquals(3, library.getBooksCapacity());
// library.addLibraryItem(book2); }
// library.addLibraryItem(book3);
// outputStreamCaptor.reset(); @Test(expected = LibraryFullException.class)
public void testCapacityReached() throws Exception {
LibraryItem book1 = new Book.Builder()
.setTitle("Book 1")
.setAuthor("Author 1")
.build();
LibraryItem book2 = new Book.Builder()
.setTitle("Book 2")
.setAuthor("Author 2")
.build();
LibraryItem book3 = new Book.Builder()
.setTitle("Book 3")
.setAuthor("Author 3")
.build();
LibraryItem book4 = new Book.Builder()
.setTitle("Book 4")
.setAuthor("Author 4")
.build();
// library.addLibraryItem(book4); library.addLibraryItem(book1);
library.addLibraryItem(book2);
library.addLibraryItem(book3);
library.addLibraryItem(book4);
// assertEquals("Library capacity reached. Cannot add more items.\n", outputStreamCaptor.toString()); assertEquals("Library capacity reached. Cannot add more items.\n", outputStreamCaptor.toString());
// } }
// @Test @Test
// public void testCustomIterator() { public void testCustomIterator() throws Exception {
// LibraryItem book1 = new Book("Book 1", "Author 1"); LibraryItem book1 = new Book.Builder()
// LibraryItem book2 = new Book("Book 2", "Author 2"); .setTitle("Book 1")
// LibraryItem magazine = new Magazine("Magazine 1", "Publisher 1"); .setAuthor("Author 1")
.build();
LibraryItem book2 = new Book.Builder()
.setTitle("Book 2")
.setAuthor("Author 2")
.build();
LibraryItem magazine = new Magazine.Builder()
.setTitle("Magazine 1")
.setPublisher("Publisher 1")
.build();
library.addLibraryItem(book1);
library.addLibraryItem(book2);
library.addLibraryItem(magazine);
// library.addLibraryItem(book1); Iterator<LibraryItem> bookIterator = library.customTypeIterator(ItemType.BOOK);
// library.addLibraryItem(book2);
// library.addLibraryItem(magazine);
// Iterator<LibraryItem> bookIterator = library.customTypeIterator(ItemType.BOOK); assertTrue(bookIterator.hasNext());
assertEquals("Book 1", bookIterator.next().getTitle());
assertTrue(bookIterator.hasNext());
assertEquals("Author 2", bookIterator.next().getOwner());
assertFalse(bookIterator.hasNext());
}
// assertTrue(bookIterator.hasNext()); @Test
// assertEquals("Book 1", bookIterator.next().getTitle()); public void testIncreaseBooksCapacityDecorator() {
// assertTrue(bookIterator.hasNext()); LibraryDecorator decorator = new IncreaseBooksCapacityDecorator(library, 2);
// assertEquals("Author 2", bookIterator.next().getOwner()); decorator.extendedFunctionality();
// assertFalse(bookIterator.hasNext());
// }
// @Test assertEquals(5, library.getBooksCapacity());
// public void testIncreaseBooksCapacityDecorator() { }
// LibraryDecorator decorator = new IncreaseBooksCapacityDecorator(library, 2);
// decorator.extendedFunctionality();
// assertEquals(5, library.getBooksCapacity()); @Test
// } public void testDecreaseBooksCapacityDecorator() {
LibraryDecorator decorator = new DecreaseBooksCapacityDecorator(library, 2);
decorator.extendedFunctionality();
// @Test assertEquals(1, library.getBooksCapacity());
// public void testDecreaseBooksCapacityDecorator() { }
// LibraryDecorator decorator = new DecreaseBooksCapacityDecorator(library, 2);
// decorator.extendedFunctionality();
// assertEquals(1, library.getBooksCapacity()); @Test
// } public void testDecreaseBooksCapacityDecoratorMax() {
library.setBooksCapacity(1);
LibraryDecorator decorator = new DecreaseBooksCapacityDecorator(library, 2);
decorator.extendedFunctionality();
// @Test assertEquals(1, library.getBooksCapacity());
// public void testDecreaseBooksCapacityDecoratorMax() { }
// library.setBooksCapacity(1);
// LibraryDecorator decorator = new DecreaseBooksCapacityDecorator(library, 2);
// decorator.extendedFunctionality();
// assertEquals(1, library.getBooksCapacity()); @Test
// } public void testDisplayLibraryItems() throws Exception {
LibraryItem book1 = new Book.Builder()
.setTitle("Book 1")
.setAuthor("Author 1")
.build();
LibraryItem book2 = new Book.Builder()
.setTitle("Book 2")
.setAuthor("Author 2")
.build();
library.addLibraryItem(book1);
library.addLibraryItem(book2);
// @Test library.displayLibraryItems();
// public void testDisplayLibraryItems() {
// LibraryItem book1 = new Book("Book 1", "Author 1");
// LibraryItem book2 = new Book("Book 2", "Author 2");
// library.addLibraryItem(book1); String expectedOutput = "Items available in the library:\nBook 1 by Author 1\nBook 2 by Author 2\n";
// library.addLibraryItem(book2); assertTrue(outputStreamCaptor.toString().contains(expectedOutput));
}
// outputStreamCaptor.reset(); @Test
public void testBuilder() {
Library library = new Library.Builder()
.setBooksCapacity(3)
.build();
// library.displayLibraryItems(); assertEquals(3, library.getBooksCapacity());
// String expectedOutput = "Items available in the library:\nBook 1 by Author 1\nBook 2 by Author 2\n"; }
// assertEquals(expectedOutput, outputStreamCaptor.toString()); @Test()
// } public void testRemoveLibraryItem() throws Exception {
LibraryItem book1 = new Book.Builder()
.setTitle("Book 1")
.setAuthor("Author 1")
.build();
LibraryItem book2 = new Book.Builder()
.setTitle("Book 2")
.setAuthor("Author 2")
.build();
library.addLibraryItem(book1);
library.addLibraryItem(book2);
// @Test library.removeLibraryItem(book1);
// public void testBuilder() { }
// LibraryItem book1 = new Book("Book 1", "Author 1");
// LibraryItem book2 = new Book("Book 2", "Author 2");
// LibraryItem book3 = new Book("Book 3", "Author 3");
// Library library = new LibraryBuilder()
// .setBooksCapacity(3)
// .addLibraryItem(book1)
// .addLibraryItem(book2)
// .addLibraryItem(book3)
// .build();
// assertEquals(3, library.getBooksCapacity());
// }
} }