perfsonar development work

Author: trzaszcz
Date: 2009-12-22 08:28:46 -0500 (Tue, 22 Dec 2009)
New Revision: 5428

Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/dao/CommonExistDaoTests.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/summarization/SummarizationTests.java
Log:
unit tests added

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/dao/CommonExistDaoTests.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/dao/CommonExistDaoTests.java
  2009-12-21 16:28:51 UTC (rev 5427)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/dao/CommonExistDaoTests.java
  2009-12-22 13:28:46 UTC (rev 5428)
@@ -4,24 +4,58 @@
 
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
+import org.perfsonar.base2.xml.nmwg.Data;
+import org.perfsonar.base2.xml.nmwg.Metadata;
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAO;
 
-public class CommonExistDaoTests extends TestCase{
+public class CommonExistDaoTests extends TestCase {
 
-       private LookupServiceDAO getLsDao() throws PerfSONARException{
-               LookupServiceDAO 
lsDao=(LookupServiceDAO)ConfigurationManager.getInstanceWithoutRunningComponents().getConfiguration().getAuxiliaryComponent("lsdao");
+       private void insertExampleData(LookupServiceDAO dao, String 
metadataId)
+                       throws PerfSONARException {
+
+               Metadata meta = new Metadata();
+               meta.setId(metadataId);
+
+               Data data1 = new Data();
+               data1.setId("id2");
+               data1.setMetadataIdRef(meta.getId());
+
+               Data data2 = new Data();
+               data2.setId("id1");
+               data2.setMetadataIdRef(meta.getId());
+
+               dao.putLookupInfo(meta, new Data[] { data1, data2 });
+       }
+
+       private LookupServiceDAO getLsDao() throws PerfSONARException {
+               LookupServiceDAO lsDao = (LookupServiceDAO) 
ConfigurationManager
+                               
.getInstanceWithoutRunningComponents().getConfiguration()
+                               .getAuxiliaryComponent("lsdao");
                return lsDao;
        }
-       
-       public void testCollectionExists() throws PerfSONARException{
-               LookupServiceDAO lsDao=getLsDao();
+
+       public void testCollectionExists() throws PerfSONARException {
+               LookupServiceDAO lsDao = getLsDao();
                assertFalse(lsDao.isDBCollection("DUMMY_COLLECTION_NAME"));
                assertTrue(lsDao.isDBCollection("LSStore-control"));
        }
-       
-       public void testRemoveFile() throws PerfSONARException{
-               LookupServiceDAO lsDao=getLsDao();
+
+       public void testRemoveFile() throws PerfSONARException {
+               LookupServiceDAO lsDao = getLsDao();
                assertTrue(lsDao.isDBConnectivity());
        }
 
+       public void testDBConnectivity() throws PerfSONARException {
+               assertTrue(getLsDao().isDBConnectivity());
+       }
+
+       public void testIsLookupInfo() throws PerfSONARException {
+               LookupServiceDAO lsDao = getLsDao();
+               String metadataId="id"+System.currentTimeMillis();
+               insertExampleData(lsDao, metadataId);
+               assertTrue(lsDao.isLookupInfo(metadataId));
+               lsDao.removeLookupInfo(metadataId);
+               assertFalse(lsDao.isLookupInfo(metadataId));
+       }
+
 }

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/summarization/SummarizationTests.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/summarization/SummarizationTests.java
 2009-12-21 16:28:51 UTC (rev 5427)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/summarization/SummarizationTests.java
 2009-12-22 13:28:46 UTC (rev 5428)
@@ -5,12 +5,12 @@
 
 import junit.framework.TestCase;
 
+import 
org.perfsonar.service.lookupservice.registration.summarization.DomainSummarizator;
 import 
org.perfsonar.service.lookupservice.registration.summarization.SummarizeIpAddrs;
 
 public class SummarizationTests extends TestCase {
        
-       
-       public void testSummarization(){
+       public void testIPSummarization(){
                Set<String> ips=new HashSet<String>();
                ips.add("192.168.1.1");
                ips.add("192.168.1.0");
@@ -19,5 +19,45 @@
                assertEquals("192.168.1.0/31", result.iterator().next()); 
        }
        
+       public void testIPSummarizationWithInvalid(){
+               
+               Set<String> ips=new HashSet<String>();
+               ips.add("192.168.1.1");
+               ips.add("192.xxx");
+               ips.add("192.xxx.1.999");
+               
+               Set<String> result=SummarizeIpAddrs.getSummary(ips);
+               assertEquals("192.168.1.1/32", result.iterator().next()); 
+       }
        
+       public void testDomainSummarization(){
+               Set<String> domains=new HashSet<String>();
+               
+               domains.add("man.poznan.pl");
+               domains.add("berlin.de");
+               
+               
+               
+               Set<String> result=new HashSet<String>();
+               result.add("poznan.pl");
+               result.add("pl");
+               result.add("de");
+               
+               assertEquals(DomainSummarizator.summarizeDomains(domains), 
result);
+       }
+       
+       public void testDomainSummarizationWithInvalidDomains(){
+               Set<String> domains=new HashSet<String>();
+               
+               domains.add("man.poznan.pl");
+               domains.add("sdfsdfsf");
+               
+               Set<String> result=new HashSet<String>();
+               result.add("poznan.pl");
+               result.add("pl");
+               
+               assertEquals(DomainSummarizator.summarizeDomains(domains), 
result);
+       }
+       
+       
 }