phonelib 0.6.5 → 0.6.6

data/data/libphonenumber/tools/java/cpp-build/src/com/google/i18n/phonenumbers/EntryPoint.java

@@ -1,33 +0,0 @@
-/*
- *  Copyright (C) 2011 The Libphonenumber Authors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package com.google.i18n.phonenumbers;
-
-/**
- * Entry point class for C++ build tools.
- *
- * @author Philippe Liard
- */
-public class EntryPoint {
-
-  public static void main(String[] args) {
-    boolean status = new CommandDispatcher(args, new Command[] {
-      new BuildMetadataCppFromXml()
-    }).start();
-
-    System.exit(status ? 0 : 1);
-  }
-}

data/data/libphonenumber/tools/java/cpp-build/test/com/google/i18n/phonenumbers/BuildMetadataCppFromXmlTest.java

@@ -1,185 +0,0 @@
-/*
- *  Copyright (C) 2011 The Libphonenumber Authors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package com.google.i18n.phonenumbers;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.google.i18n.phonenumbers.BuildMetadataCppFromXml.Options;
-import com.google.i18n.phonenumbers.BuildMetadataCppFromXml.Variant;
-import com.google.i18n.phonenumbers.CppMetadataGenerator.Type;
-
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-
-/**
- * Tests the BuildMetadataCppFromXml implementation to make sure it parses command line options and
- * generates code correctly.
- */
-public class BuildMetadataCppFromXmlTest {
-
-  // Various repeated test strings and data.
-  private static final String IGNORED = "IGNORED";
-  private static final String OUTPUT_DIR = "output/dir";
-  private static final String INPUT_PATH_XML = "input/path.xml";
-  private static final byte[] TEST_DATA =
-      new byte[] { (byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE };
-  private static final String CPP_TEST_DATA = "0xCA, 0xFE, 0xBA, 0xBE";
-
-  @Test
-  public void parseVariant() {
-    assertNull(Variant.parse("xxx"));
-    assertEquals(Variant.FULL, Variant.parse(null));
-    assertEquals(Variant.FULL, Variant.parse(""));
-    assertEquals(Variant.LITE, Variant.parse("lite"));
-    assertEquals(Variant.TEST, Variant.parse("test"));
-    assertEquals(Variant.LITE, Variant.parse("LITE"));
-    assertEquals(Variant.TEST, Variant.parse("Test"));
-  }
-
-  @Test
-  public void parseBadOptions() {
-    try {
-      BuildMetadataCppFromXml.Options.parse("MyCommand", new String[] { IGNORED });
-      fail("Expected exception not thrown");
-    } catch (IllegalArgumentException e) {
-      assertTrue(e.getMessage().contains("MyCommand"));
-    }
-  }
-
-  @Test
-  public void parseGoodOptions() {
-    Options opt = BuildMetadataCppFromXml.Options.parse("MyCommand",
-        new String[] { IGNORED, INPUT_PATH_XML, OUTPUT_DIR, "test_alternate_format" });
-    assertEquals(Type.ALTERNATE_FORMAT, opt.getType());
-    assertEquals(Variant.TEST, opt.getVariant());
-    assertEquals(INPUT_PATH_XML, opt.getInputFilePath());
-    assertEquals(OUTPUT_DIR, opt.getOutputDir());
-  }
-
-  @Test
-  public void generateMetadata() {
-    String[] args = new String[] {
-        IGNORED, INPUT_PATH_XML, OUTPUT_DIR, "metadata" };
-    // Most of the useful asserts are done in the mock class.
-    MockedCommand command = new MockedCommand(
-        INPUT_PATH_XML, false, OUTPUT_DIR, Type.METADATA, Variant.FULL);
-    command.setArgs(args);
-    command.start();
-    // Sanity check the captured data (asserting implicitly that the mocked methods were called).
-    String headerString = command.capturedHeaderFile();
-    assertTrue(headerString.contains("const void* metadata_get()"));
-    assertTrue(headerString.contains("int metadata_size()"));
-    String sourceString = command.capturedSourceFile();
-    assertTrue(sourceString.contains("const void* metadata_get()"));
-    assertTrue(sourceString.contains("int metadata_size()"));
-    assertTrue(sourceString.contains(CPP_TEST_DATA));
-  }
-
-  @Test
-  public void generateLiteMetadata() {
-    String[] args = new String[] {
-        IGNORED, INPUT_PATH_XML, OUTPUT_DIR, "lite_metadata" };
-    // Most of the useful asserts are done in the mock class.
-    MockedCommand command = new MockedCommand(
-        INPUT_PATH_XML, true, OUTPUT_DIR, Type.METADATA, Variant.LITE);
-    command.setArgs(args);
-    command.start();
-    // Sanity check the captured data (asserting implicitly that the mocked methods were called).
-    String headerString = command.capturedHeaderFile();
-    assertTrue(headerString.contains("const void* metadata_get()"));
-    assertTrue(headerString.contains("int metadata_size()"));
-    String sourceString = command.capturedSourceFile();
-    assertTrue(sourceString.contains("const void* metadata_get()"));
-    assertTrue(sourceString.contains("int metadata_size()"));
-    assertTrue(sourceString.contains(CPP_TEST_DATA));
-  }
-
-  @Test
-  public void generateAlternateFormat() {
-    String[] args = new String[] {
-        IGNORED, INPUT_PATH_XML, OUTPUT_DIR, "alternate_format" };
-    // Most of the useful asserts are done in the mock class.
-    MockedCommand command = new MockedCommand(
-        INPUT_PATH_XML, false, OUTPUT_DIR, Type.ALTERNATE_FORMAT, Variant.FULL);
-    command.setArgs(args);
-    command.start();
-    // Sanity check the captured data (asserting implicitly that the mocked methods were called).
-    String headerString = command.capturedHeaderFile();
-    assertTrue(headerString.contains("const void* alternate_format_get()"));
-    assertTrue(headerString.contains("int alternate_format_size()"));
-    String sourceString = command.capturedSourceFile();
-    assertTrue(sourceString.contains("const void* alternate_format_get()"));
-    assertTrue(sourceString.contains("int alternate_format_size()"));
-    assertTrue(sourceString.contains(CPP_TEST_DATA));
-  }
-
-  /**
-   * Manually mocked subclass of BuildMetadataCppFromXml which overrides all file related behavior
-   * while asserting the validity of any parameters passed to the mocked methods. After starting
-   * this command, the captured header and source file contents can be retrieved for testing.
-   */
-  static class MockedCommand extends BuildMetadataCppFromXml {
-    private static final Charset UTF_8 = Charset.forName("UTF-8");
-    private final String expectedInputFilePath;
-    private final boolean expectedLiteMetadata;
-    private final String expectedOutputDirPath;
-    private final Type expectedType;
-    private final Variant expectedVariant;
-    private final ByteArrayOutputStream headerOut = new ByteArrayOutputStream();
-    private final ByteArrayOutputStream sourceOut = new ByteArrayOutputStream();
-
-    public MockedCommand(String expectedInputFilePath, boolean expectedLiteMetadata,
-        String expectedOutputDirPath, Type expectedType, Variant expectedVariant) {
-
-      this.expectedInputFilePath = expectedInputFilePath;
-      this.expectedLiteMetadata = expectedLiteMetadata;
-      this.expectedOutputDirPath = expectedOutputDirPath;
-      this.expectedType = expectedType;
-      this.expectedVariant = expectedVariant;
-    }
-    @Override void writePhoneMetadataCollection(
-        String inputFilePath, boolean liteMetadata, OutputStream out) throws Exception {
-      assertEquals(expectedInputFilePath, inputFilePath);
-      assertEquals(expectedLiteMetadata, liteMetadata);
-      out.write(TEST_DATA, 0, TEST_DATA.length);
-    }
-    @Override OutputStream openHeaderStream(File dir, Type type) {
-      assertEquals(expectedOutputDirPath, dir.getPath());
-      assertEquals(expectedType, type);
-      return headerOut;
-    }
-    @Override OutputStream openSourceStream(File dir, Type type, Variant variant) {
-      assertEquals(expectedOutputDirPath, dir.getPath());
-      assertEquals(expectedType, type);
-      assertEquals(expectedVariant, variant);
-      return sourceOut;
-    }
-    String capturedHeaderFile() {
-      return new String(headerOut.toByteArray(), UTF_8);
-    }
-    String capturedSourceFile() {
-      return new String(sourceOut.toByteArray(), UTF_8);
-    }
-  }
-}

data/data/libphonenumber/tools/java/cpp-build/test/com/google/i18n/phonenumbers/CppMetadataGeneratorTest.java

@@ -1,122 +0,0 @@
-/*
- *  Copyright (C) 2012 The Libphonenumber Authors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package com.google.i18n.phonenumbers;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import com.google.i18n.phonenumbers.CppMetadataGenerator.Type;
-
-import org.junit.Test;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Tests that the CppXmlMetadata class emits the expected source and header files for metadata.
- */
-public class CppMetadataGeneratorTest {
-
-  @Test
-  public void emitStaticArrayData() {
-    // 13 bytes per line, so have 16 bytes to test > 1 line (general case).
-    // Use all hex digits in both nibbles to test hex formatting.
-    byte[] data = new byte[] {
-      (byte) 0xF0, (byte) 0xE1, (byte) 0xD2, (byte) 0xC3,
-      (byte) 0xB4, (byte) 0xA5, (byte) 0x96, (byte) 0x87,
-      (byte) 0x78, (byte) 0x69, (byte) 0x5A, (byte) 0x4B,
-      (byte) 0x3C, (byte) 0x2D, (byte) 0x1E, (byte) 0x0F,
-    };
-
-    StringWriter writer = new StringWriter();
-    CppMetadataGenerator.emitStaticArrayData(new PrintWriter(writer), data);
-    assertEquals(
-        "  0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87, 0x78, 0x69, 0x5A, 0x4B, 0x3C,\n" +
-        "  0x2D, 0x1E, 0x0F\n",
-        writer.toString());
-  }
-
-  @Test
-  public void outputHeaderFile() throws IOException {
-    byte[] data = new byte[] { (byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE };
-    CppMetadataGenerator metadata = CppMetadataGenerator.create(Type.METADATA, data);
-
-    StringWriter writer = new StringWriter();
-    metadata.outputHeaderFile(writer);
-    Iterator<String> lines = toLines(writer.toString()).iterator();
-    // Sanity check that at least some of the expected lines are present.
-    assertTrue(consumeUntil(" * Copyright (C) 2011 The Libphonenumber Authors", lines));
-    assertTrue(consumeUntil("#ifndef I18N_PHONENUMBERS_METADATA_H_", lines));
-    assertTrue(consumeUntil("#define I18N_PHONENUMBERS_METADATA_H_", lines));
-    assertTrue(consumeUntil("namespace i18n {", lines));
-    assertTrue(consumeUntil("namespace phonenumbers {", lines));
-    assertTrue(consumeUntil("int metadata_size();", lines));
-    assertTrue(consumeUntil("const void* metadata_get();", lines));
-    assertTrue(consumeUntil("#endif  // I18N_PHONENUMBERS_METADATA_H_", lines));
-  }
-
-  @Test
-  public void outputSourceFile() throws IOException {
-    byte[] data = new byte[] { (byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE };
-    CppMetadataGenerator metadata = CppMetadataGenerator.create(Type.ALTERNATE_FORMAT, data);
-
-    StringWriter writer = new StringWriter();
-    metadata.outputSourceFile(writer);
-    Iterator<String> lines = toLines(writer.toString()).iterator();
-    // Sanity check that at least some of the expected lines are present.
-    assertTrue(consumeUntil(" * Copyright (C) 2012 The Libphonenumber Authors", lines));
-    assertTrue(consumeUntil("namespace i18n {", lines));
-    assertTrue(consumeUntil("namespace phonenumbers {", lines));
-    assertTrue(consumeUntil("namespace {", lines));
-    assertTrue(consumeUntil("static const unsigned char data[] = {", lines));
-    assertTrue(consumeUntil("  0xCA, 0xFE, 0xBA, 0xBE", lines));
-    assertTrue(consumeUntil("int alternate_format_size() {", lines));
-    assertTrue(consumeUntil("const void* alternate_format_get() {", lines));
-  }
-
-  /** Converts a string containing newlines into a list of lines. */
-  private static List<String> toLines(String s) throws IOException {
-    BufferedReader reader = new BufferedReader(new StringReader(s));
-    List<String> lines = new ArrayList<String>();
-    for (String line = reader.readLine(); line != null; line = reader.readLine()) {
-      lines.add(line);
-    }
-    return lines;
-  }
-
-  /**
-   * Consumes strings from the given iterator until the expected string is reached (it is also
-   * consumed). If the expected string is not found, the iterator is exhausted and {@code false} is
-   * returned.
-   *
-   * @return true if the expected string was found while consuming the iterator.
-   */
-  private static boolean consumeUntil(String expected, Iterator<String> it) {
-    while (it.hasNext()) {
-      if (it.next().equals(expected)) {
-        return true;
-      }
-    }
-    return false;
-  }
-}

data/data/libphonenumber/tools/java/data/README

@@ -1,16 +0,0 @@
-How to install the Appengine SDK to the Maven local repository?
-Note that this needs to be done only once.
-  $ mvn gae:unpack
-  Note that you don't need to manually download any SDK.
-
-How to generate the WAR?
-  $ mvn package
-  $ mvn war:war
-  Note that this must be done before running the webapp locally and before
-  deploying it to Appengine.
-
-How to run the webapp locally?
-  $ mvn gae:run
-
-How to deploy the webapp to Appengine?
-  $ mvn gae:update

data/data/libphonenumber/tools/java/data/pom.xml

@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>tools</artifactId>
-    <groupId>com.google.i18n.phonenumbers</groupId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <groupId>com.google.i18n.phonenumbers</groupId>
-  <artifactId>data-tools</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Libphonenumber Data tools</name>
-
-  <properties>
-    <gae.version>1.9.32</gae.version>
-  </properties>
-
-  <repositories>
-    <repository>
-      <id>mvnrepository</id>
-      <url>http://mvnrepository.com/artifact/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-          <archive>
-            <manifest>
-              <addClasspath>true</addClasspath>
-              <mainClass>com.google.i18n.phonenumbers.CombineGeoData</mainClass>
-            </manifest>
-          </archive>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.10</version>
-        <configuration>
-          <webAppSourceDirectory>webapp</webAppSourceDirectory>
-          <scanIntervalSeconds>10</scanIntervalSeconds>
-          <webAppConfig>
-            <contextPath>/</contextPath>
-          </webAppConfig>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>8080</port>
-              <maxIdleTime>60000</maxIdleTime>
-            </connector>
-          </connectors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>