Skip to content

Commit

Permalink
Merge remote changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Solveig Natvig committed Feb 26, 2026
2 parents a6df231 + d379010 commit 7136c2a
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 0 deletions.
Binary file added target/classes/PurchaseCalculator.class
Binary file not shown.
Binary file added target/classes/TransactionCalculator.class
Binary file not shown.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Exchange.java
C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Portfolio.java
C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Share.java
C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Stock.java
C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\TransactionCalculator.java
50 changes: 50 additions & 0 deletions target/test-classes/ExchangeTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import static org.junit.Assert.assertEquals;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

import org.junit.Before;
import org.junit.Test;

public class ExchangeTest {

private Exchange exchange;
private Stock apple;
private Stock google;

@Before
public void setUp() {
apple = new Stock("AAPL", "Apple", new BigDecimal("100"));
google = new Stock("GOOGL", "Google", new BigDecimal("200"));

List<Stock> stocks = new ArrayList<>();
stocks.add(apple);
stocks.add(google);

exchange = new Exchange("ABC", stocks);
}

@Test
public void testFindStocksBySymbol() {
List<Stock> result = exchange.findStocks("AAPL");

assertEquals(1, result.size());
assertEquals("AAPL", result.get(0).getSymbol());
}

@Test
public void testFindStocksByCompanyNames() {
List<Stock> result = exchange.findStocks("e");

assertEquals(2, result.size());
}

@Test
public void testFindStocksNotInList() {
List<Stock> result = exchange.findStocks("Samsung");

assertEquals(0, result.size());
}

}
37 changes: 37 additions & 0 deletions target/test-classes/StockTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import static org.junit.Assert.assertEquals;

import java.math.BigDecimal;

import org.junit.Test;


public class StockTest {

@Test
public void testGetSalesPrice() {
Stock stock = new Stock("AAPL", "APPLE", new BigDecimal("1000"));
assertEquals(new BigDecimal("1000"), stock.getSalesPrice());
}

@Test
public void testAddNewSalesPrice() {
Stock stock = new Stock("AAPL", "APPLE", new BigDecimal("1000"));
stock.addNewSalesPrice(new BigDecimal("1200"));
assertEquals(new BigDecimal("1200"), stock.getSalesPrice());
}

@Test
public void testGetSalesPriceNone() {
Stock stock = new Stock("AAPL", "APPLE", new BigDecimal("0"));
assertEquals(new BigDecimal("0"), stock.getSalesPrice());
}

@Test
public void testAddNewSalesPriceNone() {
Stock stock = new Stock("AAPL", "APPLE", new BigDecimal("1000"));
stock.addNewSalesPrice(new BigDecimal("0"));
assertEquals(new BigDecimal("0"), stock.getSalesPrice());
}


}

0 comments on commit 7136c2a

Please sign in to comment.