From 32dafe7d0ce0448f8e3fe83ddbbfe7460722d1c7 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Mon, 29 May 2017 13:46:04 +0000
Subject: [PATCH] Fixing tests

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@149202 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../aggregation/AggregatedJobUsageRecordTest.java |  5 ++++-
 .../AggregatedStorageStatusRecordTest.java        |  3 ++-
 .../gcube/documentstore/persistence/MyTest.java   | 15 +++++++--------
 src/test/java/org/gcube/testutility/MyTest.java   |  2 --
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecordTest.java
index 3f461aa..7675fc2 100644
--- a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecordTest.java
+++ b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedJobUsageRecordTest.java
@@ -70,14 +70,17 @@ public class AggregatedJobUsageRecordTest extends ScopedTest {
 		logger.debug("JobUsageRecord 2 : {}", jobUsageRecord2);
 		
 		
-		
+		/*
 		long firstDuration = jobUsageRecord.getDuration();
 		long secondDuration = jobUsageRecord2.getDuration();
+		*/
 		
 		aggregated.aggregate(jobUsageRecord2);
 		logger.debug("jobUsageRecord2 Converted to Aggregated: {}", aggregated);
 		aggregated.validate();
 		logger.debug("jobUsageRecord2 Converted to Aggregated post validate: {}", aggregated);
+		
+		
 		/*
 		Assert.assertTrue(aggregated.getDuration() == ((firstDuration + secondDuration)/2));
 		Assert.assertTrue(aggregated.getOperationCount() == 2);
diff --git a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecordTest.java
index 91b91f0..c90bc65 100644
--- a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecordTest.java
+++ b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageStatusRecordTest.java
@@ -103,7 +103,8 @@ public class AggregatedStorageStatusRecordTest extends ScopedTest {
 		logger.debug("StorageVolumeUsageRecord Converted to Aggregated: {}", converted);
 		converted.validate();
 
-		long firstDataVolume = aggregated.getDataVolume();
+		
+		//long firstDataVolume = aggregated.getDataVolume();
 		long secondDataVolume = converted.getDataVolume();
 		
 		long secondDataCount =storageVolumeUsageRecord2.getDataCount();
diff --git a/src/test/java/org/gcube/documentstore/persistence/MyTest.java b/src/test/java/org/gcube/documentstore/persistence/MyTest.java
index 26fdfb9..022fd73 100644
--- a/src/test/java/org/gcube/documentstore/persistence/MyTest.java
+++ b/src/test/java/org/gcube/documentstore/persistence/MyTest.java
@@ -16,6 +16,7 @@ import org.gcube.documentstore.records.Record;
 import org.gcube.documentstore.records.RecordUtility;
 import org.gcube.documentstore.records.implementation.AbstractRecord;
 import org.gcube.testutility.ScopedTest;
+import org.gcube.testutility.TestUsageRecord;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,6 +25,7 @@ public class MyTest extends ScopedTest {
 	
 	private static Logger logger = LoggerFactory.getLogger(MyTest.class);
 	
+	@SuppressWarnings("unchecked")
 	@Test
 	public void test() throws Exception{
 		File f = new File("test.log");
@@ -35,19 +37,16 @@ public class MyTest extends ScopedTest {
 		DSMapper.registerSubtypes(AbstractServiceUsageRecord.class);
 		DSMapper.registerSubtypes(ServiceUsageRecord.class);
 		
-		/*
 		Record record = TestUsageRecord.createTestServiceUsageRecord();
-		
 		FallbackPersistenceBackend fallbackPersistenceBackend = new FallbackPersistenceBackend(f);
-		
 		fallbackPersistenceBackend.reallyAccount(record);
-		*/
-		/*
+		
+		
 		try(BufferedReader br = new BufferedReader(new FileReader(f))) {
 		    for(String line; (line = br.readLine()) != null; ) {
 		    	try {
-		    		Record record = RecordUtility.getRecord(ServiceUsageRecord.class, line);
-		    		logger.debug(record.toString());
+		    		Record r = RecordUtility.getRecord(line);
+		    		logger.debug(r.toString());
 		    	} catch(Exception e){
 		    		logger.error("Was not possible parse line {} to obtain a valid Record. Going to writing back this line as string fallback file.", line, e);
 		    		
@@ -58,7 +57,7 @@ public class MyTest extends ScopedTest {
 		} catch (IOException e) {
 			logger.error("IOException", e);
 		}
-		*/
+		
 	}
 	
 	
diff --git a/src/test/java/org/gcube/testutility/MyTest.java b/src/test/java/org/gcube/testutility/MyTest.java
index c6a1936..32af344 100644
--- a/src/test/java/org/gcube/testutility/MyTest.java
+++ b/src/test/java/org/gcube/testutility/MyTest.java
@@ -6,8 +6,6 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import org.gcube.accounting.persistence.AccountingPersistence;