Move enterprise tests
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 26 Dec 2021 06:25:14 +0000 (07:25 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 26 Dec 2021 06:25:14 +0000 (07:25 +0100)
15 files changed:
org.argeo.api/src/org/argeo/api/gcr/ContentMetadata.java [new file with mode: 0644]
org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java [deleted file]
org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java [deleted file]
org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java [deleted file]
org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/UserAdminConfTest.java [deleted file]
org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/basic.ldif [deleted file]
org.argeo.enterprise/ext/test/org/argeo/util/CsvParserEncodingTest.java [deleted file]
org.argeo.enterprise/ext/test/org/argeo/util/CsvParserParseFileTest.java [deleted file]
org.argeo.enterprise/ext/test/org/argeo/util/CsvParserTest.java [deleted file]
org.argeo.enterprise/ext/test/org/argeo/util/CsvParserWithQuotedSeparatorTest.java [deleted file]
org.argeo.enterprise/ext/test/org/argeo/util/CsvWriterTest.java [deleted file]
org.argeo.enterprise/ext/test/org/argeo/util/ReferenceFile.csv [deleted file]
org.argeo.enterprise/ext/test/org/argeo/util/TestParse-ISO.csv [deleted file]
org.argeo.enterprise/ext/test/org/argeo/util/TestParse-UTF-8.csv [deleted file]
org.argeo.enterprise/ext/test/org/argeo/util/ThroughputTest.java [deleted file]

diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentMetadata.java b/org.argeo.api/src/org/argeo/api/gcr/ContentMetadata.java
new file mode 100644 (file)
index 0000000..841887f
--- /dev/null
@@ -0,0 +1,15 @@
+package org.argeo.api.gcr;
+
+import java.io.Serializable;
+import java.util.Set;
+
+public interface ContentMetadata extends Serializable {
+       Set<String> getKnownKeys();
+
+       Set<String> getTypes();
+
+       /** Whether that content can have unknown keys. */
+       default boolean isStructured() {
+               return false;
+       }
+}
diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/BasicTestConstants.java
deleted file mode 100644 (file)
index 98b8bc9..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.argeo.osgi.useradmin;
-
-interface BasicTestConstants {
-       String BASE_DN = "dc=example,dc=com";
-       String ROOT_USER_DN = "uid=root,ou=users," + BASE_DN;
-       String DEMO_USER_DN = "uid=demo,ou=users," + BASE_DN;
-       String ADMIN_GROUP_DN = "cn=admin,ou=groups," + BASE_DN;
-       String EDITORS_GROUP_DN = "cn=editors,ou=groups," + BASE_DN;
-}
diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java
deleted file mode 100644 (file)
index 012a50e..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.argeo.osgi.useradmin;
-
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import java.util.SortedMap;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.ldap.LdapName;
-
-import org.argeo.naming.LdapAttrs;
-import org.argeo.naming.LdifParser;
-
-/** {@link LdifParser} tests. */
-public class LdifParserTest implements BasicTestConstants {
-       public void testBasicLdif() throws Exception {
-               LdifParser ldifParser = new LdifParser();
-               SortedMap<LdapName, Attributes> res = ldifParser.read(getClass().getResourceAsStream("basic.ldif"));
-               LdapName rootDn = new LdapName(ROOT_USER_DN);
-               Attributes rootAttributes = res.get(rootDn);
-               assert rootAttributes != null;
-               assert "Superuser".equals(rootAttributes.get(LdapAttrs.description.name()).get());
-               byte[] rawPwEntry = (byte[]) rootAttributes.get(LdapAttrs.userPassword.name()).get();
-               assert "{SHA}ieSV55Qc+eQOaYDRSha/AjzNTJE=".contentEquals(new String(rawPwEntry));
-               byte[] hashedPassword = DigestUtils.sha1("demo".getBytes());
-               assert ("{SHA}" + Base64.getEncoder().encodeToString(hashedPassword)).equals(new String(rawPwEntry));
-
-               LdapName adminDn = new LdapName(ADMIN_GROUP_DN);
-               Attributes adminAttributes = res.get(adminDn);
-               assert adminAttributes != null;
-               Attribute memberAttribute = adminAttributes.get(LdapAttrs.member.name());
-               assert memberAttribute != null;
-               NamingEnumeration<?> members = memberAttribute.getAll();
-               List<String> users = new ArrayList<String>();
-               while (members.hasMore()) {
-                       Object value = members.next();
-                       users.add(value.toString());
-               }
-               assert 1 == users.size();
-               assert rootDn.equals(new LdapName(users.get(0)));
-       }
-}
diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java
deleted file mode 100644 (file)
index 8432ce9..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.argeo.osgi.useradmin;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Arrays;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.argeo.naming.LdapAttrs;
-import org.argeo.osgi.transaction.SimpleTransactionManager;
-import org.osgi.service.useradmin.Authorization;
-import org.osgi.service.useradmin.Group;
-import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.User;
-
-import junit.framework.TestCase;
-
-/** {@link LdifUserAdmin} tests. */
-public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
-       // We have to keep using JUnit because of
-       // https://issues.apache.org/jira/browse/SUREFIRE-1669
-
-       final static int TM_SIMPLE = 0;
-       final static int TM_BITRONIX = 1;
-
-       private int tmType = TM_SIMPLE;
-       private SimpleTransactionManager tm;
-       private URI uri;
-       private AbstractUserDirectory userAdmin;
-       private Path tempDir;
-
-       public void setUp() {
-               System.out.println("Enter setUp()");
-               try {
-                       tempDir = Files.createTempDirectory(getClass().getName());
-                       tempDir.toFile().deleteOnExit();
-                       String uriProp = System.getProperty("argeo.userdirectory.uri");
-                       if (uriProp != null)
-                               uri = new URI(uriProp);
-                       else {
-                               tempDir.toFile().deleteOnExit();
-                               Path ldifPath = tempDir.resolve(BASE_DN + ".ldif");
-                               try (InputStream in = getClass().getResource("basic.ldif").openStream()) {
-                                       Files.copy(in, ldifPath);
-                               }
-                               uri = ldifPath.toUri();
-                       }
-
-                       // Init transaction manager
-                       if (TM_SIMPLE == tmType) {
-                               tm = new SimpleTransactionManager();
-                       }
-//             else if (TM_BITRONIX == tmType) {
-//                     bitronix.tm.Configuration tmConf = TransactionManagerServices.getConfiguration();
-//                     tmConf.setServerId(UUID.randomUUID().toString());
-//                     tmConf.setLogPart1Filename(new File(tempDir.toFile(), "btm1.tlog").getAbsolutePath());
-//                     tmConf.setLogPart2Filename(new File(tempDir.toFile(), "btm2.tlog").getAbsolutePath());
-//                     tm = TransactionManagerServices.getTransactionManager();
-//             }
-
-                       userAdmin = initUserAdmin(uri, tm);
-               } catch (Exception e) {
-                       throw new RuntimeException(e);
-               }
-       }
-
-       public void testEdition() throws Exception {
-               User demoUser = (User) userAdmin.getRole(DEMO_USER_DN);
-               assert demoUser != null;
-
-               tm.begin();
-               String newName = "demo";
-               demoUser.getProperties().put("cn", newName);
-               assert newName.equals(demoUser.getProperties().get("cn"));
-               tm.commit();
-               persistAndRestart();
-               assert newName.equals(demoUser.getProperties().get("cn"));
-
-               tm.begin();
-               userAdmin.removeRole(DEMO_USER_DN);
-               tm.commit();
-               persistAndRestart();
-
-               // check data
-               Role[] search = userAdmin.getRoles("(objectclass=inetOrgPerson)");
-               assert 1 == search.length;
-               Group editorGroup = (Group) userAdmin.getRole(EDITORS_GROUP_DN);
-               assert editorGroup != null;
-               Role[] members = editorGroup.getMembers();
-               assert 1 == members.length;
-       }
-
-       public void testRetrieve() throws Exception {
-               // users
-               User rootUser = (User) userAdmin.getRole(ROOT_USER_DN);
-               assert rootUser != null;
-               User demoUser = (User) userAdmin.getRole(DEMO_USER_DN);
-               assert demoUser != null;
-
-               // groups
-               Group adminGroup = (Group) userAdmin.getRole(ADMIN_GROUP_DN);
-               assert adminGroup != null;
-               Role[] members = adminGroup.getMembers();
-               assert 1 == members.length;
-               assert rootUser.equals(members[0]);
-
-               Group editorGroup = (Group) userAdmin.getRole(EDITORS_GROUP_DN);
-               assert editorGroup != null;
-               members = editorGroup.getMembers();
-               assert 2 == members.length;
-               assert adminGroup.equals(members[0]);
-               assert demoUser.equals(members[1]);
-
-               Authorization rootAuth = userAdmin.getAuthorization(rootUser);
-               List<String> rootRoles = Arrays.asList(rootAuth.getRoles());
-               assert 3 == rootRoles.size();
-               assert rootRoles.contains(ROOT_USER_DN);
-               assert rootRoles.contains(ADMIN_GROUP_DN);
-               assert rootRoles.contains(EDITORS_GROUP_DN);
-
-               // properties
-               assert "root@localhost".equals(rootUser.getProperties().get("mail"));
-
-               // credentials
-               // {SHA}
-               assert rootUser.hasCredential(LdapAttrs.userPassword.name(), "demo".getBytes(StandardCharsets.UTF_8));
-               // {PBKDF2_SHA256}
-               assert demoUser.hasCredential(LdapAttrs.userPassword.name(), "demo".getBytes(StandardCharsets.UTF_8));
-
-               // search
-               Role[] search = userAdmin.getRoles(null);
-               assert 4 == search.length;
-               search = userAdmin.getRoles("(objectClass=groupOfNames)");
-               assert 2 == search.length;
-               search = userAdmin.getRoles("(objectclass=inetOrgPerson)");
-               assert 2 == search.length;
-               search = userAdmin.getRoles("(&(objectclass=inetOrgPerson)(uid=demo))");
-               assert 1 == search.length;
-       }
-
-       public void testReadWriteRead() throws Exception {
-               if (userAdmin instanceof LdifUserAdmin) {
-                       Dictionary<String, Object> props = userAdmin.getProperties();
-                       ByteArrayOutputStream out = new ByteArrayOutputStream();
-                       ((LdifUserAdmin) userAdmin).save(out);
-                       byte[] arr = out.toByteArray();
-                       out.close();
-                       userAdmin.destroy();
-                       // String written = new String(arr);
-                       // System.out.print(written);
-                       try (ByteArrayInputStream in = new ByteArrayInputStream(arr)) {
-                               userAdmin = new LdifUserAdmin(props);
-                               ((LdifUserAdmin) userAdmin).load(in);
-                       }
-                       Role[] search = userAdmin.getRoles(null);
-                       assert 4 == search.length;
-               } else {
-                       // test not relevant for LDAP
-               }
-       }
-
-       private AbstractUserDirectory initUserAdmin(URI uri, SimpleTransactionManager tm) {
-               Dictionary<String, Object> props = new Hashtable<>();
-               props.put(UserAdminConf.uri.name(), uri.toString());
-               props.put(UserAdminConf.baseDn.name(), BASE_DN);
-               props.put(UserAdminConf.userBase.name(), "ou=users");
-               props.put(UserAdminConf.groupBase.name(), "ou=groups");
-               AbstractUserDirectory userAdmin;
-               if (uri.getScheme().startsWith("ldap"))
-                       userAdmin = new LdapUserAdmin(props);
-               else
-                       userAdmin = new LdifUserAdmin(props);
-               userAdmin.init();
-               // JTA
-//             if (TM_BITRONIX == tmType)
-//                     EhCacheXAResourceProducer.registerXAResource(UserDirectory.class.getName(), userAdmin.getXaResource());
-               userAdmin.setTransactionControl(tm);
-               return userAdmin;
-       }
-
-       private void persistAndRestart() {
-//             if (TM_BITRONIX == tmType)
-//                     EhCacheXAResourceProducer.unregisterXAResource(UserDirectory.class.getName(), userAdmin.getXaResource());
-               if (userAdmin instanceof LdifUserAdmin)
-                       ((LdifUserAdmin) userAdmin).save();
-               userAdmin.destroy();
-               userAdmin = initUserAdmin(uri, tm);
-       }
-
-       public void tearDown() throws Exception {
-//             if (TM_BITRONIX == tmType) {
-//                     EhCacheXAResourceProducer.unregisterXAResource(UserDirectory.class.getName(), userAdmin.getXaResource());
-//                     ((BitronixTransactionManager) tm).shutdown();
-//             }
-               if (userAdmin != null)
-                       userAdmin.destroy();
-               if (tempDir != null)
-                       Files.walkFileTree(tempDir, new SimpleFileVisitor<Path>() {
-                               @Override
-                               public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-                                       Files.delete(file);
-                                       return FileVisitResult.CONTINUE;
-                               }
-
-                               @Override
-                               public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-                                       Files.delete(dir);
-                                       return FileVisitResult.CONTINUE;
-                               }
-
-                       });
-       }
-
-}
diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/UserAdminConfTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/UserAdminConfTest.java
deleted file mode 100644 (file)
index 77a35f4..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.argeo.osgi.useradmin;
-
-import static org.argeo.osgi.useradmin.UserAdminConf.propertiesAsUri;
-import static org.argeo.osgi.useradmin.UserAdminConf.uriAsProperties;
-
-import java.net.URI;
-import java.util.Dictionary;
-
-/** {@link UserAdminConf} tests. */
-public class UserAdminConfTest {
-       public void testUriFormat() throws Exception {
-               // LDAP
-               URI uriIn = new URI("ldap://" + "uid=admin,ou=system:secret@localhost:10389" + "/dc=example,dc=com"
-                               + "?readOnly=false&userObjectClass=person");
-               Dictionary<String, ?> props = uriAsProperties(uriIn.toString());
-               System.out.println(props);
-               assert "dc=example,dc=com".equals(props.get(UserAdminConf.baseDn.name()));
-               assert "false".equals(props.get(UserAdminConf.readOnly.name()));
-               assert "person".equals(props.get(UserAdminConf.userObjectClass.name()));
-               URI uriOut = propertiesAsUri(props);
-               System.out.println(uriOut);
-               assert "/dc=example,dc=com?userObjectClass=person&readOnly=false".equals(uriOut.toString());
-
-               // File
-               uriIn = new URI("file://some/dir/dc=example,dc=com.ldif");
-               props = uriAsProperties(uriIn.toString());
-               System.out.println(props);
-               assert "dc=example,dc=com".equals(props.get(UserAdminConf.baseDn.name()));
-
-               // Base configuration
-               uriIn = new URI("/dc=example,dc=com.ldif?readOnly=true&userBase=ou=CoWorkers,ou=People&groupBase=ou=Roles");
-               props = uriAsProperties(uriIn.toString());
-               System.out.println(props);
-               assert "dc=example,dc=com".equals(props.get(UserAdminConf.baseDn.name()));
-               assert "true".equals(props.get(UserAdminConf.readOnly.name()));
-               assert "ou=CoWorkers,ou=People".equals(props.get(UserAdminConf.userBase.name()));
-               assert "ou=Roles".equals(props.get(UserAdminConf.groupBase.name()));
-               uriOut = propertiesAsUri(props);
-               System.out.println(uriOut);
-               assert "/dc=example,dc=com?userBase=ou=CoWorkers,ou=People&groupBase=ou=Roles&readOnly=true"
-                               .equals(uriOut.toString());
-
-               // OS
-               uriIn = new URI("os:///dc=example,dc=com");
-               props = uriAsProperties(uriIn.toString());
-               System.out.println(props);
-               assert "dc=example,dc=com".equals(props.get(UserAdminConf.baseDn.name()));
-               assert "true".equals(props.get(UserAdminConf.readOnly.name()));
-               uriOut = propertiesAsUri(props);
-               System.out.println(uriOut);
-               assert "/dc=example,dc=com?readOnly=true".equals(uriOut.toString());
-       }
-}
diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/basic.ldif b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/basic.ldif
deleted file mode 100644 (file)
index e5b5615..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-dn: dc=example,dc=com
-objectClass: domain
-objectClass: extensibleObject
-objectClass: top
-dc: example
-
-dn: ou=groups,dc=example,dc=com
-objectClass: organizationalUnit
-objectClass: top
-ou: groups
-
-dn: ou=users,dc=example,dc=com
-objectClass: organizationalUnit
-objectClass: top
-ou: users
-
-dn: uid=demo,ou=users,dc=example,dc=com
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-cn: Demo User
-description: Demo user
-givenName: Demo
-mail: demo@localhost
-sn: User
-uid: demo
-userPassword:: e1BCS0RGMl9TSEEyNTZ9QUFBSUFOMEtpaTA5Z0h5SHA4Q1Y2bHZhbE5DOWJPcjZTVGVpSFU3UDB
- 5UGVxVUVIdnR2c2pIVmVadW5YV3FNNG5MV090U1gvWS9Jc1FsdXdjR3lFclBJVTRBVWlRVytNb1
- Y0TTYzaWlPNnlkcXRFZ2dzSGlNK1lPamFZZGl2YUMrRERqRkNBeEN5VFdsdEFYNXZKaWZMMlBwa
- S93OXFkTWI4YjgyRFFJMUIxZG9IMEdPZ2ZISFQwT2luYm95QlNjUmhvaDN6WGVPd1ZabWlqNHlH
- Y1JPazhta1lRVm5SQXlyR2pvSHVsSXIwR3ovMnlhR3VFdWJSL2NLOUtsYTQyWWo5RTNRdmJJbkE
- 3Y0Rjc2xYTlJHTENMZVBhYTdsSWUxc3pUR2JGRVZ4aVQ2M2xQck9RcHNwamRubEFlSjkvWUx5Z3
- VFTHIrZDJoNmN1SzNmdGFLbmpiRWxTRFJBMy9OanIwRVVzUHBxZDFibWIxbmxMRHR3Mlo5Y3h0Y
- WljQTdSOHE3eXVhZzFQc0xac2dxdk9HR1hsZ1RVSk4rVitkWkVYdk1BSEgra0YvY1hhU05Q
-
-dn: uid=root,ou=users,dc=example,dc=com
-objectClass: inetOrgPerson
-objectClass: person
-objectClass: organizationalPerson
-objectClass: top
-cn: Super User
-description: Superuser
-givenName: Super
-mail: root@localhost
-sn: User
-uid: root
-userPassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9
-
-dn: cn=admin,ou=groups,dc=example,dc=com
-objectClass: groupOfNames
-objectClass: top
-cn: admin
-member: uid=root,ou=users,dc=example,dc=com
-
-dn: cn=editors,ou=groups,dc=example,dc=com
-objectClass: groupOfNames
-objectClass: top
-cn: editors
-member: cn=admin,ou=groups,dc=example,dc=com
-member: uid=demo,ou=users,dc=example,dc=com
diff --git a/org.argeo.enterprise/ext/test/org/argeo/util/CsvParserEncodingTest.java b/org.argeo.enterprise/ext/test/org/argeo/util/CsvParserEncodingTest.java
deleted file mode 100644 (file)
index 09443c2..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.argeo.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.List;
-
-/** Tests that {@link CsvParser} can deal properly with encodings. */
-public class CsvParserEncodingTest {
-
-       private String iso = "ISO-8859-1";
-       private String utf8 = "UTF-8";
-
-       public void testParse() throws Exception {
-
-               String xml = new String("áéíóúñ,éééé");
-               byte[] utfBytes = xml.getBytes(utf8);
-               byte[] isoBytes = xml.getBytes(iso);
-
-               InputStream inUtf = new ByteArrayInputStream(utfBytes);
-               InputStream inIso = new ByteArrayInputStream(isoBytes);
-
-               CsvParser csvParser = new CsvParser() {
-                       protected void processLine(Integer lineNumber, List<String> header, List<String> tokens) {
-                               assert header.size() == tokens.size();
-                               assert 2 == tokens.size();
-                               assert "áéíóúñ".equals(tokens.get(0));
-                               assert "éééé".equals(tokens.get(1));
-                       }
-               };
-
-               csvParser.parse(inUtf, utf8);
-               inUtf.close();
-               csvParser.parse(inIso, iso);
-               inIso.close();
-       }
-}
diff --git a/org.argeo.enterprise/ext/test/org/argeo/util/CsvParserParseFileTest.java b/org.argeo.enterprise/ext/test/org/argeo/util/CsvParserParseFileTest.java
deleted file mode 100644 (file)
index 5a92c68..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.argeo.util;
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-/** Test that {@link CsvParser} can properly parse a CSV file. */
-public class CsvParserParseFileTest {
-       public void testParse() throws Exception {
-
-               final Map<Integer, Map<String, String>> lines = new HashMap<Integer, Map<String, String>>();
-               InputStream in = getClass().getResourceAsStream("/org/argeo/util/ReferenceFile.csv");
-               CsvParserWithLinesAsMap parser = new CsvParserWithLinesAsMap() {
-                       protected void processLine(Integer lineNumber, Map<String, String> line) {
-                               lines.put(lineNumber, line);
-                       }
-               };
-
-               parser.parse(in);
-               in.close();
-
-               assert 5 == lines.size();
-       }
-
-}
diff --git a/org.argeo.enterprise/ext/test/org/argeo/util/CsvParserTest.java b/org.argeo.enterprise/ext/test/org/argeo/util/CsvParserTest.java
deleted file mode 100644 (file)
index e59dbd1..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.argeo.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.List;
-
-/** {@link CsvParser} tests. */
-public class CsvParserTest {
-       public void testParse() throws Exception {
-               String toParse = "Header1,\"Header\n2\",Header3,\"Header4\"\n" + "Col1,\"Col\n2\",Col3,\"\"\"Col4\"\"\"\n"
-                               + "Col1,\"Col\n2\",Col3,\"\"\"Col4\"\"\"\n" + "Col1,\"Col\n2\",Col3,\"\"\"Col4\"\"\"\n";
-
-               InputStream in = new ByteArrayInputStream(toParse.getBytes());
-
-               CsvParser csvParser = new CsvParser() {
-                       protected void processLine(Integer lineNumber, List<String> header, List<String> tokens) {
-                               assert header.size() == tokens.size();
-                               assert 4 == tokens.size();
-                               assert "Col1".equals(tokens.get(0));
-                               assert "Col\n2".equals(tokens.get(1));
-                               assert "Col3".equals(tokens.get(2));
-                               assert "\"Col4\"".equals(tokens.get(3));
-                       }
-               };
-
-               csvParser.parse(in);
-               in.close();
-       }
-
-}
diff --git a/org.argeo.enterprise/ext/test/org/argeo/util/CsvParserWithQuotedSeparatorTest.java b/org.argeo.enterprise/ext/test/org/argeo/util/CsvParserWithQuotedSeparatorTest.java
deleted file mode 100644 (file)
index 67ba346..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.argeo.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/** Test that {@link CsvParser} deals properly with "" quotes. */
-public class CsvParserWithQuotedSeparatorTest {
-       public void testSimpleParse() throws Exception {
-               String toParse = "Header1,\"Header2\",Header3,\"Header4\"\n"
-                               + "\"Col1, Col2\",\"Col\n2\",Col3,\"\"\"Col4\"\"\"\n";
-
-               InputStream in = new ByteArrayInputStream(toParse.getBytes());
-
-               CsvParser csvParser = new CsvParser() {
-                       protected void processLine(Integer lineNumber, List<String> header, List<String> tokens) {
-                               assert header.size() == tokens.size();
-                               assert 4 == tokens.size();
-                               assert "Col1, Col2".equals(tokens.get(0));
-                       }
-               };
-               // System.out.println(toParse);
-               csvParser.parse(in);
-               in.close();
-
-       }
-
-       public void testParseFile() throws Exception {
-
-               final Map<Integer, Map<String, String>> lines = new HashMap<Integer, Map<String, String>>();
-               InputStream in = getClass().getResourceAsStream("/org/argeo/util/ReferenceFile.csv");
-
-               CsvParserWithLinesAsMap parser = new CsvParserWithLinesAsMap() {
-                       protected void processLine(Integer lineNumber, Map<String, String> line) {
-                               // System.out.println("processing line #" + lineNumber);
-                               lines.put(lineNumber, line);
-                       }
-               };
-
-               parser.parse(in);
-               in.close();
-
-               Map<String, String> line = lines.get(2);
-               assert ",,,,".equals(line.get("Coma testing"));
-               line = lines.get(3);
-               assert ",, ,,".equals(line.get("Coma testing"));
-               line = lines.get(4);
-               assert "module1, module2".equals(line.get("Coma testing"));
-               line = lines.get(5);
-               assert "module1,module2".equals(line.get("Coma testing"));
-               line = lines.get(6);
-               assert ",module1,module2, \nmodule3, module4".equals(line.get("Coma testing"));
-               assert 5 == lines.size();
-
-       }
-}
diff --git a/org.argeo.enterprise/ext/test/org/argeo/util/CsvWriterTest.java b/org.argeo.enterprise/ext/test/org/argeo/util/CsvWriterTest.java
deleted file mode 100644 (file)
index ff5dcc5..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.argeo.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/** {@link CsvWriter} tests. */
-public class CsvWriterTest {
-       public void testWrite() throws Exception {
-               ByteArrayOutputStream out = new ByteArrayOutputStream();
-               final CsvWriter csvWriter = new CsvWriter(out);
-
-               String[] header = { "Header1", "Header 2", "Header,3", "Header\n4", "Header\"5\"" };
-               String[] line1 = { "Value1", "Value 2", "Value,3", "Value\n4", "Value\"5\"" };
-               csvWriter.writeLine(Arrays.asList(header));
-               csvWriter.writeLine(Arrays.asList(line1));
-
-               String reference = "Header1,Header 2,\"Header,3\",\"Header\n4\",\"Header\"\"5\"\"\"\n"
-                               + "Value1,Value 2,\"Value,3\",\"Value\n4\",\"Value\"\"5\"\"\"\n";
-               String written = new String(out.toByteArray());
-               assert reference.equals(written);
-               out.close();
-               System.out.println(written);
-
-               final List<String> allTokens = new ArrayList<String>();
-               CsvParser csvParser = new CsvParser() {
-                       protected void processLine(Integer lineNumber, List<String> header, List<String> tokens) {
-                               if (lineNumber == 2)
-                                       allTokens.addAll(header);
-                               allTokens.addAll(tokens);
-                       }
-               };
-               ByteArrayInputStream in = new ByteArrayInputStream(written.getBytes());
-               csvParser.parse(in);
-               in.close();
-               List<String> allTokensRef = new ArrayList<String>();
-               allTokensRef.addAll(Arrays.asList(header));
-               allTokensRef.addAll(Arrays.asList(line1));
-
-               assert allTokensRef.size() == allTokens.size();
-               for (int i = 0; i < allTokensRef.size(); i++)
-                       assert allTokensRef.get(i).equals(allTokens.get(i));
-       }
-
-}
diff --git a/org.argeo.enterprise/ext/test/org/argeo/util/ReferenceFile.csv b/org.argeo.enterprise/ext/test/org/argeo/util/ReferenceFile.csv
deleted file mode 100644 (file)
index 351453d..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-"ID","A long Text","Name","Other","Number","Reference","Target","Date","Update","Language","ID Ref","Weird chars","line feeds","after line feed","Empty column","Status comment","Comments","Empty","Coma testing"
-"AK251","Everything & with some line feed 
- more “some” quote","Marge S.",,78.6,"A1155222221111268515131",,12/12/12,03/12/08,,9821308500721,"%%%ùù","ao","Nothing special",,,"Some very usefull comment",,",,,,"
-"AG254","same","Roger “wallace” Big","15 – JI",78.5,"A1155222221111268515131","next milestone",12/12/12,03/12/08,"_fr (French - France)",9812309500953,"***µ”","a
-
-
-
-
-o","after line feed",,"Do the job",,,",, ,,"
-"FG211","Very long text with some bullets.
-1 first
-2 second
-3. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long","Father & Son","15 – JI",15.4,"A1155222221111268515131","next milestone",12/12/12,03/12/08,"_fr (French - France)",9812309500952,"///","a
-
-
-
-
-
-
-o","module1,module2",,"Be fast",,,"module1, module2"
-"RRT152","Very long text with some bullets.
-1 first
-2 second
-3. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long. some more very very very long","Another $$","15 – JI",12.3,"A1155222221111268515131","next milestone",12/12/12,03/12/08,"_fr (French - France)",9812309500950,"---","a
-
-o
-
-
-","module1,module2",,,,,"module1,module2"
-"YU121","Another use case : “blank line”
-
-After the blank.","nothing with brackets( )","15 – JI",15.2,"A1155222221111268515131",,12/12/12,03/12/08,"_fr (French - France)",9812309500925,",;:?./","ao","
-
-
-
-After line feed again",,,,,",module1,module2, 
-module3, module4"
diff --git a/org.argeo.enterprise/ext/test/org/argeo/util/TestParse-ISO.csv b/org.argeo.enterprise/ext/test/org/argeo/util/TestParse-ISO.csv
deleted file mode 100644 (file)
index 0bec611..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-"Date d'imputation","N° de compte","Code journal","Pièce interne","Pièce externe","Libellé d'écriture","Débit","Crédit","Lettrage","Quantité","Code analytique","Date d'échéance","Date d'imputation origine","Code journal origine","Mode de règlement","Date début de période","Date fin de période"
-26.01.2010,"101300","BQ","BQ01.10",,"Depot société en formation",,"3.000,00",,,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"101300","BQ","BQ01.10",,"Depot société en formation",,"7.000,00",,,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"411OPEN","BQ","BQ01.10",,"Vir Client ",,"2.508,00","A",,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"455100","BQ","BQ01.10",,"Bankomat Raiffeise","250,00",,,,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"512101","BQ","BQ01.10",,"Extrait bancaire 01.10","12.250,55",,,,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"627800","BQ","BQ01.10",,"Envoi de chequier","2,30",,,,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"627800","BQ","BQ01.10",,"Frais d'expedition","5,15",,,,,"          ",26.01.2010,"BQ","    ","          ","          "
diff --git a/org.argeo.enterprise/ext/test/org/argeo/util/TestParse-UTF-8.csv b/org.argeo.enterprise/ext/test/org/argeo/util/TestParse-UTF-8.csv
deleted file mode 100644 (file)
index 0bec611..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-"Date d'imputation","N° de compte","Code journal","Pièce interne","Pièce externe","Libellé d'écriture","Débit","Crédit","Lettrage","Quantité","Code analytique","Date d'échéance","Date d'imputation origine","Code journal origine","Mode de règlement","Date début de période","Date fin de période"
-26.01.2010,"101300","BQ","BQ01.10",,"Depot société en formation",,"3.000,00",,,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"101300","BQ","BQ01.10",,"Depot société en formation",,"7.000,00",,,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"411OPEN","BQ","BQ01.10",,"Vir Client ",,"2.508,00","A",,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"455100","BQ","BQ01.10",,"Bankomat Raiffeise","250,00",,,,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"512101","BQ","BQ01.10",,"Extrait bancaire 01.10","12.250,55",,,,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"627800","BQ","BQ01.10",,"Envoi de chequier","2,30",,,,,"          ",26.01.2010,"BQ","    ","          ","          "
-26.01.2010,"627800","BQ","BQ01.10",,"Frais d'expedition","5,15",,,,,"          ",26.01.2010,"BQ","    ","          ","          "
diff --git a/org.argeo.enterprise/ext/test/org/argeo/util/ThroughputTest.java b/org.argeo.enterprise/ext/test/org/argeo/util/ThroughputTest.java
deleted file mode 100644 (file)
index d62f55c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.argeo.util;
-
-public class ThroughputTest {
-       public void testParse() throws Exception {
-//             assert 0 == 1;
-
-               Throughput t;
-               t = new Throughput("3.54/s");
-               assert 3.54d == t.getValue();
-               assert Throughput.Unit.s.equals(t.getUnit());
-               assert 282l == (long) t.asMsPeriod();
-
-               t = new Throughput("35698.2569/h");
-               assert Throughput.Unit.h.equals(t.getUnit());
-               assert 101l == (long) t.asMsPeriod();
-       }
-}