[Mulgara-svn] r641 - in branches/mgr-73/src/jar: itql/java/org/mulgara/itql resolver-http/java/org/mulgara/resolver/http

[ronald at mulgara.org]

Author: ronald
Date: 2008-02-16 18:54:55 -0800 (Sat, 16 Feb 2008)
New Revision: 641

Modified:
   branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java
   branches/mgr-73/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContentUnitTest.java
Log:
Merge revs [626] and [627] from trunk to fix tests:
updated to reflect changes to http://purl.org/dc/elements/1.1 .


Modified: branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java	2008-02-11 13:28:02 UTC (rev 640)
+++ branches/mgr-73/src/jar/itql/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java	2008-02-17 02:54:55 UTC (rev 641)
@@ -396,7 +396,7 @@
     // execute the load remotely
     long statements = bean.load(null, sourceURI, modelURI);
 
-    assertEquals("Incorrect number of statements inserted", 146, statements);
+    assertEquals("Incorrect number of statements inserted", 154, statements);
   }
 
   // testLoadApi1()
@@ -427,7 +427,7 @@
     long statements = bean.load(inputStream,
         sourceURI, modelURI);
 
-    assertEquals("Incorrect number of statements inserted", 146, statements);
+    assertEquals("Incorrect number of statements inserted", 154, statements);
 
     inputStream.close();
 
@@ -454,7 +454,7 @@
     long statements = bean.load(sourceURI.toURL().openStream(),
         dummyURI, modelURI);
 
-    assertEquals("Incorrect number of statements inserted", 146, statements);
+    assertEquals("Incorrect number of statements inserted", 154, statements);
 
   }
 
@@ -475,7 +475,7 @@
     long statements = bean.load(sourceURI.toURL().openStream(),
         modelURI);
 
-    assertEquals("Incorrect number of statements inserted", 146, statements);
+    assertEquals("Incorrect number of statements inserted", 154, statements);
 
   }
 

Modified: branches/mgr-73/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContentUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContentUnitTest.java	2008-02-11 13:28:02 UTC (rev 640)
+++ branches/mgr-73/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContentUnitTest.java	2008-02-17 02:54:55 UTC (rev 641)
@@ -233,7 +233,7 @@
     content = new HttpContent(new URL("http://purl.org/dc/elements/1.1"));
     stream = content.newInputStream();
     assertTrue("Expecting an input stream ", stream != null);
-    assertTrue("Expecting 14054 bytes from inputstream ", dumpAndCheck(stream) == 14054);
+    assertEquals("Expecting 14054 bytes from inputstream ", 17564, dumpAndCheck(stream));
     stream.close();
     
   }